Attachment 34509 Details for Bug 60458 – potential fix

[patch] potential fix

PR60458.diff (text/plain), 1.46 KB, created by Eric Covener on 2016-12-09 01:04:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Covener

Created: 2016-12-09 01:04:46 UTC

Size: 1.46 KB

patch

obsolete

>Index: modules/proxy/mod_proxy.c
>===================================================================
>--- modules/proxy/mod_proxy.c	(revision 1773291)
>+++ modules/proxy/mod_proxy.c	(working copy)
>@@ -788,18 +788,29 @@
>      */
> 
>     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;

Actions: View | Diff

Attachments on bug 60458: 34509