diff options
| author | Zeev Suraski <zeev@php.net> | 2001-05-13 09:03:46 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-05-13 09:03:46 +0000 |
| commit | 01132639911a5d36dce43cfe06cafa7e21cec1c4 (patch) | |
| tree | 187af458cc844af0dc8d047f4f5695328abc9802 /sapi/apache/php_apache.c | |
| parent | b38375b4975ac3c043d7beebe79120f8f4f21d44 (diff) | |
| download | php-git-01132639911a5d36dce43cfe06cafa7e21cec1c4.tar.gz | |
Safer detection of recursive PHP invocations
Diffstat (limited to 'sapi/apache/php_apache.c')
| -rw-r--r-- | sapi/apache/php_apache.c | 11 |
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; |