CVS update: php4/ext/session
| From: | sas | Date: | Sat, 05 Jun 1999 22:15:50 +0000 |
| Subject: | CVS update: php4/ext/session | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-1306@lists.php.net to get a copy of this message | ||
Date: Saturday June 5, 1999 @ 18:15
Author: sas
Update of /repository/php4/ext/session
In directory php:/tmp/cvs-serv7728
Modified Files:
session.c
Log Message:
moving start code into its own function
Index: php4/ext/session/session.c
diff -u php4/ext/session/session.c:1.2 php4/ext/session/session.c:1.3
--- php4/ext/session/session.c:1.2 Sat Jun 5 16:51:29 1999
+++ php4/ext/session/session.c Sat Jun 5 18:15:49 1999
@@ -266,6 +266,34 @@
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_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)