]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commit4e249c8a932675e5aceeb52c3ff6f6465d8a8ed1
treeab59dca2b7e7ece4ea70b497a51e2d31f9e8db02tree | snapshot
parent8d087dc0d7c88e26539646875dc0f7bb5042187bcommit | diff
parentdc8705c256cd1d50cfa276e8de31558e089eab92commit | diff
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed issue #135 (segfault in interned strings if initial memory is too low)

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