From c9acc73574002a2f44d04ffaf0f567c680b6e9a5 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Mon, 27 Jan 2014 13:09:11 +0000 Subject: [PATCH] r->filename should maintain the proxy: prefix for PHP-FPM git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1561660 13f79535-47bb-0310-9956-ffa450edef68 --- modules/proxy/proxy_util.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index fb6426bf34..a465161866 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -1957,12 +1957,15 @@ PROXY_DECLARE(int) ap_proxy_pre_request(proxy_worker **worker, *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 = '|'; -- 2.50.1