From bf85d9079e4198d6253917643da4892d8cfca667 Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Fri, 16 Feb 2018 00:22:38 +0000 Subject: [PATCH] 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 --- CHANGES | 2 ++ modules/session/mod_session.c | 13 ++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 3db385536b2..f8b9b8319e3 100644 --- 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 c573f981a74..10e6396a294 100644 --- 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; -- 2.47.3