summaryrefslogtreecommitdiff
path: root/Zend/zend_extensions.h
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2013-12-26 14:51:05 +0400
committerDmitry Stogov <dmitry@zend.com>2013-12-26 14:51:05 +0400
commit65fd18fd884a9ed5e60275023baf423c87d2213a (patch)
treed8543604ce41192949a2915628d6661ca55417be /Zend/zend_extensions.h
parentd6713f39898cc25ff51dca83ab233271937724e4 (diff)
parent03a37de9b3c4b9dc02aeeb5c5331ff89eac62515 (diff)
downloadphp-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.h2
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;