httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From grega...@apache.org
Subject cvs commit: httpd-2.0/server protocol.c
Date Fri, 28 Mar 2003 00:13:05 GMT
gregames    2003/03/27 16:13:05

  Modified:    .        Tag: APACHE_2_0_BRANCH STATUS
               server   Tag: APACHE_2_0_BRANCH protocol.c
  Log:
  backport a fix for seg faults with huge headers
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.751.2.192 +1 -6      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.191
  retrieving revision 1.751.2.192
  diff -u -r1.751.2.191 -r1.751.2.192
  --- STATUS	28 Mar 2003 00:07:37 -0000	1.751.2.191
  +++ STATUS	28 Mar 2003 00:13:04 -0000	1.751.2.192
  @@ -58,11 +58,6 @@
   
   RELEASE SHOWSTOPPERS:
   
  -    * fix seg faults in ap_get_mime_headers_core's error leg for overlength
  -      headers caused by using an uninitialized length returned by ap_rgetline.
  -      server/protocol.c: r1.129
  -      +1: gregames, trawick, wrowe
  -
   PATCHES TO PORT FROM 2.1
     [ please place file names and revisions from HEAD here, so it is easy to
       identify exactly what the proposed changes are! ]
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.121.2.3 +3 -0      httpd-2.0/server/protocol.c
  
  Index: protocol.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/protocol.c,v
  retrieving revision 1.121.2.2
  retrieving revision 1.121.2.3
  diff -u -r1.121.2.2 -r1.121.2.3
  --- protocol.c	3 Feb 2003 17:32:00 -0000	1.121.2.2
  +++ protocol.c	28 Mar 2003 00:13:04 -0000	1.121.2.3
  @@ -290,6 +290,7 @@
   
           /* Would this overrun our buffer?  If so, we'll die. */
           if (n < bytes_handled + len) {
  +            *read = bytes_handled;
               return APR_ENOSPC;
           }
   
  @@ -390,6 +391,7 @@
               last_char = *s + bytes_handled - 1;
           }
           else {
  +            *read = n;
               return APR_ENOSPC;
           }
       }
  @@ -519,6 +521,7 @@
                   return APR_SUCCESS;
               }
               else {
  +                *read = n;
                   return APR_ENOSPC;
               }
           }
  
  
  

Mime
View raw message