Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 1 Aug 2000 19:33:20 -0000
Message-ID: <20000801193320.52836.qmail@locus.apache.org>
From: trawick@locus.apache.org
To: apache-2.0-cvs@apache.org
Subject: cvs commit: apache-2.0/src/lib/apr/network_io/win32 sendrecv.c

trawick     00/08/01 12:33:19

  Modified:    src      CHANGES
               src/lib/apr/network_io/win32 sendrecv.c
  Log:
  ap_recv() on Win32: Set bytes-read to 0 on error.
  Submitted by:	Gregory Nicholls <gnicholls@level8.com>
  Reviewed by:	Jeff Trawick
  
  Revision  Changes    Path
  1.189     +4 -1      apache-2.0/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/CHANGES,v
  retrieving revision 1.188
  retrieving revision 1.189
  diff -u -r1.188 -r1.189
  --- CHANGES	2000/08/01 17:36:03	1.188
  +++ CHANGES	2000/08/01 19:33:15	1.189
  @@ -1,4 +1,7 @@
   Changes with Apache 2.0a5
  +  *) ap_recv() on Win32: Set bytes-read to 0 on error.  
  +     [Gregory Nicholls <gnicholls@level8.com>]
  +
     *) Add an option to not detach from the controlling terminal without
        going into single process mode.  This allows for much easier
        debugging of the process startup code. [Ryan Bloom]
  @@ -32,7 +35,7 @@
        the bug correctly.  [Ryan Bloom]
   
     *) Fix a couple of place in the Windows code where the wrong error
  -     code was being return. [Gregory Nicholls <gnicholls@level8.com>]
  +     code was being returned. [Gregory Nicholls <gnicholls@level8.com>]
   
     *) Fix POOL_DEBUG (at least for prefork mpm). [Dean Gaudet]
   
  
  
  
  1.22      +1 -0      apache-2.0/src/lib/apr/network_io/win32/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sendrecv.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- sendrecv.c	2000/07/06 15:13:25	1.21
  +++ sendrecv.c	2000/08/01 19:33:17	1.22
  @@ -95,6 +95,7 @@
       rv = WSARecv(sock->sock, &wsaData, 1, &dwBytes, &flags, NULL, NULL);
       if (rv == SOCKET_ERROR) {
           lasterror = WSAGetLastError();
  +        *len = 0;
           return lasterror;
       }