]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8d087dc dc8705c)
Merge branch 'PHP-5.5'
authorDmitry Stogov <dmitry@zend.com>
Wed, 25 Sep 2013 07:04:03 +0000 (11:04 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 25 Sep 2013 07:04:03 +0000 (11:04 +0400)
* PHP-5.5:
  Fixed issue #135 (segfault in interned strings if initial memory is too low)

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.