diff options
| author | Yasuo Ohgaki <yohgaki@php.net> | 2016-09-01 05:54:30 +0900 |
|---|---|---|
| committer | Yasuo Ohgaki <yohgaki@php.net> | 2016-09-01 05:54:30 +0900 |
| commit | 663f1c8fb08ba51a00d7d8ed6261916c6fc8d5df (patch) | |
| tree | fd555117565737f50bd3d73f005263376b4a0494 | |
| parent | 4f11dedc436a160bbb90e2b2c559390119c48c0c (diff) | |
| download | php-git-663f1c8fb08ba51a00d7d8ed6261916c6fc8d5df.tar.gz | |
Revert "Merge RFC https://wiki.php.net/rfc/session-create-id"
This reverts commit 7ee9f81c54ca888beae1c6aaeaccee1260012076.
| -rw-r--r-- | ext/session/session.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index 10208babaf..1c0bde9d37 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -2021,6 +2021,7 @@ static PHP_FUNCTION(session_regenerate_id) /* {{{ proto void session_create_id([string prefix]) Generate new session ID. Intended for user save handlers. */ +#if 0 /* This is not used yet */ static PHP_FUNCTION(session_create_id) { @@ -2042,20 +2043,7 @@ static PHP_FUNCTION(session_create_id) } if (PS(session_status) == php_session_active) { - int limit = 3; - while (limit--) { - new_id = PS(mod)->s_create_sid(&PS(mod_data)); - if (!PS(mod)->s_validate_sid) { - break; - } else { - /* Detect collision and retry */ - if (PS(mod)->s_validate_sid(&PS(mod_data), new_id) == FAILURE) { - zend_string_release(new_id); - continue; - } - break; - } - } + new_id = PS(mod)->s_create_sid(&PS(mod_data)); } else { new_id = php_session_create_id(NULL); } @@ -2070,7 +2058,9 @@ static PHP_FUNCTION(session_create_id) } smart_str_0(&id); RETVAL_NEW_STR(id.s); + smart_str_free(&id); } +#endif /* }}} */ /* {{{ proto string session_cache_limiter([string new_cache_limiter]) @@ -2367,10 +2357,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_session_id, 0, 0, 0) ZEND_ARG_INFO(0, id) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_session_create_id, 0, 0, 0) - ZEND_ARG_INFO(0, prefix) -ZEND_END_ARG_INFO() - ZEND_BEGIN_ARG_INFO_EX(arginfo_session_regenerate_id, 0, 0, 0) ZEND_ARG_INFO(0, delete_old_session) ZEND_END_ARG_INFO() @@ -2455,7 +2441,6 @@ static const zend_function_entry session_functions[] = { PHP_FE(session_module_name, arginfo_session_module_name) PHP_FE(session_save_path, arginfo_session_save_path) PHP_FE(session_id, arginfo_session_id) - PHP_FE(session_create_id, arginfo_session_create_id) PHP_FE(session_regenerate_id, arginfo_session_regenerate_id) PHP_FE(session_decode, arginfo_session_decode) PHP_FE(session_encode, arginfo_session_void) |