httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject cvs commit: httpd-2.0/modules/proxy proxy_http.c
Date Wed, 22 Oct 2003 16:09:58 GMT
jorton      2003/10/22 09:09:58

  Modified:    modules/proxy proxy_http.c
  Log:
  * proxy_http.c (ap_proxy_http_process_response): Send a valid
  status-line even if the parsed status-line had no trailing spaces.
  Remove the warning for this case as triggers for valid status-lines
  too.
  
  PR: 23998
  
  Revision  Changes    Path
  1.172     +9 -7      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.171
  retrieving revision 1.172
  diff -u -u -r1.171 -r1.172
  --- proxy_http.c	3 Sep 2003 19:27:07 -0000	1.171
  +++ proxy_http.c	22 Oct 2003 16:09:58 -0000	1.172
  @@ -851,16 +851,18 @@
               backasswards = 0;
   
               keepchar = buffer[12];
  -            if (keepchar == '\0') {
  -                ap_log_error(APLOG_MARK, APLOG_WARNING, 0,
  -                             r->server, "proxy: bad HTTP/%d.%d status line "
  -                             "returned by %s (%s)", major, minor, r->uri,
  -                             r->method);
  -            }
               buffer[12] = '\0';
               r->status = atoi(&buffer[9]);
   
  -            buffer[12] = keepchar;
  +            if (keepchar != '\0') {
  +                buffer[12] = keepchar;
  +            } else {
  +                /* 2616 requires the space in Status-Line; the origin
  +                 * server may have sent one but ap_rgetline_core will
  +                 * have stripped it. */
  +                buffer[12] = ' ';
  +                buffer[13] = '\0';
  +            }
               r->status_line = apr_pstrdup(p, &buffer[9]);
               
   
  
  
  

Mime
View raw message