]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1740648 2b850e1)
Merge branch 'PHP-5.6' into PHP-7.0
authorXinchen Hui <laruence@gmail.com>
Mon, 15 Feb 2016 02:32:50 +0000 (10:32 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 15 Feb 2016 02:32:50 +0000 (10:32 +0800)
commit8974e4c7814eb0ca6e6f00fcd8d9df9d62283d59
tree67719a8d19d68d016e0c881663f929999a0597edtree | snapshot
parent1740648312f3d87ef0086d94621ebf803af46ec6commit | diff
parent2b850e1565d69ff9e0e855a86f1b8662b827c55ecommit | diff
Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Update NEWS: "Fixed bug  #71584 (Possible use-after-free of ZCG(cwd) in Zend Opcache)"
  Fix use-after-free of ZCG(cwd) in Zend Optimizer

Conflicts:
ext/opcache/ZendAccelerator.c
ext/opcache/ZendAccelerator.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.