From: Jim Jagielski <jim@apache.org>
Date: Sun, 15 Jun 2014 13:54:55 +0000 (+0000)
Subject: revert 1602523, until there is understanding
X-Git-Tag: 2.5.0-alpha~4062
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=637f26314153870d43a649781babc0bc40f49c98;p=apache

revert 1602523, until there is understanding
about what the actual issue and "requirement" are.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1602697 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index 569d54c9c0..559c5c767c 100644
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -1045,11 +1045,6 @@ static int proxy_handler(request_rec *r)
     }
 
     scheme = apr_pstrndup(r->pool, uri, p - uri);
-
-    if (strcmp(scheme, "auto") == 0) {
-        apr_table_set(r->notes, "auto", uri);
-        uri = apr_pstrcat(r->pool, ap_http_scheme(r), p, NULL);
-    }
     /* Check URI's destination host against NoProxy hosts */
     /* Bypass ProxyRemote server lookup if configured as NoProxy */
     for (direct_connect = i = 0; i < conf->dirconn->nelts &&
@@ -1156,8 +1151,8 @@ static int proxy_handler(request_rec *r)
 
         /* handle the scheme */
         ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, APLOGNO(01143)
-                      "Running scheme %s handler for %s (attempt %d)",
-                      scheme, url, attempts);
+                      "Running scheme %s handler (attempt %d)",
+                      scheme, attempts);
         AP_PROXY_RUN(r, worker, conf, url, attempts);
         access_status = proxy_run_scheme_handler(r, worker, conf,
                                                  url, NULL, 0);
@@ -1484,7 +1479,7 @@ static const char *
 
 static char *de_socketfy(apr_pool_t *p, char *url)
 {
-    char *ptr, *ret = url;
+    char *ptr;
     /*
      * We could be passed a URL during the config stage that contains
      * the UDS path... ignore it
@@ -1492,7 +1487,7 @@ static char *de_socketfy(apr_pool_t *p, char *url)
     if (!strncasecmp(url, "unix:", 5) &&
         ((ptr = ap_strchr(url, '|')) != NULL)) {
         /* move past the 'unix:...|' UDS path info */
-        char *c;
+        char *ret, *c;
 
         ret = ptr + 1;
         /* special case: "unix:....|scheme:" is OK, expand
@@ -1503,10 +1498,13 @@ static char *de_socketfy(apr_pool_t *p, char *url)
             return NULL;
         }
         if (c[1] == '\0') {
-            ret = apr_pstrcat(p, ret, "//localhost", NULL);
+            return apr_pstrcat(p, ret, "//localhost", NULL);
+        }
+        else {
+            return ret;
         }
     }
-    return ret;
+    return url;
 }
 
 static const char *
diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index f947504569..8e2942f1a1 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -1907,11 +1907,7 @@ PROXY_DECLARE(int) ap_proxy_pre_request(proxy_worker **worker,
 
     access_status = proxy_run_pre_request(worker, balancer, r, conf, url);
     if (access_status == DECLINED && *balancer == NULL) {
-        const char *murl;
-        if ((murl = apr_table_get(r->notes, "auto")) == NULL) {
-            murl = *url;
-        }
-        *worker = ap_proxy_get_worker(r->pool, NULL, conf, murl);
+        *worker = ap_proxy_get_worker(r->pool, NULL, conf, *url);
         if (*worker) {
             ap_log_rerror(APLOG_MARK, APLOG_TRACE2, 0, r,
                           "%s: found worker %s for %s",