diff options
| author | Graham Leggett <minfrin@apache.org> | 2010-03-27 18:48:20 +0100 |
|---|---|---|
| committer | Graham Leggett <minfrin@apache.org> | 2010-03-27 18:48:20 +0100 |
| commit | e3aec994376f0716a1cb73d50a2c20644b6c8f6f (patch) | |
| tree | 516baf6271d214925bf4e2ed69140fd3617a5bb4 /modules/session/mod_session_cookie.c | |
| parent | htcacheclean: Report additional statistics about entries deleted. (diff) | |
| download | apache2-e3aec994376f0716a1cb73d50a2c20644b6c8f6f.tar.xz apache2-e3aec994376f0716a1cb73d50a2c20644b6c8f6f.zip | |
Make sure we respect the proper pool lifetimes when saving away a preparsed
session.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@928238 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
| -rw-r--r-- | modules/session/mod_session_cookie.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/session/mod_session_cookie.c b/modules/session/mod_session_cookie.c index b4895489e7..fc04e5cc6d 100644 --- a/modules/session/mod_session_cookie.c +++ b/modules/session/mod_session_cookie.c @@ -137,7 +137,7 @@ static int session_cookie_load(request_rec * r, session_rec ** z) } /* 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_rec * r, session_rec ** z) 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 */ |