From: Graham Leggett <minfrin@apache.org>
Date: Sat, 10 May 2008 22:57:36 +0000 (+0000)
Subject: Make sure the optional function calls are used for ap_session_set and
X-Git-Tag: 2.3.0~647
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4e084cccd643fb3e0d0c7d89ec0c734fe83e62c3;p=apache

Make sure the optional function calls are used for ap_session_set and
ap_session_get. [Brad Nicholes]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@655205 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/aaa/mod_auth_form.c b/modules/aaa/mod_auth_form.c
index d8228e7cca..bf0452f62b 100644
--- a/modules/aaa/mod_auth_form.c
+++ b/modules/aaa/mod_auth_form.c
@@ -514,9 +514,9 @@ static apr_status_t set_session_auth(request_rec * r,
     }
 
     ap_session_load_fn(r, &z);
-    ap_session_set(r, z, apr_pstrcat(r->pool, authname, "-" MOD_SESSION_USER, NULL), user);
-    ap_session_set(r, z, apr_pstrcat(r->pool, authname, "-" MOD_SESSION_PW, NULL), pw);
-    ap_session_set(r, z, apr_pstrcat(r->pool, authname, "-" MOD_AUTH_FORM_HASH, NULL), hash);
+    ap_session_set_fn(r, z, apr_pstrcat(r->pool, authname, "-" MOD_SESSION_USER, NULL), user);
+    ap_session_set_fn(r, z, apr_pstrcat(r->pool, authname, "-" MOD_SESSION_PW, NULL), pw);
+    ap_session_set_fn(r, z, apr_pstrcat(r->pool, authname, "-" MOD_AUTH_FORM_HASH, NULL), hash);
 
     return APR_SUCCESS;
 
@@ -534,13 +534,13 @@ static apr_status_t get_session_auth(request_rec * r,
     ap_session_load_fn(r, &z);
 
     if (user) {
-        ap_session_get(r, z, apr_pstrcat(r->pool, authname, "-" MOD_SESSION_USER, NULL), user);
+        ap_session_get_fn(r, z, apr_pstrcat(r->pool, authname, "-" MOD_SESSION_USER, NULL), user);
     }
     if (pw) {
-        ap_session_get(r, z, apr_pstrcat(r->pool, authname, "-" MOD_SESSION_PW, NULL), pw);
+        ap_session_get_fn(r, z, apr_pstrcat(r->pool, authname, "-" MOD_SESSION_PW, NULL), pw);
     }
     if (hash) {
-        ap_session_get(r, z, apr_pstrcat(r->pool, authname, "-" MOD_AUTH_FORM_HASH, NULL), hash);
+        ap_session_get_fn(r, z, apr_pstrcat(r->pool, authname, "-" MOD_AUTH_FORM_HASH, NULL), hash);
     }
 
     /* set the user, even though the user is unauthenticated at this point */