Attachment 30834 Details for Bug 43513 – rebased patch

[patch] rebased patch

httpd-trunk-mod_proxy-proxypassmatch.patch (text/plain), 1.28 KB, created by jkaluza on 2013-09-13 12:13:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: jkaluza

Created: 2013-09-13 12:13:42 UTC

Size: 1.28 KB

patch

obsolete

>diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
>index 96f3230..f58f4c4 100644
>--- a/modules/proxy/mod_proxy.c
>+++ b/modules/proxy/mod_proxy.c
>@@ -1533,8 +1533,26 @@ static const char *
>         new->balancer = balancer;
>     }
>     else {
>-        proxy_worker *worker = ap_proxy_get_worker(cmd->temp_pool, NULL, conf, r);
>+        proxy_worker *worker;
>         int reuse = 0;
>+        /* When the scheme or the hostname contains '$', skip.
>+         * When the path contains '$', use a path before '$' for the worker
>+         * name. */
>+        if (use_regex) {
>+            char *r2 = apr_pstrdup(cmd->temp_pool, r);
>+            char *tmp_css = ap_strstr(r2, "://");
>+            if (tmp_css != NULL) {
>+                char *tmp_dollar = ap_strchr(r2, '$');
>+                if (tmp_dollar != NULL) {
>+                    char *tmp_slash = ap_strchr(&tmp_css[3], '/');
>+                    if (tmp_slash != NULL && tmp_slash <= tmp_dollar) {
>+                        *tmp_dollar = '\0';
>+                    }
>+                }
>+            }
>+            r = r2;
>+        }
>+        worker = ap_proxy_get_worker(cmd->temp_pool, NULL, conf, r);
>         if (!worker) {
>             const char *err = ap_proxy_define_worker(cmd->pool, &worker, NULL, conf, r, 0);
>             if (err)

Actions: View | Diff

Attachments on bug 43513: 20896 | 30834