From: Bradley Nicholes <bnicholes@apache.org>
Date: Wed, 22 Oct 2003 17:07:26 +0000 (+0000)
Subject: When UseCanonicalName is set to OFF, allow ap_get_server_port to check
X-Git-Tag: pre_ajp_proxy~1101
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=b9f260e7223e175be4fc31be4d9886783d2393b5;p=thirdparty%2Fapache%2Fhttpd.git

When UseCanonicalName is set to OFF, allow ap_get_server_port to check
r->connection->local_addr->port before defaulting to server->port or
ap_default_port().


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

diff --git a/server/core.c b/server/core.c
index cb4ddd1f9b3..527ad8b9d1e 100644
--- a/server/core.c
+++ b/server/core.c
@@ -928,6 +928,7 @@ AP_DECLARE(apr_port_t) ap_get_server_port(const request_rec *r)
          * any are supplied (otherwise it will use the canonical name).
          */
         port = r->parsed_uri.port ? r->parsed_uri.port :
+               r->connection->local_addr->port ? r->connection->local_addr->port :
                r->server->port ? r->server->port :
                ap_default_port(r);
     }