]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d6713f3 03a37de)
Merge branch 'PHP-5.6'
authorDmitry Stogov <dmitry@zend.com>
Thu, 26 Dec 2013 10:51:05 +0000 (14:51 +0400)
committerDmitry Stogov <dmitry@zend.com>
Thu, 26 Dec 2013 10:51:05 +0000 (14:51 +0400)
commit65fd18fd884a9ed5e60275023baf423c87d2213a
treed8543604ce41192949a2915628d6661ca55417betree | snapshot
parentd6713f39898cc25ff51dca83ab233271937724e4commit | diff
parent03a37de9b3c4b9dc02aeeb5c5331ff89eac62515commit | diff
Merge branch 'PHP-5.6'

* PHP-5.6:
  Improved empty string handling. Now ZE uses an interned string instead of allocation new empty string each time. (Some extensions might need to be fixed using str_efree() instead of efree() to support interned strings).

Conflicts:
NEWS
Zend/zend_extensions.h
Zend/zend_modules.h
Zend/zend.h diff1 | diff2 | blob | history
Zend/zend_extensions.h diff1 | diff2 | blob | history
Zend/zend_modules.h diff1 | diff2 | blob | history
ext/opcache/ZendAccelerator.c diff1 | diff2 | blob | history
ext/spl/spl_iterators.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.