svn: /php/php-src/ branches/PHP_5_3/main/main.c trunk/main/main.c
| From: | Stanislav Malyshev | Date: | Wed, 29 Jul 2009 00:17:10 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/main/main.c trunk/main/main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-59886@lists.php.net to get a copy of this message | ||
stas Wed, 29 Jul 2009 00:17:10 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=286478
Log:
fix extension functions disabling (bug #49065)
Bug: http://bugs.php.net/49065 (Verified)
"disable_functions" php.ini option does not work on Zend extensions
Changed paths:
U php/php-src/branches/PHP_5_3/main/main.c
U php/php-src/trunk/main/main.c
Modified: php/php-src/branches/PHP_5_3/main/main.c
===================================================================
--- php/php-src/branches/PHP_5_3/main/main.c 2009-07-28 23:59:55 UTC (rev 286477)
+++ php/php-src/branches/PHP_5_3/main/main.c 2009-07-29 00:17:10 UTC (rev 286478)
@@ -2006,10 +2006,6 @@
php_ini_register_extensions(TSRMLS_C);
zend_startup_modules(TSRMLS_C);
- /* disable certain classes and functions as requested by php.ini */
- php_disable_functions(TSRMLS_C);
- php_disable_classes(TSRMLS_C);
-
/* start Zend extensions */
zend_startup_extensions();
@@ -2022,12 +2018,17 @@
}
}
+ /* disable certain classes and functions as requested by php.ini */
+ php_disable_functions(TSRMLS_C);
+ php_disable_classes(TSRMLS_C);
+
/* make core report what it should */
if (zend_hash_find(&module_registry, "core", sizeof("core"),
(void**)&module)==SUCCESS) {
module->version = PHP_VERSION;
module->info_func = PHP_MINFO(php_core);
}
+
#ifdef PHP_WIN32
/* Disable incompatible functions for the running platform */
if (php_win32_disable_functions() == FAILURE) {
Modified: php/php-src/trunk/main/main.c
===================================================================
--- php/php-src/trunk/main/main.c 2009-07-28 23:59:55 UTC (rev 286477)
+++ php/php-src/trunk/main/main.c 2009-07-29 00:17:10 UTC (rev 286478)
@@ -2121,10 +2121,6 @@
php_ini_register_extensions(TSRMLS_C);
zend_startup_modules(TSRMLS_C);
- /* disable certain classes and functions as requested by php.ini */
- php_disable_functions(TSRMLS_C);
- php_disable_classes(TSRMLS_C);
-
/* start Zend extensions */
zend_startup_extensions();
@@ -2137,12 +2133,17 @@
}
}
+ /* disable certain classes and functions as requested by php.ini */
+ php_disable_functions(TSRMLS_C);
+ php_disable_classes(TSRMLS_C);
+
/* make core report what it should */
if (zend_hash_find(&module_registry, "core", sizeof("core"),
(void**)&module)==SUCCESS) {
module->version = PHP_VERSION;
module->info_func = PHP_MINFO(php_core);
}
+
#ifdef PHP_WIN32
/* Disable incompatible functions for the running platform */
if (php_win32_disable_functions() == FAILURE) {