svn commit: r897568 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/http/http_request.c

[ni...@apache.org]

Author: niq
Date: Sat Jan  9 22:32:48 2010
New Revision: 897568

URL: http://svn.apache.org/viewvc?rev=897568&view=rev
Log:
Backport r807015
PR 35999 - preserve port over internal redirection
Patch by Jonas Ringh
Reviewed niq, covener, sf

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/http/http_request.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=897568&r1=897567&r2=897568&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Sat Jan  9 22:32:48 2010
@@ -9,6 +9,9 @@
      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>]

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=897568&r1=897567&r2=897568&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Sat Jan  9 22:32:48 2010
@@ -87,11 +87,6 @@
 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 ]
 

Modified: httpd/httpd/branches/2.2.x/modules/http/http_request.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/http/http_request.c?rev=897568&r1=897567&r2=897568&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/http/http_request.c (original)
+++ httpd/httpd/branches/2.2.x/modules/http/http_request.c Sat Jan  9 22:32:48 2010
@@ -353,6 +353,8 @@
     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);