httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r928238 - /httpd/httpd/trunk/modules/session/mod_session_cookie.c
Date Sat, 27 Mar 2010 17:48:20 GMT
Author: minfrin
Date: Sat Mar 27 17:48:20 2010
New Revision: 928238

URL: http://svn.apache.org/viewvc?rev=928238&view=rev
Log:
Make sure we respect the proper pool lifetimes when saving away a preparsed
session.

Modified:
    httpd/httpd/trunk/modules/session/mod_session_cookie.c

Modified: httpd/httpd/trunk/modules/session/mod_session_cookie.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/session/mod_session_cookie.c?rev=928238&r1=928237&r2=928238&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/session/mod_session_cookie.c (original)
+++ httpd/httpd/trunk/modules/session/mod_session_cookie.c Sat Mar 27 17:48:20 2010
@@ -137,7 +137,7 @@ static int session_cookie_load(request_r
     }
 
     /* first look in the notes */
-    note = apr_pstrcat(r->pool, MOD_SESSION_COOKIE, name, NULL);
+    note = apr_pstrcat(m->pool, MOD_SESSION_COOKIE, name, NULL);
     zz = (session_rec *)apr_table_get(m->notes, note);
     if (zz) {
         *z = zz;
@@ -148,11 +148,11 @@ static int session_cookie_load(request_r
     ap_cookie_read(r, name, &val, conf->remove);
 
     /* create a new session and return it */
-    zz = (session_rec *) apr_pcalloc(r->pool, sizeof(session_rec));
-    zz->pool = r->pool;
-    zz->entries = apr_table_make(r->pool, 10);
+    zz = (session_rec *) apr_pcalloc(m->pool, sizeof(session_rec));
+    zz->pool = m->pool;
+    zz->entries = apr_table_make(m->pool, 10);
     zz->encoded = val;
-    zz->uuid = (apr_uuid_t *) apr_pcalloc(r->pool, sizeof(apr_uuid_t));
+    zz->uuid = (apr_uuid_t *) apr_pcalloc(m->pool, sizeof(apr_uuid_t));
     *z = zz;
 
     /* put the session in the notes so we don't have to parse it again */



Mime
View raw message