Temporary solution: make honoring the physical port number

a compile-time option.

PR:
Obtained from:
Submitted by:
Reviewed by:

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@103662 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/CHANGES b/src/CHANGES
index c86213fdc5201d1aef201d6e41a5cee77dc708a1..3537d42048ea0d9ba59bb9a08d3f71329befe4cd 100644 (file)
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,5 +1,13 @@
 Changes with Apache 1.3.32
 
+  *) COMPATIBILITY: Added new compile-time flag: UCN_OFF_HONOR_PHYSICAL_PORT.
+     It controls how UseCanonicalName Off determines the port value if
+     the client doesn't provide one in the Host header. If defined during
+     compilation, UseCanonicalName Off will use the physical port number to
+     generate the canonical name. If not defined, it trys the current Port
+     value followed by the default port for the current scheme.
+     [Jim Jagielski]
+
 Changes with Apache 1.3.31
 
   *) SECURITY: CAN-2003-0987 (cve.mitre.org)

diff --git a/src/main/http_core.c b/src/main/http_core.c
index 5e3a714f1c6015ad8a8c80c7eb880bb41528cdf0..38d7982af0888922929518ea6495e896776ed12f 100644 (file)
--- a/src/main/http_core.c
+++ b/src/main/http_core.c
@@ -847,7 +847,9 @@ API_EXPORT(unsigned) ap_get_server_port(const request_rec *r)
          * any are supplied (otherwise it will use the canonical name).
          */
         port = r->parsed_uri.port_str ? r->parsed_uri.port : 
+#ifdef UCN_OFF_HONOR_PHYSICAL_PORT
           cport ? cport :
+#endif
             r->server->port ? r->server->port :
               ap_default_port(r);
     } else { /* d->use_canonical_name == USE_CANONICAL_NAME_ON */