]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorXinchen Hui <laruence@gmail.com>
Thu, 10 Mar 2016 07:03:25 +0000 (15:03 +0800)
committerXinchen Hui <laruence@gmail.com>
Thu, 10 Mar 2016 07:03:25 +0000 (15:03 +0800)
* PHP-7.0:
  Fixed bug #71754 (Regression in PHP7.0: trivial script segfaults php-cgi)
  Bug #71756 (Call-by-reference widens scope to uninvolved functions when used in switch)
  tsrm_win32_get_path_sid_key might returns NULL (Partially fix bug #71752)

1  2 
Zend/zend_execute.c
ext/session/session.c

Simple merge
Simple merge