From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 26 Dec 2013 10:51:05 +0000 (+0400)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~353^2~92
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=65fd18fd884a9ed5e60275023baf423c87d2213a;p=php

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
---

65fd18fd884a9ed5e60275023baf423c87d2213a
diff --cc Zend/zend_extensions.h
index 3ef28804e6,44e516a37e..3fe84b9989
--- 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 946406fb02,6be24f25eb..24f56feff7
--- 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