diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2013-12-26 14:51:05 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2013-12-26 14:51:05 +0400 |
| commit | 65fd18fd884a9ed5e60275023baf423c87d2213a (patch) | |
| tree | d8543604ce41192949a2915628d6661ca55417be /Zend/zend_modules.h | |
| parent | d6713f39898cc25ff51dca83ab233271937724e4 (diff) | |
| parent | 03a37de9b3c4b9dc02aeeb5c5331ff89eac62515 (diff) | |
| download | php-git-65fd18fd884a9ed5e60275023baf423c87d2213a.tar.gz | |
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
Diffstat (limited to 'Zend/zend_modules.h')
| -rw-r--r-- | Zend/zend_modules.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_modules.h b/Zend/zend_modules.h index 946406fb02..24f56feff7 100644 --- a/Zend/zend_modules.h +++ b/Zend/zend_modules.h @@ -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 20131227 #ifdef ZTS #define USING_ZTS 1 #else |