]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b74dc4 ce2f024)
Merge branch 'PHP-5.5' into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Mon, 13 Jan 2014 14:06:49 +0000 (18:06 +0400)
committerDmitry Stogov <dmitry@zend.com>
Mon, 13 Jan 2014 14:06:49 +0000 (18:06 +0400)
* PHP-5.5:
  Fixed bug #66461 (PHP crashes if opcache.interned_strings_buffer=0)

Conflicts:
NEWS

1  2 
ext/opcache/ZendAccelerator.c patch | diff1 | diff2 | blob | history

diff --cc ext/opcache/ZendAccelerator.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.