]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 66caa61 ef75ddd)
Merge branch 'PHP-5.6' into PHP-7.0
authorXinchen Hui <laruence@gmail.com>
Sat, 29 Oct 2016 15:43:59 +0000 (23:43 +0800)
committerXinchen Hui <laruence@gmail.com>
Sat, 29 Oct 2016 15:43:59 +0000 (23:43 +0800)
* PHP-5.6:
  Fixed bug #73402 (Opcache segfault when using class constant to call a method)

Conflicts:
ext/opcache/Optimizer/zend_optimizer.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.