Backport r807015

PR 35999 - preserve port over internal redirection
Patch by Jonas Ringh
Reviewed niq, covener, sf

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

diff --git a/CHANGES b/CHANGES
index b22514f5247bacb0846b138f754168fef2d34f80..e44d6494d411690e864a6bc59ce8d5d0d9be5ddc 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,9 @@ Changes with Apache 2.2.15
      access control is still vulnerable, unless using OpenSSL >= 0.9.8l.
      [Joe Orton, Ruediger Pluem, Hartmut Keil <Hartmut.Keil adnovum.ch>]
 
+  *) Preserve Port information over internal redirects
+     PR 35999 [Jonas Ringh <jonas.ringh cixit.se>]
+
   *) mod_filter: fix FilterProvider matching where "dispatch" string
      doesn't exist.
      PR 48054 [<tietw gmail.com>]

diff --git a/STATUS b/STATUS
index e6657e4fbfe4d06ad8553795213b49d1a014711c..b18e300b253a5540ee189d7a7c36db68d5c82ff3 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -87,11 +87,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * http_request: preserve port over internal redirect.
-    PR 35999
-    Patch: http://svn.apache.org/viewvc?view=revision&revision=807015
-    +1: niq, covener, sf
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

diff --git a/modules/http/http_request.c b/modules/http/http_request.c
index fe10a196220be6823a32953686dc486028236878..d10ec3cb89315e255fe99f84a6cfddf4c6729b9d 100644 (file)
--- a/modules/http/http_request.c
+++ b/modules/http/http_request.c
@@ -353,6 +353,8 @@ static request_rec *internal_internal_redirect(const char *new_uri,
     new->method_number   = r->method_number;
     new->allowed_methods = ap_make_method_list(new->pool, 2);
     ap_parse_uri(new, new_uri);
+    new->parsed_uri.port_str = r->parsed_uri.port_str;
+    new->parsed_uri.port = r->parsed_uri.port;
 
     new->request_config = ap_create_request_config(r->pool);