Bletch. The Proxy Janitor botches the job again.

Thanks to Ian Holsman for the catch.

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

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index 8b5b69ab50677a8f48e54354a15c2e54b9e5d9ea..57f5370d10662e1ed8075e3b0f964945a9d4908e 100644 (file)
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -251,7 +251,7 @@ static int proxy_needsdomain(request_rec *r, const char *url, const char *domain
     apr_table_set(r->headers_out, "Location", nuri);
     ap_log_rerror(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, r,
                "Domain missing: %s sent to %s%s%s", r->uri,
-               ap_uri_unparse_components(r->pool, &r->parsed_uri,
+               apr_uri_unparse_components(r->pool, &r->parsed_uri,
                      UNP_OMITUSERINFO),
                ref ? " from " : "", ref ? ref : "");
 

diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c
index 7eb377dff85b51201cf1f7047bcdc6e0bba64172..4ea3374583a7676788e906e9b4e8a1dbf760123a 100644 (file)
--- a/modules/proxy/proxy_ftp.c
+++ b/modules/proxy/proxy_ftp.c
@@ -510,12 +510,12 @@ static int ftp_unauthorized (request_rec *r, int log_it)
     if (log_it)
        ap_log_rerror(APLOG_MARK, APLOG_INFO|APLOG_NOERRNO, 0, r,
                      "proxy: missing or failed auth to %s",
-                     ap_uri_unparse_components(r->pool,
+                     apr_uri_unparse_components(r->pool,
                      &r->parsed_uri, UNP_OMITPATHINFO));
 
     apr_table_setn(r->err_headers_out, "WWW-Authenticate",
                   apr_pstrcat(r->pool, "Basic realm=\"",
-                 ap_uri_unparse_components(r->pool, &r->parsed_uri,
+                 apr_uri_unparse_components(r->pool, &r->parsed_uri,
                    UNP_OMITPASSWORD|UNP_OMITPATHINFO),
                    "\"", NULL));
 

diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c
index b51b02f62292f6b29b604b8c4b578be35092b4a1..286a2bfe1d5d1b4f72d3e785755dfe2f459b7921 100644 (file)
--- a/modules/proxy/proxy_http.c
+++ b/modules/proxy/proxy_http.c
@@ -252,7 +252,7 @@ int ap_proxy_http_handler(request_rec *r, proxy_server_conf *conf,
      */
 
     /* we break the URL into host, port, uri */
-    if (HTTP_OK != ap_uri_parse_components(p, url, &uri)) {
+    if (HTTP_OK != apr_uri_parse_components(p, url, &uri)) {
        return ap_proxyerror(r, HTTP_BAD_REQUEST,
                             apr_pstrcat(p,"URI cannot be parsed: ", url, NULL));
     }