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

mod_proxy: follow up to r1918626: Simplify ap_proxy_fixup_uds_filename() and callers.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1918647 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2024-06-26 09:19:16 +00:00
parent 7672c68e4a
commit ad3f022fa1
3 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
modules/proxy/proxy_util.c
View File

@@ -2425,7 +2425,7 @@ static int ap_proxy_retry_worker(const char *proxy_function, proxy_worker *worke
* were passed a UDS url (eg: from mod_proxy) and adjust uds_path
* as required.
*/
PROXY_DECLARE(int) ap_proxy_fixup_uds_filename(request_rec *r, char **url)
PROXY_DECLARE(int) ap_proxy_fixup_uds_filename(request_rec *r)
{
char *uds_url = r->filename + 6, *origin_url;
@@ -2433,7 +2433,6 @@ PROXY_DECLARE(int) ap_proxy_fixup_uds_filename(request_rec *r, char **url)
!ap_cstr_casecmpn(uds_url, "unix:", 5) &&
(origin_url = ap_strchr(uds_url + 5, '|'))) {
char *uds_path = NULL;
apr_size_t url_len;
apr_uri_t urisock;
apr_status_t rv;
@@ -2452,14 +2451,12 @@ PROXY_DECLARE(int) ap_proxy_fixup_uds_filename(request_rec *r, char **url)
}
apr_table_setn(r->notes, "uds_path", uds_path);
/* Remove the UDS path from *url and r->filename */
url_len = strlen(origin_url);
*url = apr_pstrmemdup(r->pool, origin_url, url_len);
memcpy(uds_url, *url, url_len + 1);
ap_log_rerror(APLOG_MARK, APLOG_TRACE2, 0, r,
"*: rewrite of url due to UDS(%s): %s (%s)",
uds_path, *url, r->filename);
"*: fixup UDS from %s: %s (%s)",
r->filename, origin_url, uds_path);
/* Overwrite the UDS part in place */
memmove(uds_url, origin_url, strlen(origin_url) + 1);
return OK;
}
@@ -2521,10 +2518,17 @@ PROXY_DECLARE(int) ap_proxy_pre_request(proxy_worker **worker,
access_status = HTTP_SERVICE_UNAVAILABLE;
}
if (access_status == OK
&& r->proxyreq == PROXYREQ_REVERSE
&& ap_proxy_fixup_uds_filename(r, url) > OK) {
return HTTP_INTERNAL_SERVER_ERROR;
if (access_status == OK && r->proxyreq == PROXYREQ_REVERSE) {
int rc = ap_proxy_fixup_uds_filename(r);
if (ap_is_HTTP_ERROR(rc)) {
return rc;
}
/* If the URL has changed in r->filename, take everything after
* the "proxy:" prefix.
*/
if (rc == OK) {
*url = apr_pstrdup(r->pool, r->filename + 6);
}
}
return access_status;