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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1918647 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index 17d28c51ccc4c959eabd673e12d7dd7141835656..f3e1a0909abc65b42da7a31612afa81189e4846a 100644 (file)
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -1328,8 +1328,7 @@ static int proxy_handler(request_rec *r)
         r->filename = apr_pstrcat(r->pool, r->handler, r->filename, NULL);
 
         /* Still need to fixup/canonicalize r->filename */
-        uri = r->filename + 6;
-        rc = ap_proxy_fixup_uds_filename(r, &uri);
+        rc = ap_proxy_fixup_uds_filename(r);
         if (rc <= OK) {
             rc = proxy_fixup(r);
         }

diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
index fc4b559e35eb6dcc31f6353e0680355525be18e1..316313d098992fb443658019e48763705bd0c933 100644 (file)
--- a/modules/proxy/mod_proxy.h
+++ b/modules/proxy/mod_proxy.h
@@ -1030,14 +1030,12 @@ PROXY_DECLARE(proxy_balancer_shared *) ap_proxy_find_balancershm(ap_slotmem_prov
                                                                  unsigned int *index);
 
 /*
- * In the case of the reverse proxy, we need to see if we
- * were passed a UDS url (eg: from mod_proxy) and adjust uds_path
- * as required.  
+ * Strip the UDS part of r->filename if any, and put the UDS path in
+ * r->notes ("uds_path")
  * @param r        current request
- * @param url      request url to be fixed
  * @return         OK if fixed up, DECLINED if not UDS, or an HTTP_XXX error
  */
-PROXY_DECLARE(int) ap_proxy_fixup_uds_filename(request_rec *r, char **url);
+PROXY_DECLARE(int) ap_proxy_fixup_uds_filename(request_rec *r);
 
 /**
  * Get the most suitable worker and/or balancer for the request

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 628b74aebf31b1ded9b242e5a5a7e0c6284f363a..f7b78439d1764629a605747a69a2476987234d1e 100644 (file)
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -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;