summaryrefslogtreecommitdiff
path: root/main/main.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@php.net>2009-09-21 09:52:19 +0000
committerDmitry Stogov <dmitry@php.net>2009-09-21 09:52:19 +0000
commit7bfe056174b15d28310fd11ef5909a4ea60e45c6 (patch)
tree66776a3652ca10e2f7147c4a9f25c854f9cca5e7 /main/main.c
parenta0a8c5832ffd4125b1821db00ddc1bdc53bdf9c2 (diff)
downloadphp-git-7bfe056174b15d28310fd11ef5909a4ea60e45c6.tar.gz
Fixed tests
Diffstat (limited to 'main/main.c')
-rw-r--r--main/main.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/main/main.c b/main/main.c
index 3df9cc23dc..8d394162b3 100644
--- a/main/main.c
+++ b/main/main.c
@@ -2015,10 +2015,6 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
#endif
module_initialized = 1;
- sapi_deactivate(TSRMLS_C);
- module_startup = 0;
-
- shutdown_memory_manager(1, 0 TSRMLS_CC);
/* Check for deprecated directives */
{
@@ -2047,6 +2043,11 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
zend_error(E_ERROR, "zend.ze1_compatibility_mode is no longer supported in PHP 5.3 and greater");
}
}
+
+ sapi_deactivate(TSRMLS_C);
+ module_startup = 0;
+
+ shutdown_memory_manager(1, 0 TSRMLS_CC);
/* we're done */
return SUCCESS;