dmitry Fri, 15 Oct 2010 07:30:24 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=304408
Log:
zend_collect_module_handlers() has to be called after zend_extensions startup,
because they can register additional 'hidden' extensions
Changed paths:
U php/php-src/trunk/Zend/zend_API.c
U php/php-src/trunk/Zend/zend_API.h
U php/php-src/trunk/main/main.c
Modified: php/php-src/trunk/Zend/zend_API.c
===================================================================
--- php/php-src/trunk/Zend/zend_API.c 2010-10-14 21:33:10 UTC (rev 304407)
+++ php/php-src/trunk/Zend/zend_API.c 2010-10-15 07:30:24 UTC (rev 304408)
@@ -1688,7 +1688,7 @@
}
/* }}} */
-static void zend_collect_module_handlers(TSRMLS_D) /* {{{ */
+ZEND_API void zend_collect_module_handlers(TSRMLS_D) /* {{{ */
{
HashPosition pos;
zend_module_entry *module;
@@ -1770,7 +1770,6 @@
{
zend_hash_sort(&module_registry, zend_sort_modules, NULL, 0 TSRMLS_CC);
zend_hash_apply(&module_registry, (apply_func_t)zend_startup_module_ex
TSRMLS_CC);
- zend_collect_module_handlers(TSRMLS_C);
return SUCCESS;
}
/* }}} */
Modified: php/php-src/trunk/Zend/zend_API.h
===================================================================
--- php/php-src/trunk/Zend/zend_API.h 2010-10-14 21:33:10 UTC (rev 304407)
+++ php/php-src/trunk/Zend/zend_API.h 2010-10-15 07:30:24 UTC (rev 304408)
@@ -260,6 +260,7 @@
ZEND_API zend_module_entry* zend_register_module_ex(zend_module_entry *module
TSRMLS_DC);
ZEND_API int zend_startup_module_ex(zend_module_entry *module TSRMLS_DC);
ZEND_API int zend_startup_modules(TSRMLS_D);
+ZEND_API void zend_collect_module_handlers(TSRMLS_D);
ZEND_API void zend_destroy_modules(void);
ZEND_API void zend_check_magic_method_implementation(const zend_class_entry
*ce, const zend_function *fptr, int error_type TSRMLS_DC);
Modified: php/php-src/trunk/main/main.c
===================================================================
--- php/php-src/trunk/main/main.c 2010-10-14 21:33:10 UTC (rev 304407)
+++ php/php-src/trunk/main/main.c 2010-10-15 07:30:24 UTC (rev 304408)
@@ -2059,6 +2059,8 @@
/* start Zend extensions */
zend_startup_extensions();
+ zend_collect_module_handlers(TSRMLS_C);
+
/* register additional functions */
if (sapi_module.additional_functions) {
if (zend_hash_find(&module_registry, "standard",
sizeof("standard"), (void**)&module)==SUCCESS) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
