Because the redirect-request survives logging, we don't have the

same exposure as subrequests, and this change would have doubled
the headers.  Revert this bit of the headers_in 'consistification'

Noted by rpluem.

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

diff --git a/CHANGES b/CHANGES
index 3383fe692dc4d2efe47dcaec07197addccbf1317..fd365c682a1ac259ad01529ecb3daf8829924fbe 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,7 +5,7 @@ Changes with Apache 2.3.5
   *) Ensure each subrequest has a shallow copy of headers_in so that the
      parent request headers are not corrupted.  Elimiates a problematic
      optimization in the case of no request body.  PR 48359 
-     [Jake Scott, William Rowe]
+     [Jake Scott, William Rowe, Ruediger Pluem]
 
   *) Turn static function get_server_name_for_url() into public
      ap_get_server_name_for_url() and use it where appropriate. This

diff --git a/modules/http/http_request.c b/modules/http/http_request.c
index a12cbf4c76a3c526bb213bae5300c09482690225..869bbc82a40a03443210e00200632753362e8e6d 100644 (file)
--- a/modules/http/http_request.c
+++ b/modules/http/http_request.c
@@ -442,7 +442,7 @@ static request_rec *internal_internal_redirect(const char *new_uri,
     new->request_time    = r->request_time;
     new->main            = r->main;
 
-    new->headers_in      = apr_table_copy(r->pool, r->headers_in);
+    new->headers_in      = r->headers_in;
     new->headers_out     = apr_table_make(r->pool, 12);
     new->err_headers_out = r->err_headers_out;
     new->subprocess_env  = rename_original_env(r->pool, r->subprocess_env);
@@ -515,8 +515,6 @@ AP_DECLARE(void) ap_internal_fast_redirect(request_rec *rr, request_rec *r)
     r->per_dir_config = rr->per_dir_config;
     /* copy output headers from subrequest, but leave negotiation headers */
     r->notes = apr_table_overlay(r->pool, rr->notes, r->notes);
-    r->headers_in = apr_table_overlay(r->pool, rr->headers_in,
-                                      r->headers_in);
     r->headers_out = apr_table_overlay(r->pool, rr->headers_out,
                                        r->headers_out);
     r->err_headers_out = apr_table_overlay(r->pool, rr->err_headers_out,