mod_session: Strip Session header when SessionEnv is on.

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

diff --git a/CHANGES b/CHANGES
index 3db385536b2c746f934cd576c55f1db06f886db0..f8b9b8319e355eb524c4670cdeec2c2da5c93150 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.1
 
+  *) mod_session: Strip Session header when SessionEnv is on.  [Yann Ylavic]
+
   *) mpm_queue: Put fdqueue code in common for MPMs event and worker.
      [Yann Ylavic]
 

diff --git a/modules/session/mod_session.c b/modules/session/mod_session.c
index c573f981a74fe9c7cb0b9bb4b5f988c4ee29f5e0..10e6396a2943cc537bfa46ef5fd0bb01f9c4a069 100644 (file)
--- a/modules/session/mod_session.c
+++ b/modules/session/mod_session.c
@@ -522,12 +522,15 @@ static int session_fixups(request_rec * r)
      */
     ap_session_load(r, &z);
 
-    if (z && conf->env) {
-        session_identity_encode(r, z);
-        if (z->encoded) {
-            apr_table_set(r->subprocess_env, HTTP_SESSION, z->encoded);
-            z->encoded = NULL;
+    if (conf->env) {
+        if (z) {
+            session_identity_encode(r, z);
+            if (z->encoded) {
+                apr_table_set(r->subprocess_env, HTTP_SESSION, z->encoded);
+                z->encoded = NULL;
+            }
         }
+        apr_table_unset(r->headers_in, "Session");
     }
 
     return OK;