www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

r->filename should maintain the proxy: prefix for PHP-FPM

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1561660 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jim Jagielski
2014-01-27 13:09:11 +00:00
parent 097f0aa906
commit c9acc73574
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/proxy/proxy_util.c
View File

@@ -1957,12 +1957,15 @@ PROXY_DECLARE(int) ap_proxy_pre_request(proxy_worker **worker,
*ptr = '\0'; *ptr = '\0';
rv = apr_uri_parse(r->pool, ptr2, &urisock); rv = apr_uri_parse(r->pool, ptr2, &urisock);
if (rv == APR_SUCCESS) { if (rv == APR_SUCCESS) {
char *rurl = ptr+1;
char *sockpath = ap_runtime_dir_relative(r->pool, urisock.path); char *sockpath = ap_runtime_dir_relative(r->pool, urisock.path);
apr_table_setn(r->notes, "uds_path", sockpath); 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, rurl); /* so we get the scheme for the uds */
*url = apr_pstrdup(r->pool, r->filename); /* 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, 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 { else {
*ptr = '|'; *ptr = '|';