Shove some things along...

PR:
Obtained from:
Submitted by:
Reviewed by:

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

diff --git a/STATUS b/STATUS
index b0d940a38c1ac8ed73e6de06b9e7387f27306afe..10f4ed05ed630b2b5f7a243fd3e929eeb9e547df 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 1.3 STATUS:                                             -*-text-*-
-  Last modified at [$Date: 2004/03/25 14:14:11 $]
+  Last modified at [$Date: 2004/03/29 17:53:09 $]
 
 Release:
 
@@ -46,9 +46,9 @@ Release:
     2.0  : Available for general use, see httpd-2.0 repository
 
 RELEASE SHOWSTOPPERS:
-  *  Port value in Host: header ignored for UseCanonicalName != On.
-      Message-Id: <36DFE9DE-7924-11D8-9C02-000393D76AB8@jaguNET.com>
-                  <200403221440.i2MEeoJ15923@devsys.jaguNET.com>
+
+  *  PR: 27023 Cookie could not delivered if the cookie made before
+         proxy module.
 
 RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
 

diff --git a/src/main/http_vhost.c b/src/main/http_vhost.c
index 44af8fe8fd227d7fce123fb08d520fb287efe141..b69c55d868022ddc30ad01fe3068f7ef7c8a38c4 100644 (file)
--- a/src/main/http_vhost.c
+++ b/src/main/http_vhost.c
@@ -662,6 +662,7 @@ static void fix_hostname(request_rec *r)
     char *host = ap_palloc(r->pool, strlen(r->hostname) + 1);
     const char *src;
     char *dst;
+    char *port_str;
 
     /* check and copy the host part */
     src = r->hostname;
@@ -679,6 +680,7 @@ static void fix_hostname(request_rec *r)
            goto bad;
        }
         if (*src == ':') {
+            port_str = src + 1;
             /* check the port part */
             while (*++src) {
                 if (!ap_isdigit(*src)) {
@@ -687,8 +689,12 @@ static void fix_hostname(request_rec *r)
             }
             if (src[-1] == ':')
                 goto bad;
-            else
+            else {
+                /* a known "good" port value */
+                r->parsed_uri.port_str = ap_pstrdup(r->pool, port_str);
+                r->parsed_uri.port = atoi(r->parsed_uri.port_str);
                 break;
+            }
         }
        *dst++ = *src++;
     }