www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Code Activity

mod_session_dbd: follow up to r1687021.

Browse Source 
Move the new pool argument of dbd_load() first as the other functions in the
module (no functional change).
Suggested by: mrumph

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1687087 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yann Ylavic
2015-06-23 15:38:13 +00:00
parent 4aa8d59e98
commit cd7fdfee05
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/session/mod_session_dbd.c
View File

@@ -97,8 +97,8 @@ static apr_status_t dbd_init(request_rec *r, const char *query, ap_dbd_t **dbdp,
*
* The session value is allocated using the passed apr_pool_t.
*/
static apr_status_t dbd_load(request_rec * r, apr_pool_t *pool,
const char *key, const char **val)
static apr_status_t dbd_load(apr_pool_t *p, request_rec * r,
const char *key, const char **val)
{
apr_status_t rv;
@@ -141,8 +141,7 @@ static apr_status_t dbd_load(request_rec * r, apr_pool_t *pool,
return APR_EGENERAL;
}
if (*val == NULL) {
*val = apr_pstrdup(pool,
apr_dbd_get_entry(dbd->driver, row, 0));
*val = apr_pstrdup(p, apr_dbd_get_entry(dbd->driver, row, 0));
}
/* we can't break out here or row won't get cleaned up */
}
@@ -207,7 +206,7 @@ static apr_status_t session_dbd_load(request_rec * r, session_rec ** z)
/* load an RFC2109 or RFC2965 compliant cookie */
ap_cookie_read(r, name, &key, conf->remove);
if (key) {
ret = dbd_load(r, m->pool, key, &val);
ret = dbd_load(m->pool, r, key, &val);
if (ret != APR_SUCCESS) {
return ret;
}
@@ -218,7 +217,7 @@ static apr_status_t session_dbd_load(request_rec * r, session_rec ** z)
/* load named session */
else if (conf->peruser) {
if (r->user) {
ret = dbd_load(r, m->pool, r->user, &val);
ret = dbd_load(m->pool, r, r->user, &val);
if (ret != APR_SUCCESS) {
return ret;
}