cvs: /php4 SAPI.c
| From: | Andi Gutmans | Date: | Thu, 16 Mar 2000 21:23:55 +0000 |
| Subject: | cvs: /php4 SAPI.c | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-12284@lists.php.net to get a copy of this message | ||
andi Thu Mar 16 13:23:55 2000 EDT
Modified files:
/php4 SAPI.c
Log:
- Note quite sure why this wasn't done.
Index: php4/SAPI.c
diff -u php4/SAPI.c:1.66 php4/SAPI.c:1.67
--- php4/SAPI.c:1.66 Sun Mar 5 13:37:47 2000
+++ php4/SAPI.c Thu Mar 16 13:23:24 2000
@@ -57,14 +57,11 @@
sapi_globals_struct sapi_globals;
#endif
-#ifdef ZTS
static void sapi_globals_ctor(sapi_globals_struct *sapi_globals)
{
memset(sapi_globals,0,sizeof(*sapi_globals));
}
-#endif
-
/* True globals (no need for thread safety) */
sapi_module_struct sapi_module;
SAPI_API void (*sapi_error)(int error_type, const char *message, ...);
@@ -79,7 +76,10 @@
#ifdef ZTS
sapi_globals_id = ts_allocate_id(sizeof(sapi_globals_struct), sapi_globals_ctor, NULL);
+#else
+ sapi_globals_ctor(&sapi_globals);
#endif
+
reentrancy_startup();
php_global_startup_internal_extensions();