]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6' into PHP-7.0
authorXinchen Hui <laruence@gmail.com>
Fri, 18 Dec 2015 09:41:42 +0000 (17:41 +0800)
committerXinchen Hui <laruence@gmail.com>
Fri, 18 Dec 2015 09:41:42 +0000 (17:41 +0800)
commit2f47e9872ed8ec9a125862e182f9e0068adf6f5a
tree68608ed2b6d8e027d511d0ef00f895657292b73a
parent4e01269082d20f5598c481f122b3eea10a586e2b
parent40702799b5f08b093477098881b6e0cfcb3ea411
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Improved fix for #71127

Conflicts:
ext/opcache/Optimizer/pass1_5.c
ext/opcache/Optimizer/pass1_5.c
ext/opcache/Optimizer/zend_optimizer.h