Fixes to proxy, after util-uri move, plus fixes to the .mak file.

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

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index 0d6b28977f524ca8955e14f7af1b38a6db6db25a..8b5b69ab50677a8f48e54354a15c2e54b9e5d9ea 100644 (file)
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -244,14 +244,14 @@ static int proxy_needsdomain(request_rec *r, const char *url, const char *domain
     /* Note that the domain name always starts with a dot */
     r->parsed_uri.hostname = apr_pstrcat(r->pool, r->parsed_uri.hostname,
                                     domain, NULL);
-    nuri = ap_unparse_uri_components(r->pool,
+    nuri = apr_uri_unparse_components(r->pool,
                                  &r->parsed_uri,
                                  UNP_REVEALPASSWORD);
 
     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_unparse_uri_components(r->pool, &r->parsed_uri,
+               ap_uri_unparse_components(r->pool, &r->parsed_uri,
                      UNP_OMITUSERINFO),
                ref ? " from " : "", ref ? ref : "");
 
@@ -478,7 +478,7 @@ static const char *
     ap_str_tolower(p + 3);             /* lowercase hostname */
 
     if (port == -1) {
-       port = ap_default_port_for_scheme(scheme);
+       port = apr_uri_default_port_for_scheme(scheme);
     }
 
     new = apr_array_push(conf->proxies);

diff --git a/modules/proxy/mod_proxy.h b/modules/proxy/mod_proxy.h
index d864e7b5047c223bbb8fedeb36b532612a671e33..7c2e9a7bd6f4002fe994a0b88c261fed4a9e9f0e 100644 (file)
--- a/modules/proxy/mod_proxy.h
+++ b/modules/proxy/mod_proxy.h
@@ -90,6 +90,7 @@
 #include "apr_md5.h"
 #include "apr_pools.h"
 #include "apr_strings.h"
+#include "apr_uri.h"
 
 #include "httpd.h"
 #include "http_config.h"
@@ -103,7 +104,6 @@
 #include "http_connection.h"
 #include "util_filter.h"
 #include "util_date.h"
-#include "util_uri.h"
 #include "mod_core.h"
 
 

diff --git a/modules/proxy/mod_proxy.mak b/modules/proxy/mod_proxy.mak
index 3d13f3d1ac61d376c8ec1de818401efb0ac3040a..435796b3bd7440e59d4b3deab8d1390873cad304 100644 (file)
--- a/modules/proxy/mod_proxy.mak
+++ b/modules/proxy/mod_proxy.mak
@@ -257,11 +257,11 @@ DEP_CPP_MOD_P=\
        "..\..\include\util_cfgtree.h"\
        "..\..\include\util_date.h"\
        "..\..\include\util_filter.h"\
-       "..\..\include\util_uri.h"\
        "..\..\os\win32\os.h"\
-       "..\..\srclib\apr-util\include\ap_buckets.h"\
-       "..\..\srclib\apr-util\include\ap_hooks.h"\
-       "..\..\srclib\apr-util\include\ap_ring.h"\
+       "..\..\srclib\apr-util\include\apr_buckets.h"\
+       "..\..\srclib\apr-util\include\apr_hooks.h"\
+       "..\..\srclib\apr-util\include\apr_ring.h"\
+       "..\..\srclib\apr-util\include\apr_uri.h"\
        "..\..\srclib\apr\include\apr.h"\
        "..\..\srclib\apr\include\apr_compat.h"\
        "..\..\srclib\apr\include\apr_dso.h"\
@@ -303,11 +303,11 @@ DEP_CPP_PROXY=\
        "..\..\include\pcreposix.h"\
        "..\..\include\util_cfgtree.h"\
        "..\..\include\util_filter.h"\
-       "..\..\include\util_uri.h"\
        "..\..\os\win32\os.h"\
-       "..\..\srclib\apr-util\include\ap_buckets.h"\
-       "..\..\srclib\apr-util\include\ap_hooks.h"\
-       "..\..\srclib\apr-util\include\ap_ring.h"\
+       "..\..\srclib\apr-util\include\apr_buckets.h"\
+       "..\..\srclib\apr-util\include\apr_hooks.h"\
+       "..\..\srclib\apr-util\include\apr_ring.h"\
+       "..\..\srclib\apr-util\include\apr_uri.h"\
        "..\..\srclib\apr\include\apr.h"\
        "..\..\srclib\apr\include\apr_compat.h"\
        "..\..\srclib\apr\include\apr_dso.h"\
@@ -350,11 +350,11 @@ DEP_CPP_PROXY_=\
        "..\..\include\pcreposix.h"\
        "..\..\include\util_cfgtree.h"\
        "..\..\include\util_filter.h"\
-       "..\..\include\util_uri.h"\
        "..\..\os\win32\os.h"\
-       "..\..\srclib\apr-util\include\ap_buckets.h"\
-       "..\..\srclib\apr-util\include\ap_hooks.h"\
-       "..\..\srclib\apr-util\include\ap_ring.h"\
+       "..\..\srclib\apr-util\include\apr_buckets.h"\
+       "..\..\srclib\apr-util\include\apr_hooks.h"\
+       "..\..\srclib\apr-util\include\apr_ring.h"\
+       "..\..\srclib\apr-util\include\apr_uri.h"\
        "..\..\srclib\apr\include\apr.h"\
        "..\..\srclib\apr\include\apr_compat.h"\
        "..\..\srclib\apr\include\apr_dso.h"\
@@ -399,11 +399,11 @@ DEP_CPP_PROXY_H=\
        "..\..\include\util_cfgtree.h"\
        "..\..\include\util_date.h"\
        "..\..\include\util_filter.h"\
-       "..\..\include\util_uri.h"\
        "..\..\os\win32\os.h"\
-       "..\..\srclib\apr-util\include\ap_buckets.h"\
-       "..\..\srclib\apr-util\include\ap_hooks.h"\
-       "..\..\srclib\apr-util\include\ap_ring.h"\
+       "..\..\srclib\apr-util\include\apr_buckets.h"\
+       "..\..\srclib\apr-util\include\apr_hooks.h"\
+       "..\..\srclib\apr-util\include\apr_ring.h"\
+       "..\..\srclib\apr-util\include\apr_uri.h"\
        "..\..\srclib\apr\include\apr.h"\
        "..\..\srclib\apr\include\apr_compat.h"\
        "..\..\srclib\apr\include\apr_dso.h"\
@@ -447,11 +447,11 @@ DEP_CPP_PROXY_U=\
        "..\..\include\util_cfgtree.h"\
        "..\..\include\util_date.h"\
        "..\..\include\util_filter.h"\
-       "..\..\include\util_uri.h"\
        "..\..\os\win32\os.h"\
-       "..\..\srclib\apr-util\include\ap_buckets.h"\
-       "..\..\srclib\apr-util\include\ap_hooks.h"\
-       "..\..\srclib\apr-util\include\ap_ring.h"\
+       "..\..\srclib\apr-util\include\apr_buckets.h"\
+       "..\..\srclib\apr-util\include\apr_hooks.h"\
+       "..\..\srclib\apr-util\include\apr_ring.h"\
+       "..\..\srclib\apr-util\include\apr_uri.h"\
        "..\..\srclib\apr\include\apr.h"\
        "..\..\srclib\apr\include\apr_compat.h"\
        "..\..\srclib\apr\include\apr_dso.h"\

diff --git a/modules/proxy/proxy_connect.c b/modules/proxy/proxy_connect.c
index 8fe1cd8b95bc4e144b3d08eb06d1def68bcc2d83..f821b133f578d8e0f47b273e981112954fc8cfb2 100644 (file)
--- a/modules/proxy/proxy_connect.c
+++ b/modules/proxy/proxy_connect.c
@@ -134,7 +134,7 @@ int ap_proxy_connect_handler(request_rec *r, proxy_server_conf *conf,
     apr_int16_t pollevent;
     apr_sockaddr_t *uri_addr, *connect_addr;
 
-    uri_components uri;
+    apr_uri_components uri;
     const char *connectname;
     int connectport = 0;
 
@@ -155,7 +155,7 @@ int ap_proxy_connect_handler(request_rec *r, proxy_server_conf *conf,
      */
 
     /* we break the URL into host, port, uri */
-    if (HTTP_OK != ap_parse_hostinfo_components(p, url, &uri)) {
+    if (HTTP_OK != apr_uri_parse_hostinfo_components(p, url, &uri)) {
        return ap_proxyerror(r, HTTP_BAD_REQUEST,
                             apr_pstrcat(p, "URI cannot be parsed: ", url, NULL));
     }
@@ -190,8 +190,8 @@ int ap_proxy_connect_handler(request_rec *r, proxy_server_conf *conf,
     if (conf->allowed_connect_ports->nelts == 0) {
        /* Default setting if not overridden by AllowCONNECT */
        switch (uri.port) {
-           case DEFAULT_HTTPS_PORT:
-           case DEFAULT_SNEWS_PORT:
+           case APU_URI_HTTPS_DEFAULT_PORT:
+           case APU_URI_SNEWS_DEFAULT_PORT:
                break;
            default:
                return HTTP_FORBIDDEN;

diff --git a/modules/proxy/proxy_ftp.c b/modules/proxy/proxy_ftp.c
index 1ef1030353d5d8ec09a50469fe8f6a5782b059af..7eb377dff85b51201cf1f7047bcdc6e0bba64172 100644 (file)
--- a/modules/proxy/proxy_ftp.c
+++ b/modules/proxy/proxy_ftp.c
@@ -135,7 +135,7 @@ int ap_proxy_ftp_canon(request_rec *r, char *url)
     else {
        return DECLINED;
     }
-    def_port = ap_default_port_for_scheme("ftp");
+    def_port = apr_uri_default_port_for_scheme("ftp");
 
     ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
                 "proxy: FTP: canonicalising URL %s", url);
@@ -289,9 +289,9 @@ apr_status_t ap_proxy_send_dir_filter(ap_filter_t *f, apr_bucket_brigade *in)
     if (HEADER == ctx->state) {
 
        /* Save "scheme://site" prefix without password */
-       site = ap_unparse_uri_components(p, &f->r->parsed_uri, UNP_OMITPASSWORD|UNP_OMITPATHINFO);
+       site = apr_uri_unparse_components(p, &f->r->parsed_uri, UNP_OMITPASSWORD|UNP_OMITPATHINFO);
        /* ... and path without query args */
-       path = ap_unparse_uri_components(p, &f->r->parsed_uri, UNP_OMITSITEPART|UNP_OMITQUERY);
+       path = apr_uri_unparse_components(p, &f->r->parsed_uri, UNP_OMITSITEPART|UNP_OMITQUERY);
        (void)decodeenc(path);
 
        /* Copy path, strip (all except the last) trailing slashes */
@@ -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_unparse_uri_components(r->pool,
+                     ap_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_unparse_uri_components(r->pool, &r->parsed_uri,
+                 ap_uri_unparse_components(r->pool, &r->parsed_uri,
                    UNP_OMITPASSWORD|UNP_OMITPATHINFO),
                    "\"", NULL));
 
@@ -602,7 +602,7 @@ int ap_proxy_ftp_handler(request_rec *r, proxy_server_conf *conf,
     connectname = r->parsed_uri.hostname;
     connectport = (r->parsed_uri.port != 0)
                   ? r->parsed_uri.port
-                  : ap_default_port_for_request(r);
+                  : apr_uri_default_port_for_scheme("ftp");
     path = apr_pstrdup(p, r->parsed_uri.path);
     path = (path != NULL && path[0] != '\0') ? &path[1] : "";
 

diff --git a/modules/proxy/proxy_http.c b/modules/proxy/proxy_http.c
index 38060d485a18930cbf05c73204352d8c2627b341..b51b02f62292f6b29b604b8c4b578be35092b4a1 100644 (file)
--- a/modules/proxy/proxy_http.c
+++ b/modules/proxy/proxy_http.c
@@ -93,7 +93,7 @@ int ap_proxy_http_canon(request_rec *r, char *url)
     else {
        return DECLINED;
     }
-    def_port = ap_default_port_for_scheme(scheme);
+    def_port = apr_uri_default_port_for_scheme(scheme);
 
     ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,
                 "proxy: HTTP: canonicalising URL %s", url);
@@ -205,7 +205,7 @@ int ap_proxy_http_handler(request_rec *r, proxy_server_conf *conf,
     char buffer[HUGE_STRING_LEN];
     char *buf;
     conn_rec *origin = NULL;
-    uri_components uri;
+    apr_uri_components uri;
     proxy_conn_rec *backend;
 
     /* Note: Memory pool allocation.
@@ -252,12 +252,12 @@ int ap_proxy_http_handler(request_rec *r, proxy_server_conf *conf,
      */
 
     /* we break the URL into host, port, uri */
-    if (HTTP_OK != ap_parse_uri_components(p, url, &uri)) {
+    if (HTTP_OK != ap_uri_parse_components(p, url, &uri)) {
        return ap_proxyerror(r, HTTP_BAD_REQUEST,
                             apr_pstrcat(p,"URI cannot be parsed: ", url, NULL));
     }
     if (!uri.port) {
-       uri.port = ap_default_port_for_scheme(uri.scheme);
+       uri.port = apr_uri_default_port_for_scheme(uri.scheme);
     }
 
     ap_log_error(APLOG_MARK, APLOG_DEBUG|APLOG_NOERRNO, 0, r->server,