You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2014/06/15 15:54:55 UTC
svn commit: r1602697 - in /httpd/httpd/trunk/modules/proxy: mod_proxy.c
proxy_util.c
Author: jim
Date: Sun Jun 15 13:54:55 2014
New Revision: 1602697
URL: http://svn.apache.org/r1602697
Log:
revert 1602523, until there is understanding
about what the actual issue and "requirement" are.
Modified:
httpd/httpd/trunk/modules/proxy/mod_proxy.c
httpd/httpd/trunk/modules/proxy/proxy_util.c
Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.c?rev=1602697&r1=1602696&r2=1602697&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy.c Sun Jun 15 13:54:55 2014
@@ -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,
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,
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 *
Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=1602697&r1=1602696&r2=1602697&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Sun Jun 15 13:54:55 2014
@@ -1907,11 +1907,7 @@ PROXY_DECLARE(int) ap_proxy_pre_request(
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",