]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorXinchen Hui <laruence@gmail.com>
Tue, 9 May 2017 03:14:40 +0000 (11:14 +0800)
committerXinchen Hui <laruence@gmail.com>
Tue, 9 May 2017 03:14:40 +0000 (11:14 +0800)
* PHP-7.0:
  Fixed tests when using cumstom php.ini(session.save_handler)
  Fix Bug #74541 Wrong reflection on session_start()

1  2 
ext/session/session.c
ext/session/tests/bug60634.phpt
ext/session/tests/bug60634_error_1.phpt
ext/session/tests/bug60634_error_3.phpt
ext/session/tests/bug60634_error_4.phpt
ext/session/tests/rfc1867_sid_invalid.phpt
ext/session/tests/session_set_save_handler_variation6.phpt

index d672b0c2831f571e5b566d784b1c7c0a09d4d644,2c4b30fc2b96e6106ad2032ff63541101b4cf3b6..d702d1b159c9e371c847a2cb1135402c37135b7e
@@@ -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)
Simple merge