File bnc951692.patch of Package apache2.3239

Index: modules/proxy/mod_proxy.c
===================================================================
--- modules/proxy/mod_proxy.c.orig	2014-06-21 15:47:30.000000000 +0200
+++ modules/proxy/mod_proxy.c	2015-10-26 23:02:30.000000000 +0100
@@ -1156,8 +1156,10 @@
         AP_PROXY_RUN(r, worker, conf, url, attempts);
         access_status = proxy_run_scheme_handler(r, worker, conf,
                                                  url, NULL, 0);
-        if (access_status == OK)
+        if (access_status == OK
+                || apr_table_get(r->notes, "proxy_overridden")) {
             break;
+        }
         else if (access_status == HTTP_INTERNAL_SERVER_ERROR) {
             /* Unrecoverable server error.
              * We can not failover to another worker.
Index: modules/proxy/mod_proxy_http.c
===================================================================
--- modules/proxy/mod_proxy_http.c.orig	2015-10-26 23:02:30.000000000 +0100
+++ modules/proxy/mod_proxy_http.c	2015-10-26 23:02:30.000000000 +0100
@@ -1654,6 +1654,7 @@
                 (proxy_status != HTTP_NOT_MODIFIED)) { /* not 304 */
                 ap_discard_request_body(backend->r);
             }
+            apr_table_setn(r->notes, "proxy_overridden", "1");
             return proxy_status;
         }