com php-src: Merge branch 'PHP-7.0' into PHP-7.1: ext/session/session.c ext/session/tests/bug60634.phpt ext/session/tests/bug606 34_error_1.phpt ext/session/tests/bug6063 4_error_3.phpt ext/session/tests/bug60634 _error_4.phpt ext/session/tests/rfc1867_sid _invalid.phpt ext/session/tests/session_set_save_ha ndler_variation6.phpt
[email protected] (Xinchen Hui)
| Newsgroups | php.cvs |
|---|---|
| Message-ID | <[email protected]> |
Commit: 05c90e599425e4f0d917f8181f162cfa4baa4d73 Author: Xinchen Hui <[email protected]> Tue, 9 May 2017 11:14:40 +0800 Parents: 15dbe775d1912f0572524e61066e787d8862a9c4 1b22e9dc2eaa754d1733f9e73e7041d3a006d7fc Branches: PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=05c90e599425e4f0d917f8181f162cfa4baa4d73 Log: Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: Fixed tests when using cumstom php.ini(session.save_handler) Fix Bug #74541 Wrong reflection on session_start() Bugs: https://bugs.php.net/74541 Changed paths: MM ext/session/session.c MM ext/session/tests/bug60634.phpt MM ext/session/tests/bug60634_error_1.phpt MM ext/session/tests/bug60634_error_3.phpt MM ext/session/tests/bug60634_error_4.phpt MM ext/session/tests/rfc1867_sid_invalid.phpt MM ext/session/tests/session_set_save_handler_variation6.phpt Diff: diff --cc ext/session/session.c index d672b0c,2c4b30f..d702d1b --- a/ext/session/session.c +++ b/ext/session/session.c @@@ -2453,10 -2570,9 +2457,10 @@@ static const zend_function_entry sessio PHP_FE(session_regenerate_id, arginfo_session_regenerate_id) PHP_FE(session_decode, arginfo_session_decode) PHP_FE(session_encode, arginfo_session_void) - PHP_FE(session_start, arginfo_session_void) + PHP_FE(session_start, arginfo_session_start) PHP_FE(session_destroy, arginfo_session_void) PHP_FE(session_unset, arginfo_session_void) + PHP_FE(session_gc, arginfo_session_void) PHP_FE(session_set_save_handler, arginfo_session_set_save_handler) PHP_FE(session_cache_limiter, arginfo_session_cache_limiter) PHP_FE(session_cache_expire, arginfo_session_cache_expire)