From a040b3c7bf1743558c60b6db3c7322169130777e Mon Sep 17 00:00:00 2001 From: "Victor J. Orlikowski" Date: Wed, 23 May 2001 03:39:44 +0000 Subject: [PATCH] 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 --- modules/proxy/mod_proxy.c | 2 +- modules/proxy/proxy_ftp.c | 4 ++-- modules/proxy/proxy_http.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c index 8b5b69ab506..57f5370d106 100644 --- 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 7eb377dff85..4ea3374583a 100644 --- 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 b51b02f6229..286a2bfe1d5 100644 --- 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)); } -- 2.47.2