com php-src: Merge branch 'PHP-5.6': Zend/zend.h Zend/zend_ex tensions.h Zend/zend_modules.h ext/opcache/ZendAccele rator.c ext/spl/spl_iterators.c

Commit: 65fd18fd884a9ed5e60275023baf423c87d2213a Author: Dmitry Stogov <dmitry@zend.com> Thu, 26 Dec 2013 14:51:05 +0400 Parents: d6713f39898cc25ff51dca83ab233271937724e4 03a37de9b3c4b9dc02aeeb5c5331ff89eac62515 Branches: master Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=65fd18fd884a9ed5e60275023baf423c87d2213a Log: 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 Changed paths: MM Zend/zend.h MM Zend/zend_extensions.h MM Zend/zend_modules.h MM ext/opcache/ZendAccelerator.c MM ext/spl/spl_iterators.c Diff: diff --cc Zend/zend_extensions.h index 3ef2880,44e516a..3fe84b9 --- a/Zend/zend_extensions.h +++ b/Zend/zend_extensions.h @@@ -28,7 -28,7 +28,7 @@@ /* The first number is the engine version and the rest is the date. * This way engine 2/3 API no. is always greater than engine 1 API no.. */ - #define ZEND_EXTENSION_API_NO 220131218 -#define ZEND_EXTENSION_API_NO 220131226 ++#define ZEND_EXTENSION_API_NO 220131227 typedef struct _zend_extension_version_info { int zend_extension_api_no; diff --cc Zend/zend_modules.h index 946406f,6be24f2...24f56fe --- a/Zend/zend_modules.h +++ b/Zend/zend_modules.h @@@ -33,7 -33,7 +33,7 @@@ #define ZEND_MODULE_INFO_FUNC_ARGS zend_module_entry *zend_module TSRMLS_DC #define ZEND_MODULE_INFO_FUNC_ARGS_PASSTHRU zend_module TSRMLS_CC - #define ZEND_MODULE_API_NO 20131218 -#define ZEND_MODULE_API_NO 20131226 ++#define ZEND_MODULE_API_NO 20131227 #ifdef ZTS #define USING_ZTS 1 #else