]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 61e1f79 b5fbde9)
Merge branch 'PHP-5.5' into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Thu, 9 Jan 2014 09:49:54 +0000 (13:49 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 9 Jan 2014 09:49:54 +0000 (13:49 +0400)
* PHP-5.5:
  Fixed ADD_INTERNED_STRING() logic to support strings that are already interned. (Terry)

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

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