httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r1536320 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS modules/session/mod_session.c
Date Mon, 28 Oct 2013 12:02:17 GMT
Author: jim
Date: Mon Oct 28 12:02:17 2013
New Revision: 1536320

URL: http://svn.apache.org/r1536320
Log:
Merge r1531679 from trunk:

mod_session: After parsing the value of the header specified by the
SessionHeader directive, remove the value from the response. PR 55279.

Submitted by: minfrin
Reviewed/backported by: jim

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/session/mod_session.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1531679

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1536320&r1=1536319&r2=1536320&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Mon Oct 28 12:02:17 2013
@@ -2,6 +2,10 @@
 
 Changes with Apache 2.4.7
 
+  *) mod_session: After parsing the value of the header specified by the
+     SessionHeader directive, remove the value from the response. PR 55279.
+     [Graham Leggett]
+
   *) mod_dav: dav_resource->uri is treated as unencoded. This was an
      unnecessary ABI changed introduced in 2.4.6. PR 55397.
 

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1536320&r1=1536319&r2=1536320&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Oct 28 12:02:17 2013
@@ -97,12 +97,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * mod_session: After parsing the value of the header specified by the
-    SessionHeader directive, remove the value from the response. PR 55279.
-    trunk patch: http://svn.apache.org/r1531679
-    2.4.x patch: trunk patch works, modulo CHANGES
-    +1: minfrin, jim, druggeri
-
     *) mod_session: Reset the max-age on session save. PR 47476.
     trunk patch: http://svn.apache.org/r1531683
     2.4.x patch: trunk patch works, modulo CHANGES

Modified: httpd/httpd/branches/2.4.x/modules/session/mod_session.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/session/mod_session.c?rev=1536320&r1=1536319&r2=1536320&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/session/mod_session.c (original)
+++ httpd/httpd/branches/2.4.x/modules/session/mod_session.c Mon Oct 28 12:02:17 2013
@@ -443,6 +443,8 @@ static apr_status_t session_output_filte
                 override = apr_table_get(r->headers_out, conf->header);
             }
             if (override) {
+                apr_table_unset(r->err_headers_out, conf->header);
+                apr_table_unset(r->headers_out, conf->header);
                 z->encoded = override;
                 z->dirty = 1;
                 session_identity_decode(r, z);



Mime
View raw message