Suggested patch for Mosaic 2.x (for HTTCP.c)

Gordon Joly (G.Joly@cs.ucl.ac.uk)
Tue, 03 May 94 12:14:56 +0100

This has been reported to the maintainers for 2.2, 2.3 (and also 2.4).

Gordon

Gordon Joly Phone +44 71 380 7934 FAX +44 71 387 1397
Emails::G.Joly@cs.ucl.ac.uk:ucacgcj@ucl.ac.uk:mice-nsc@cs.ucl.ac.uk
Comp Sci, University College, London, Gower Street, LONDON WC1E 6BT
XXX YYY WWW & http://www.cs.ucl.ac.uk/mice/gjoly.html & WWW YYY XXX

stanley:COMMON/src/pub/Mosaic[45] cat patch1
*** HTTCP.c.orig Mon Apr 11 15:29:24 1994
--- HTTCP.c Tue Mar 22 12:21:12 1994
***************
*** 411,419 ****
* the normal case.
*/
! #ifdef SVR4
if ((status < 0) && ((errno == EINPROGRESS)||(errno == EAGAIN)))
#else
if ((status < 0) && (errno == EINPROGRESS))
! #endif /* SVR4 */
{
struct timeval timeout;
--- 411,419 ----
* the normal case.
*/
! #ifdef EAGAIN
if ((status < 0) && ((errno == EINPROGRESS)||(errno == EAGAIN)))
#else
if ((status < 0) && (errno == EINPROGRESS))
! #endif /* EAGAIN */
{
struct timeval timeout;
***************
*** 476,485 ****
status = connect(*s, (struct sockaddr*)&soc_address,
sizeof(soc_address));
! #ifdef SVR4
if ((status < 0)&&(errno != EALREADY)&&(errno != EAGAIN)&&
(errno != EISCONN))
#else
if ((status < 0)&&(errno != EALREADY)&&(errno != EISCONN))
! #endif /* SVR4 */
{
break;
--- 476,485 ----
status = connect(*s, (struct sockaddr*)&soc_address,
sizeof(soc_address));
! #ifdef EAGAIN
if ((status < 0)&&(errno != EALREADY)&&(errno != EAGAIN)&&
(errno != EISCONN))
#else
if ((status < 0)&&(errno != EALREADY)&&(errno != EISCONN))
! #endif /* EGAIN */
{
break;