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_extensions.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_extensions.h')
-rw-r--r-- | Zend/zend_extensions.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_extensions.h b/Zend/zend_extensions.h index 3ef28804e6..3fe84b9989 100644 --- a/Zend/zend_extensions.h +++ b/Zend/zend_extensions.h @@ -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 220131227 typedef struct _zend_extension_version_info { int zend_extension_api_no; |