httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/modules/arch/win32 mod_isapi.c
Date Mon, 23 Jul 2001 19:33:03 GMT
wrowe       01/07/23 12:33:03

  Modified:    modules/arch/win32 mod_isapi.c
  Log:
    Some odd XXX fixups that are closed (or unneeded)
  
  Revision  Changes    Path
  1.45      +3 -11     httpd-2.0/modules/arch/win32/mod_isapi.c
  
  Index: mod_isapi.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/arch/win32/mod_isapi.c,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- mod_isapi.c	2001/06/27 20:18:00	1.44
  +++ mod_isapi.c	2001/07/23 19:33:03	1.45
  @@ -421,10 +421,10 @@
   
       
       /* Set up client input */
  -    rv = ap_setup_client_block(r, REQUEST_CHUNKED_ERROR);
  -    if (rv) {
  +    res = ap_setup_client_block(r, REQUEST_CHUNKED_ERROR);
  +    if (res) {
           isapi_unload(isa, FALSE);
  -        return HTTP_INTERNAL_SERVER_ERROR; /* XXX: The wrong error */
  +        return res;
       }
   
       if (ap_should_client_block(r)) {
  @@ -677,13 +677,6 @@
       while (read < *lpdwSize &&
              ((res = ap_get_client_block(r, (char*)lpvBuffer + read,
                                          *lpdwSize - read)) > 0)) {
  -        if (res < 0) {
  -            *lpdwSize = 0;
  -            if (!apr_get_os_error())
  -                SetLastError(TODO_ERROR); /* XXX: Find the right error code */
  -            return FALSE;
  -        }
  -
           read += res;
       }
   
  @@ -742,7 +735,6 @@
       return 0;
   }
   
  -/* XXX: Is there is still an O(n^2) attack possible here?  Please detail. */
   BOOL WINAPI ServerSupportFunction(HCONN hConn, DWORD dwHSERequest,
                                     LPVOID lpvBuffer, LPDWORD lpdwSize,
                                     LPDWORD lpdwDataType)
  
  
  

Mime
View raw message