cvs: php4 /main main.c
| From: | Zeev Suraski | Date: | Sun, 16 Dec 2001 22:45:59 +0000 |
| Subject: | cvs: php4 /main main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-8684@lists.php.net to get a copy of this message | ||
zeev Sun Dec 16 17:45:59 2001 EDT
Modified files:
/php4/main main.c
Log:
Freeing that TLS is just too complicated. Since we're shutting
down anyway, remove it for now (it did not exist in 4.0.6)
Index: php4/main/main.c
diff -u php4/main/main.c:1.415 php4/main/main.c:1.416
--- php4/main/main.c:1.415 Tue Dec 11 10:31:02 2001
+++ php4/main/main.c Sun Dec 16 17:45:57 2001
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.415 2001/12/11 15:31:02 sebastian Exp $ */
+/* $Id: main.c,v 1.416 2001/12/16 22:45:57 zeev Exp $ */
/* {{{ includes
*/
@@ -1001,9 +1001,7 @@
/* close down the ini config */
php_shutdown_config();
-#ifdef ZTS
- ts_free_thread();
-#else
+#ifndef ZTS
zend_ini_shutdown(TSRMLS_C);
shutdown_memory_manager(CG(unclean_shutdown), 1);
#endif