diff options
Diffstat (limited to 'ext/session/session.c')
| -rw-r--r-- | ext/session/session.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index f6614da409..eb5fd00023 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -13,7 +13,6 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ | Authors: Sascha Schumann <ss@2ns.de> | - | Andrey Zmievski <andrey@ispi.net> | +----------------------------------------------------------------------+ */ @@ -327,21 +326,17 @@ static void _php_session_start(PSLS_D) { pval **ppid; pval **data; - char *p; int send_cookie = 1; int define_sid = 1; int module_number = PS(module_number); int nrand; - int lensess; ELS_FETCH(); if (PS(nr_open_sessions) > 0) return; - lensess = strlen(PS(session_name)); - if(!PS(id) && zend_hash_find(&EG(symbol_table), PS(session_name), - lensess + 1, (void **) &ppid) == SUCCESS) { + strlen(PS(session_name)) + 1, (void **) &ppid) == SUCCESS) { convert_to_string((*ppid)); PS(id) = estrndup((*ppid)->value.str.val, (*ppid)->value.str.len); send_cookie = 0; @@ -352,22 +347,9 @@ static void _php_session_start(PSLS_D) sizeof("HTTP_COOKIE_VARS"), (void **) &data) == SUCCESS && (*data)->type == IS_ARRAY && zend_hash_find((*data)->value.ht, PS(session_name), - lensess + 1, (void **) &ppid) == SUCCESS) { + strlen(PS(session_name)) + 1, (void **) &ppid) == SUCCESS) { define_sid = 0; } - - if(!PS(id) && - zend_hash_find(&EG(symbol_table), "REQUEST_URI", - sizeof("REQUEST_URI"), (void **) &data) == SUCCESS && - (*data)->type == IS_STRING && - (p = strstr((*data)->value.str.val, PS(session_name))) && - p[lensess] == '=') { - char *q; - - p += lensess + 1; - if((q = strpbrk(p, "/?\\"))) - PS(id) = estrndup(p, q - p); - } if(!PS(id)) { PS(id) = _php_create_id(NULL); |