Commit 5987c87b authored by Graham Leggett's avatar Graham Leggett
Browse files

*) 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
parent c1b6278f

CHANGES

+2 −0
Original line number Diff line number Diff line 
                                                         -*- 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]

STATUS

+0 −5
Original line number Diff line number Diff line
@@ -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:

modules/session/mod_session.c

+8 −5
Original line number Diff line number Diff line
@@ -510,13 +510,16 @@ static int session_fixups(request_rec * r) 
     */

    ap_session_load(r, &z);



    if (z && conf->env) {

    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;