Commit ce5bd91d authored by Victor J. Orlikowski's avatar Victor J. Orlikowski
Browse files

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
parent d5b70fac

modules/proxy/mod_proxy.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

modules/proxy/mod_proxy.h

+1 −1
Original line number Diff line number Diff line
@@ -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"

modules/proxy/mod_proxy.mak

+20 −20
Original line number Diff line number Diff line
@@ -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"\

modules/proxy/proxy_connect.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

modules/proxy/proxy_ftp.c

+6 −6
Original line number Diff line number Diff line
@@ -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] : "";