From: Zeev Suraski <zeev@php.net>
Date: Sat, 5 Jun 1999 19:00:56 +0000 (+0000)
Subject: Move shutdown order into Zend
X-Git-Tag: BEFORE_REMOVING_GC_STEP1~200
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bbce669cea7121f3acf01a9a638a4590af404fcd;p=php

Move shutdown order into Zend
---

diff --git a/main/main.c b/main/main.c
index b105975fad..5218c570be 100644
--- a/main/main.c
+++ b/main/main.c
@@ -644,10 +644,9 @@ int php_request_startup(CLS_D ELS_DC PLS_DC SLS_DC)
 		php3_printf("Unable to initialize request info.\n");
 		return FAILURE;
 	}
+	
+	zend_activate(CLS_C ELS_CC);
 	sapi_activate(SLS_C);	
-	init_compiler(CLS_C ELS_CC);
-	init_executor(CLS_C ELS_CC);
-	startup_scanner(CLS_C);
 
 	if (SG(request_info).auth_user) {
 		zval *auth_user;
@@ -705,11 +704,7 @@ void php_request_shutdown(void *dummy)
 	
 	php_ini_rshutdown();
 
-
-	shutdown_scanner(CLS_C);
-	shutdown_executor(ELS_C);
-	shutdown_compiler(CLS_C);
-
+	zend_deactivate(CLS_C ELS_CC);
 	sapi_deactivate(SLS_C);
 
 	php3_destroy_request_info(NULL);