From: Stanislav Malyshev <stas@php.net>
Date: Wed, 29 Jul 2009 00:17:10 +0000 (+0000)
Subject: fix extension functions disabling (bug #49065)
X-Git-Tag: php-5.3.1RC1~236
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d1a16fc86d1e19aaef064d043d74a3988f27db8e;p=php

fix extension functions disabling (bug #49065)
---

diff --git a/main/main.c b/main/main.c
index 6017b72f6b..6c9224be36 100644
--- a/main/main.c
+++ b/main/main.c
@@ -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) {