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 cb4ddd1f9b3ca46b2231223d38202540913f1440..527ad8b9d1e43d614f92901f329775f432f71a31 100644 (file)
--- 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);
     }