CVS update: php4
| From: | zeev | Date: | Sat, 05 Jun 1999 19:00:57 +0000 |
| Subject: | CVS update: php4 | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-1296@lists.php.net to get a copy of this message | ||
Date: Saturday June 5, 1999 @ 15:00
Author: zeev
Update of /repository/php4
In directory php:/tmp/cvs-serv20883
Modified Files:
main.c
Log Message:
Move shutdown order into Zend
Index: php4/main.c
diff -u php4/main.c:1.70 php4/main.c:1.71
--- php4/main.c:1.70 Mon May 31 15:58:20 1999
+++ php4/main.c Sat Jun 5 15:00:56 1999
@@ -29,7 +29,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.70 1999/05/31 19:58:20 zeev Exp $ */
+/* $Id: main.c,v 1.71 1999/06/05 19:00:56 zeev Exp $ */
#include <stdio.h>
@@ -644,10 +644,9 @@
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;
@@ -704,12 +703,8 @@
php3_call_shutdown_functions();
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);