From: Sascha Schumann Date: Sat, 5 Jun 1999 22:15:49 +0000 (+0000) Subject: moving start code into its own function X-Git-Tag: BEFORE_REMOVING_GC_STEP1~193 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f830cf7d152027515b904c227e13d9fc9665aba7;p=php moving start code into its own function --- diff --git a/ext/session/session.c b/ext/session/session.c index e56a5c5b30..483d5f75d6 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -266,6 +266,34 @@ static ps_module *_php_find_ps_module(char *name) return ret; } +static void _php_session_start(void) +{ + pval **ppid; + int send_cookie = 1; + char *session_data; + int datalen; + PSLS_FETCH(); + + if(!PS(id) && + zend_hash_find(&EG(symbol_table), PS(session_name), + 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; + } + + if(!PS(id)) { + PS(id) = _php_create_id(INTERNAL_FUNCTION_PARAM_PASSTHRU, NULL); + } + + if(send_cookie) { + _php_session_send_cookie(); + } + PS(nr_open_sessions)++; + + _php_session_initialize(); +} + PHP_FUNCTION(session_name) { pval *p_name; @@ -418,30 +446,7 @@ PHP_FUNCTION(session_decode) PHP_FUNCTION(session_start) { - pval **ppid; - int send_cookie = 1; - char *session_data; - int datalen; - PSLS_FETCH(); - - if(!PS(id) && - zend_hash_find(&EG(symbol_table), PS(session_name), - 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; - } - - if(!PS(id)) { - PS(id) = _php_create_id(INTERNAL_FUNCTION_PARAM_PASSTHRU, NULL); - } - - if(send_cookie) { - _php_session_send_cookie(); - } - PS(nr_open_sessions)++; - - _php_session_initialize(); + _php_session_start(); } void php_rinit_globals(php_ps_globals *ps_globals)