summaryrefslogtreecommitdiff
path: root/sapi/apache/php_apache.c
diff options
context:
space:
mode:
Diffstat (limited to 'sapi/apache/php_apache.c')
-rw-r--r--sapi/apache/php_apache.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/sapi/apache/php_apache.c b/sapi/apache/php_apache.c
index 2ae7dca282..9a055d76a3 100644
--- a/sapi/apache/php_apache.c
+++ b/sapi/apache/php_apache.c
@@ -89,10 +89,19 @@ PHP_INI_BEGIN()
PHP_INI_END()
+
+static void php_apache_globals_ctor(php_apache_info_struct *apache_globals)
+{
+ apache_globals->in_request = 0;
+}
+
+
static PHP_MINIT_FUNCTION(apache)
{
#ifdef ZTS
- php_apache_info_id = ts_allocate_id(sizeof(php_apache_info_struct), NULL, NULL);
+ php_apache_info_id = ts_allocate_id(sizeof(php_apache_info_struct), ts_allocate_ctor, NULL);
+#else
+ php_apache_globals_ctor(&php_apache_info);
#endif
REGISTER_INI_ENTRIES();
return SUCCESS;