mirror of
https://github.com/php/php-src.git
synced 2025-08-18 06:58:55 +02:00
revert last commit. Guys, discuss such things first, then commit. Mkay?
This commit is contained in:
parent
e302d6a5e8
commit
919e7e9f69
1 changed files with 3 additions and 10 deletions
|
@ -211,15 +211,6 @@ int php_session_register_module(ps_module *ptr)
|
|||
return ret;
|
||||
}
|
||||
|
||||
PHPAPI void php_session_set_id(char *id TSRMLS_DC)
|
||||
{
|
||||
if (PS(id))
|
||||
efree(PS(id));
|
||||
|
||||
PS(id) = estrdup(id);
|
||||
}
|
||||
|
||||
|
||||
PHP_MINIT_FUNCTION(session);
|
||||
PHP_RINIT_FUNCTION(session);
|
||||
PHP_MSHUTDOWN_FUNCTION(session);
|
||||
|
@ -964,6 +955,7 @@ static zend_bool php_session_destroy(TSRMLS_D)
|
|||
return retval;
|
||||
}
|
||||
|
||||
|
||||
/* {{{ proto void session_set_cookie_params(int lifetime [, string path [, string domain [, bool secure]]])
|
||||
Set session cookie parameters */
|
||||
PHP_FUNCTION(session_set_cookie_params)
|
||||
|
@ -1140,7 +1132,8 @@ PHP_FUNCTION(session_id)
|
|||
|
||||
if (ac == 1) {
|
||||
convert_to_string_ex(p_name);
|
||||
php_session_set_id(Z_STRVAL_PP(p_name) TSRMLS_CC);
|
||||
if (PS(id)) efree(PS(id));
|
||||
PS(id) = estrndup(Z_STRVAL_PP(p_name), Z_STRLEN_PP(p_name));
|
||||
}
|
||||
|
||||
RETVAL_STRING(old, 0);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue