- MFH: Get rid of the four different versions of zend_extension* and only use

  zend_extension. Because of the API identifier change in PHP 5.3 you also get
  a proper warning message now.
#- [DOC]

diff --git a/NEWS b/NEWS
index e9e04f1b047290abcd4e0b1b1532a38b7d2b4d43..b23173b4bd9cdeb2df4254a0977cdd3a7187c459 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ PHP                                                                        NEWS
 - Upgraded bundled libmagic to 5.03 in the fileinfo extension. (Scott)
 
 - Added the ability for json_decode() to take a user specified depth. (Scott)
+- Coalesce all the zend_extension_* variables into zend_extension. (Derick)
 
 - Disabled SQLite3::loadExtension for threaded SAPIs. (Scott)
 

diff --git a/configure.in b/configure.in
index 018b228bc29c82b3a2e7b56be23080a109c13eb6..0046ea85170b257eb923b3b081ab3895cbe4704f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1332,15 +1332,7 @@ if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
   CPPFLAGS="$CPPFLAGS -DTHREAD=1"
 fi
 
-if test "$PHP_DEBUG" = "1" && test "$PHP_THREAD_SAFETY" = "yes"; then
-  ZEND_EXT_TYPE="zend_extension_debug_ts"
-elif test "$PHP_DEBUG" = "1"; then
-  ZEND_EXT_TYPE="zend_extension_debug"
-elif test "$PHP_THREAD_SAFETY" = "yes"; then
-  ZEND_EXT_TYPE="zend_extension_ts"
-else
-  ZEND_EXT_TYPE="zend_extension"
-fi
+ZEND_EXT_TYPE="zend_extension"
 PHP_SUBST(ZEND_EXT_TYPE)
 
 dnl

diff --git a/main/php_ini.c b/main/php_ini.c
index bfd985bd728e442bf0751cc47e47d4ac340afcfa..af96196ae8625800ab35d64de740bf11ee8d9ee2 100644 (file)
--- a/main/php_ini.c
+++ b/main/php_ini.c
@@ -170,19 +170,7 @@ PHPAPI void display_ini_entries(zend_module_entry *module)
 
 /* php.ini support */
 #define PHP_EXTENSION_TOKEN            "extension"
-#ifdef ZTS
-# if (ZEND_DEBUG)
-# define ZEND_EXTENSION_TOKEN  "zend_extension_debug_ts"
-# else
-# define ZEND_EXTENSION_TOKEN  "zend_extension_ts"
-# endif
-#else
-# if (ZEND_DEBUG)
-# define ZEND_EXTENSION_TOKEN  "zend_extension_debug"
-# else
-# define ZEND_EXTENSION_TOKEN  "zend_extension"
-# endif
-#endif
+#define ZEND_EXTENSION_TOKEN   "zend_extension"
 
 /* {{{ config_zval_dtor
  */

diff --git a/scripts/phpize.m4 b/scripts/phpize.m4
index bf40948eed7d2e162442dd2dc9fae507569c1374..dcc9f6a2d274cb2a74c3e7d76458ec8028fcaa06 100644 (file)
--- a/scripts/phpize.m4
+++ b/scripts/phpize.m4
@@ -96,15 +96,7 @@ CPPFLAGS=$old_CPPFLAGS
 AC_MSG_RESULT([$PHP_DEBUG])
 
 dnl Support for building and testing Zend extensions
-if test "$PHP_DEBUG" = "yes" && test "$PHP_THREAD_SAFETY" = "yes; then
-  ZEND_EXT_TYPE="zend_extension_debug_ts"
-elif test "$PHP_DEBUG" = "yes"; then
-  ZEND_EXT_TYPE="zend_extension_debug"
-elif test "$PHP_THREAD_SAFETY" = "yes; then
-  ZEND_EXT_TYPE="zend_extension_ts"
-else
-  ZEND_EXT_TYPE="zend_extension"
-fi
+ZEND_EXT_TYPE="zend_extension"
 PHP_SUBST(ZEND_EXT_TYPE)
 
 dnl Discard optimization flags when debugging is enabled