httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@apache.org
Subject cvs commit: apache-1.3/src/main http_main.c
Date Sat, 02 Jun 2001 20:34:03 GMT
stoddard    01/06/02 13:34:03

  Modified:    src      CHANGES
               src/main http_main.c
  Log:
  Fix problem with lingering_close() on Windows.  Issuing read() on the
  socket descriptor on Windows always fails. Should be calling
  recv() instead of read() on Windows. Thanks to Bill Rowe (and bounds checker :-)
  for pointing this out.
  
  Revision  Changes    Path
  1.1687    +4 -0      apache-1.3/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/CHANGES,v
  retrieving revision 1.1686
  retrieving revision 1.1687
  diff -u -r1.1686 -r1.1687
  --- CHANGES	2001/05/23 17:03:59	1.1686
  +++ CHANGES	2001/06/02 20:34:03	1.1687
  @@ -1,4 +1,8 @@
   Changes with Apache 1.3.21
  +  *) Fix problem with lingering_close() on Windows.  Issuing read() on the
  +     socket descriptor on Windows always fails. Should be calling
  +     recv() instead of read() on Windows.
  +     [Bill Stoddard, Bill Rowe]
   
     *) Added an abnormal exit clean up routine to make sure that ApacheC NLM
        is always unloaded cleanly.  This fixes the "Ouch! out of memory"
  
  
  
  1.538     +4 -0      apache-1.3/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/main/http_main.c,v
  retrieving revision 1.537
  retrieving revision 1.538
  diff -u -r1.537 -r1.538
  --- http_main.c	2001/05/30 07:40:59	1.537
  +++ http_main.c	2001/06/02 20:34:03	1.538
  @@ -1565,7 +1565,11 @@
   	select_rv = ap_select(lsd + 1, &lfds, NULL, NULL, &tv);
   
       } while ((select_rv > 0) &&
  +#ifdef WIN32
  +             (recv(lsd, dummybuf, sizeof dummybuf, 0) > 0));
  +#else
                (read(lsd, dummybuf, sizeof dummybuf) > 0));
  +#endif
   
       /* Should now have seen final ack.  Safe to finally kill socket */
   
  
  
  

Mime
View raw message