From: Bradley Nicholes <bnicholes@apache.org>
Date: Wed, 22 Oct 2003 17:40:26 +0000 (+0000)
Subject: Another backport
X-Git-Tag: 2.0.48~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c23c985d2e00c5b8509c56d417d9ce684e1f23b8;p=thirdparty%2Fapache%2Fhttpd.git

Another backport


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

diff --git a/STATUS b/STATUS
index 962d742dd57..1e3bf5e2300 100644
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2003/10/22 17:35:04 $]
+Last modified at [$Date: 2003/10/22 17:40:26 $]
 
 Release:
 
@@ -272,6 +272,12 @@ PATCHES TO BACKPORT FROM 2.1
         server/protocol.c r1.138
       +1: trawick, stoddard
 
+    * 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()
+        server/core.c r1.247
+      +1: bnicholes
+
 CURRENT RELEASE NOTES:
 
     * Backwards compatibility is expected of future Apache 2.0 releases,