From 531901931cd7c65ff6085bdb2568b726e6301012 Mon Sep 17 00:00:00 2001 From: Graham Leggett Date: Fri, 16 Feb 2018 13:41:31 +0000 Subject: [PATCH] *) mod_session: Strip Session header when SessionEnv is on. trunk patch: http://svn.apache.org/r1824390 2.4.x patch: trunk works (modulo CHANGES) +1: ylavic, rpluem, minfrin git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1824477 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 2 ++ STATUS | 5 ----- modules/session/mod_session.c | 13 ++++++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CHANGES b/CHANGES index 14b8cc6eb5..5cbcd36210 100644 --- a/CHANGES +++ b/CHANGES @@ -1,6 +1,8 @@ -*- coding: utf-8 -*- Changes with Apache 2.4.30 + *) mod_session: Strip Session header when SessionEnv is on. [Yann Ylavic] + *) mod_cache_socache: Fix caching of empty headers up to carriage return. [Yann Ylavic] diff --git a/STATUS b/STATUS index 7cfc94abf6..2b851c42ec 100644 --- a/STATUS +++ b/STATUS @@ -118,11 +118,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) mod_session: Strip Session header when SessionEnv is on. - trunk patch: http://svn.apache.org/r1824390 - 2.4.x patch: trunk works (modulo CHANGES) - +1: ylavic, rpluem, minfrin - PATCHES PROPOSED TO BACKPORT FROM TRUNK: diff --git a/modules/session/mod_session.c b/modules/session/mod_session.c index ff4c9a6f2d..d517020d99 100644 --- a/modules/session/mod_session.c +++ b/modules/session/mod_session.c @@ -510,12 +510,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.40.0