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 Thu, 11 Mar 2004 17:21:47 GMT
jorton      2004/03/11 09:21:47

  Modified:    .        CHANGES
               modules/proxy proxy_http.c
  Log:
  * modules/proxy/proxy_http.c (ap_proxy_http_process_response):
  Consistently check whether r->status is "successful" or not; fix
  screwy handling of 2xx-but-not-200 responses when ProxyErrorOverride
  is used.
  
  PR: 20183
  Submitted by: Marcus Janson <marcus.janson@tre.se>, Joe Orton
  
  Revision  Changes    Path
  1.1422    +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1421
  retrieving revision 1.1422
  diff -w -d -u -r1.1421 -r1.1422
  --- CHANGES	11 Mar 2004 03:57:49 -0000	1.1421
  +++ CHANGES	11 Mar 2004 17:21:47 -0000	1.1422
  @@ -2,6 +2,10 @@
   
     [Remove entries to the current 2.0 section below, when backported]
   
  +  *) mod_proxy: Fix handling of non-200 success status codes when
  +     "ProxyErrorOverride On" is configured.  PR 20183.
  +     [Marcus Janson <marcus.janson tre.se>, Joe Orton]
  +
     *) Threaded MPMs for Unix and Win32: Add WorkerStackSize directive
        to override default thread stack size for threads which handle
        client connections.  Required for some third-party modules on
  
  
  
  1.184     +4 -4      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.183
  retrieving revision 1.184
  diff -w -d -u -r1.183 -r1.184
  --- proxy_http.c	9 Feb 2004 20:29:21 -0000	1.183
  +++ proxy_http.c	11 Mar 2004 17:21:47 -0000	1.184
  @@ -990,7 +990,7 @@
                * if we are overriding the errors, we can't put the content
                * of the page into the brigade
                */
  -            if ( (conf->error_override ==0) || r->status < 300 ) {
  +            if (conf->error_override == 0 || ap_is_HTTP_SUCCESS(r->status)) {
   
                   /* read the body, pass it to the output filters */
                   int finish = FALSE;
  @@ -1052,7 +1052,7 @@
   
       if ( conf->error_override ) {
           /* the code above this checks for 'OK' which is what the hook expects */
  -        if ( r->status == HTTP_OK )
  +        if (ap_is_HTTP_SUCCESS(r->status))
               return OK;
           else  {
               /* clear r->status for override error, otherwise ErrorDocument
  
  
  

Mime
View raw message