File httpd-cache-revert-svn1773397.patch of Package apache2

Overview Repositories Revisions Requests Users Attributes Meta

File httpd-cache-revert-svn1773397.patch of Package apache2 (Revision 262294032e24226b6346977bd193904b)

Currently displaying revision 262294032e24226b6346977bd193904b , Show latest

Index: httpd-2.4.25/modules/proxy/mod_proxy.c
===================================================================
--- httpd-2.4.25.orig/modules/proxy/mod_proxy.c	2016-12-12 16:20:04.000000000 +0100
+++ httpd-2.4.25/modules/proxy/mod_proxy.c	2017-02-23 15:02:21.509606618 +0100
@@ -771,29 +771,18 @@ static int proxy_trans(request_rec *r)
      */
 
     dconf = ap_get_module_config(r->per_dir_config, &proxy_module);
-    conf = (proxy_server_conf *) ap_get_module_config(r->server->module_config,
-                                                      &proxy_module);
+
     /* short way - this location is reverse proxied? */
     if (dconf->alias) {
         int rv = ap_proxy_trans_match(r, dconf->alias, dconf);
-        if (OK == rv) { 
-            /* Got a hit. Need to make sure it's not explicitly declined */
-            if (conf->aliases->nelts) {
-                ent = (struct proxy_alias *) conf->aliases->elts;
-                for (i = 0; i < conf->aliases->nelts; i++) {
-                    int rv = ap_proxy_trans_match(r, &ent[i], dconf);
-                    if (DECLINED == rv) { 
-                        return DECLINED;
-                    }
-                }
-            }
-            return OK; 
-        }
         if (DONE != rv) {
             return rv;
         }
     }
 
+    conf = (proxy_server_conf *) ap_get_module_config(r->server->module_config,
+                                                      &proxy_module);
+
     /* long way - walk the list of aliases, find a match */
     if (conf->aliases->nelts) {
         ent = (struct proxy_alias *) conf->aliases->elts;

Places

File httpd-cache-revert-svn1773397.patch of Package apache2 (Revision 262294032e24226b6346977bd193904b)

Places