cvs: php4 /main main.c
| From: | Sascha Schumann | Date: | Sun, 09 Jul 2000 13:20:28 +0000 |
| Subject: | cvs: php4 /main main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-679@lists.php.net to get a copy of this message | ||
sas Sun Jul 9 06:20:28 2000 EDT
Modified files:
/php4/main main.c
Log:
Restore INI entries after the request shutdown of modules.
This fixes the problems users of the session module encountered when
using a save handler other than files.
Index: php4/main/main.c
diff -u php4/main/main.c:1.279 php4/main/main.c:1.280
--- php4/main/main.c:1.279 Tue Jul 4 02:15:06 2000
+++ php4/main/main.c Sun Jul 9 06:20:27 2000
@@ -19,7 +19,7 @@
*/
-/* $Id: main.c,v 1.279 2000/07/04 09:15:06 ssb Exp $ */
+/* $Id: main.c,v 1.280 2000/07/09 13:20:27 sas Exp $ */
#include <stdio.h>
@@ -664,11 +664,12 @@
php_call_shutdown_functions();
- php_ini_rshutdown();
-
if (PG(modules_activated)) {
zend_deactivate_modules();
}
+
+ php_ini_rshutdown();
+
zend_deactivate(CLS_C ELS_CC);
sapi_deactivate(SLS_C);