summaryrefslogtreecommitdiffstats
path: root/modules/session
diff options
context:
space:
mode:
authorGraham Leggett <minfrin@apache.org>2008-04-06 01:52:38 +0200
committerGraham Leggett <minfrin@apache.org>2008-04-06 01:52:38 +0200
commit07c52aab45121787a0de85ec4142c0ca583a62be (patch)
treea21266416adb34ae6152e046c8f7084956673de3 /modules/session
parentRemove an unnecessary config structure lookup during encrypt and decrypt. [Ru... (diff)
downloadapache2-07c52aab45121787a0de85ec4142c0ca583a62be.tar.xz
apache2-07c52aab45121787a0de85ec4142c0ca583a62be.zip
Optimisation: We have no need to distiguish between a Cookie and a Cookie2 when reading cookies, the
cookie read code reads both at once. [Ruediger Pluem] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@645188 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/session')
-rw-r--r--modules/session/mod_session_dbd.c12
1 files changed, 2 insertions, 10 deletions
diff --git a/modules/session/mod_session_dbd.c b/modules/session/mod_session_dbd.c
index 1ad345769c..2ae25fca48 100644
--- a/modules/session/mod_session_dbd.c
+++ b/modules/session/mod_session_dbd.c
@@ -203,16 +203,8 @@ AP_DECLARE(int) ap_session_dbd_load(request_rec * r, session_rec ** z)
/* load anonymous sessions */
if (conf->name_set || conf->name2_set) {
- /* load RFC2109 compliant cookie */
- if (conf->name_set) {
- ap_cookie_read(r, conf->name, &key, conf->remove);
- }
-
- /* load RFC2965 compliant cookie */
- if (!key && conf->name2_set) {
- ap_cookie_read(r, conf->name2, &key, conf->remove);
- }
-
+ /* load an RFC2109 or RFC2965 compliant cookie */
+ ap_cookie_read(r, name, &key, conf->remove);
if (key) {
ret = dbd_load(r, key, &val);
if (ret != APR_SUCCESS) {