svn commit: r1682907 - in /httpd/httpd/trunk/modules/proxy: mod_proxy_ajp.c mod_proxy_http.c

[yl...@apache.org]

Author: ylavic
Date: Mon Jun  1 14:06:39 2015
New Revision: 1682907

URL: http://svn.apache.org/r1682907
Log:
mod_proxy: follow up to r1681694.

Handle the proxy-error-override note also in mod_proxy_ajp.

The note is not needed in mod_proxy_fcgi (which also handles
ProxyErrorOverride) since it calls ap_die() by itself, and always
returns OK to proxy_handler().

Add a comment about the note where used.

Modified:
    httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c
    httpd/httpd/trunk/modules/proxy/mod_proxy_http.c

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c?rev=1682907&r1=1682906&r2=1682907&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_ajp.c Mon Jun  1 14:06:39 2015
@@ -644,6 +644,11 @@ static int ap_proxy_ajp_request(apr_pool
              */
             rv = r->status;
             r->status = HTTP_OK;
+            /*
+             * prevent proxy_handler() from treating this as an
+             * internal error.
+             */
+            apr_table_setn(r->notes, "proxy-error-override", "1");
         }
         else {
             rv = OK;

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_http.c?rev=1682907&r1=1682906&r2=1682907&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_http.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_http.c Mon Jun  1 14:06:39 2015
@@ -1719,6 +1719,10 @@ int ap_proxy_http_process_response(apr_p
                 ap_discard_request_body(backend->r);
             }
             proxy_run_detach_backend(r, backend);
+            /*
+             * prevent proxy_handler() from treating this as an
+             * internal error.
+             */
             apr_table_setn(r->notes, "proxy-error-override", "1");
             return proxy_status;
         }