]> granicus.if.org Git - php/commitdiff
fix extension functions disabling (bug #49065)
authorStanislav Malyshev <stas@php.net>
Wed, 29 Jul 2009 00:17:10 +0000 (00:17 +0000)
committerStanislav Malyshev <stas@php.net>
Wed, 29 Jul 2009 00:17:10 +0000 (00:17 +0000)
main/main.c

index 6017b72f6bd1720c6ba2f06cdf37fbf3968958e6..6c9224be36e46983e1327f7240d3dedebc3ff2b0 100644 (file)
@@ -2006,10 +2006,6 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
        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 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
                }
        }
        
+       /* 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) {