Optimisation: We have no need to distiguish between a Cookie and a Cookie2 when readi...

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

diff --git a/modules/session/mod_session_dbd.c b/modules/session/mod_session_dbd.c
index 1ad345769cceacf58d91786822ccc4e0a4ee76f8..2ae25fca481963dc022e49e54c9e7e159b2f5903 100644 (file)
--- 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) {