diff options
| author | Stefan Esser | 2012-02-12 10:47:10 +0100 |
|---|---|---|
| committer | Stefan Esser | 2012-02-12 10:47:10 +0100 |
| commit | af51a7f576f0cec1d2c94b9bbb3dfb46dd466a66 (patch) | |
| tree | 32e834a3b76912f11a8934d0e526470f70121203 | |
| parent | e1d86b42a6bb56efb1c073e238412fe277f4f895 (diff) | |
Fix ZTS compile problem
| -rw-r--r-- | php_suhosin.h | 2 | ||||
| -rw-r--r-- | post_handler.c | 2 | ||||
| -rw-r--r-- | suhosin.c | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/php_suhosin.h b/php_suhosin.h index 7d0a286..c3491d0 100644 --- a/php_suhosin.h +++ b/php_suhosin.h | |||
| @@ -308,7 +308,7 @@ char *suhosin_generate_key(char *key, zend_bool ua, zend_bool dr, long raddr, ch | |||
| 308 | char *suhosin_cookie_decryptor(TSRMLS_D); | 308 | char *suhosin_cookie_decryptor(TSRMLS_D); |
| 309 | char *suhosin_getenv(char *name, size_t name_len TSRMLS_DC); | 309 | char *suhosin_getenv(char *name, size_t name_len TSRMLS_DC); |
| 310 | void suhosin_hook_post_handlers(TSRMLS_D); | 310 | void suhosin_hook_post_handlers(TSRMLS_D); |
| 311 | void suhosin_unhook_post_handlers(); | 311 | void suhosin_unhook_post_handlers(TSRMLS_D); |
| 312 | void suhosin_hook_register_server_variables(); | 312 | void suhosin_hook_register_server_variables(); |
| 313 | void suhosin_hook_header_handler(); | 313 | void suhosin_hook_header_handler(); |
| 314 | void suhosin_unhook_header_handler(); | 314 | void suhosin_unhook_header_handler(); |
diff --git a/post_handler.c b/post_handler.c index b405ae2..96f4b4a 100644 --- a/post_handler.c +++ b/post_handler.c | |||
| @@ -162,7 +162,7 @@ void suhosin_hook_post_handlers(TSRMLS_D) | |||
| 162 | ini_entry->on_modify = suhosin_OnUpdate_mbstring_encoding_translation; | 162 | ini_entry->on_modify = suhosin_OnUpdate_mbstring_encoding_translation; |
| 163 | } | 163 | } |
| 164 | 164 | ||
| 165 | void suhosin_unhook_post_handlers() | 165 | void suhosin_unhook_post_handlers(TSRMLS_D) |
| 166 | { | 166 | { |
| 167 | zend_ini_entry *ini_entry; | 167 | zend_ini_entry *ini_entry; |
| 168 | 168 | ||
| @@ -189,9 +189,11 @@ static int suhosin_module_startup(zend_extension *extension) | |||
| 189 | 189 | ||
| 190 | static void suhosin_shutdown(zend_extension *extension) | 190 | static void suhosin_shutdown(zend_extension *extension) |
| 191 | { | 191 | { |
| 192 | TSRMLS_FETCH(); | ||
| 193 | |||
| 192 | suhosin_unhook_execute(); | 194 | suhosin_unhook_execute(); |
| 193 | suhosin_unhook_header_handler(); | 195 | suhosin_unhook_header_handler(); |
| 194 | suhosin_unhook_post_handlers(); | 196 | suhosin_unhook_post_handlers(TSRMLS_C); |
| 195 | /* suhosin_unhook_session(); - enabling this causes compability problems */ | 197 | /* suhosin_unhook_session(); - enabling this causes compability problems */ |
| 196 | 198 | ||
| 197 | if (ze != NULL) { | 199 | if (ze != NULL) { |
