httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@apache.org
Subject cvs commit: httpd-2.0/modules/proxy proxy_http.c
Date Mon, 31 Dec 2001 20:53:28 GMT
stoddard    01/12/31 12:53:28

  Modified:    .        CHANGES
               modules/proxy proxy_http.c
  Log:
  Prevent mod_proxy from truncating one character off the
  end of the status line returned from the proxied server.
  Note that buffer is NULL terminated by the call to
  ap_proxy_string_read() so there is no need to terminate it
  again.
  
  Submitted by:	Adam Sussman
  Reviewed by:	Bill Stoddard
  
  Revision  Changes    Path
  1.497     +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.496
  retrieving revision 1.497
  diff -u -r1.496 -r1.497
  --- CHANGES	31 Dec 2001 20:43:58 -0000	1.496
  +++ CHANGES	31 Dec 2001 20:53:28 -0000	1.497
  @@ -1,4 +1,8 @@
   Changes with Apache 2.0.30-dev
  +  *) Prevent mod_proxy from truncating one character off the
  +     end of the status line returned from the proxied server.
  +     [Adam Sussman, Bill Stoddard]
  +
     *) Eliminate loop in ap_proxy_string_read().
        [Adam Sussman, Bill Stoddard]
   
  
  
  
  1.116     +1 -1      httpd-2.0/modules/proxy/proxy_http.c
  
  Index: proxy_http.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/proxy/proxy_http.c,v
  retrieving revision 1.115
  retrieving revision 1.116
  diff -u -r1.115 -r1.116
  --- proxy_http.c	31 Dec 2001 20:46:22 -0000	1.115
  +++ proxy_http.c	31 Dec 2001 20:53:28 -0000	1.116
  @@ -670,6 +670,7 @@
   
          /* Is it an HTTP/1 response?
           * This is buggy if we ever see an HTTP/1.10
  +        * XXX: This code is way crufty...
           */
           if (apr_date_checkmask(buffer, "HTTP/#.# ###*")) {
               int major, minor;
  @@ -689,7 +690,6 @@
                               "server: ", buffer, NULL));
               }
               backasswards = 0;
  -            buffer[--len] = '\0';
   
               buffer[12] = '\0';
               r->status = atoi(&buffer[9]);
  
  
  

Mime
View raw message