httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1561660 - /httpd/httpd/trunk/modules/proxy/proxy_util.c
Date Mon, 27 Jan 2014 13:09:12 GMT
Author: jim
Date: Mon Jan 27 13:09:11 2014
New Revision: 1561660

URL: http://svn.apache.org/r1561660
Log:
r->filename should maintain the proxy: prefix for PHP-FPM

Modified:
    httpd/httpd/trunk/modules/proxy/proxy_util.c

Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=1561660&r1=1561659&r2=1561660&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Mon Jan 27 13:09:11 2014
@@ -1957,12 +1957,15 @@ PROXY_DECLARE(int) ap_proxy_pre_request(
                     *ptr = '\0';
                     rv = apr_uri_parse(r->pool, ptr2, &urisock);
                     if (rv == APR_SUCCESS) {
+                        char *rurl = ptr+1;
                         char *sockpath = ap_runtime_dir_relative(r->pool, urisock.path);
                         apr_table_setn(r->notes, "uds_path", sockpath);
-                        r->filename = ptr+1;    /* so we get the scheme for the uds */
-                        *url = apr_pstrdup(r->pool, r->filename);
+                        *url = apr_pstrdup(r->pool, rurl); /* so we get the scheme for
the uds */
+                        /* r->filename starts w/ "proxy:", so add after that */
+                        memmove(r->filename+6, rurl, strlen(rurl)+1);
                         ap_log_rerror(APLOG_MARK, APLOG_TRACE2, 0, r,
-                                      "*: rewrite of url due to UDS: %s", *url);
+                                      "*: rewrite of url due to UDS(%s): %s (%s)",
+                                      sockpath, *url, r->filename);
                     }
                     else {
                         *ptr = '|';



Mime
View raw message