From: Xinchen Hui <laruence@gmail.com>
Date: Tue, 9 May 2017 03:14:40 +0000 (+0800)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.6RC1~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=05c90e599425e4f0d917f8181f162cfa4baa4d73;p=php

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()
---

05c90e599425e4f0d917f8181f162cfa4baa4d73
diff --cc ext/session/session.c
index d672b0c283,2c4b30fc2b..d702d1b159
--- 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)