sas Thu Feb 20 03:32:41 2003 EDT Modified files: (Branch: PHP_4_3) /php4/ext/session session.c Log: merge minor differences from head Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.336.2.7 php4/ext/session/session.c:1.336.2.8 --- php4/ext/session/session.c:1.336.2.7 Thu Feb 20 01:24:08 2003 +++ php4/ext/session/session.c Thu Feb 20 03:32:41 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.336.2.7 2003/02/20 06:24:08 sas Exp $ */ +/* $Id: session.c,v 1.336.2.8 2003/02/20 08:32:41 sas Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1127,10 +1127,7 @@ WRONG_PARAM_COUNT; } - if (array_init(return_value) == FAILURE) { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Cannot initialize return value from session_get_cookie_parameters"); - RETURN_FALSE; - } + array_init(return_value); add_assoc_long(return_value, "lifetime", PS(cookie_lifetime)); add_assoc_string(return_value, "path", PS(cookie_path), 1); @@ -1470,7 +1467,7 @@ convert_to_string_ex(str); php_session_decode(Z_STRVAL_PP(str), Z_STRLEN_PP(str) TSRMLS_CC); - + RETURN_TRUE; } /* }}} */ @@ -1622,6 +1619,7 @@ PS(module_number) = module_number; /* if we really need this var we need to init it in zts mode as well! */ + PS(session_status) = php_session_none; REGISTER_INI_ENTRIES(); #ifdef HAVE_LIBMM
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php