diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-07-03 01:02:25 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-07-03 01:02:25 +0400 |
| commit | 0a77dcd4b9046adb7c8f719ded19c5eff0c8976a (patch) | |
| tree | 8fdd3343db9b3a7345ded20de1b20da68bcc1705 /main/SAPI.c | |
| parent | 63c057e3313918a800ad7faebdb648216ddba4c0 (diff) | |
| download | php-git-0a77dcd4b9046adb7c8f719ded19c5eff0c8976a.tar.gz | |
Removed EG(in_execution). If EG(currentent_execute_data) is not NULL we are executing something.
Diffstat (limited to 'main/SAPI.c')
| -rw-r--r-- | main/SAPI.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/main/SAPI.c b/main/SAPI.c index e587f7aaf7..229396dd79 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -947,7 +947,7 @@ SAPI_API int sapi_register_post_entries(sapi_post_entry *post_entries TSRMLS_DC) SAPI_API int sapi_register_post_entry(sapi_post_entry *post_entry TSRMLS_DC) { - if (SG(sapi_started) && EG(in_execution)) { + if (SG(sapi_started) && EG(current_execute_data)) { return FAILURE; } return zend_hash_str_add_mem(&SG(known_post_content_types), @@ -957,7 +957,7 @@ SAPI_API int sapi_register_post_entry(sapi_post_entry *post_entry TSRMLS_DC) SAPI_API void sapi_unregister_post_entry(sapi_post_entry *post_entry TSRMLS_DC) { - if (SG(sapi_started) && EG(in_execution)) { + if (SG(sapi_started) && EG(current_execute_data)) { return; } zend_hash_str_del(&SG(known_post_content_types), post_entry->content_type, @@ -967,7 +967,7 @@ SAPI_API void sapi_unregister_post_entry(sapi_post_entry *post_entry TSRMLS_DC) SAPI_API int sapi_register_default_post_reader(void (*default_post_reader)(TSRMLS_D) TSRMLS_DC) { - if (SG(sapi_started) && EG(in_execution)) { + if (SG(sapi_started) && EG(current_execute_data)) { return FAILURE; } sapi_module.default_post_reader = default_post_reader; @@ -977,7 +977,7 @@ SAPI_API int sapi_register_default_post_reader(void (*default_post_reader)(TSRML SAPI_API int sapi_register_treat_data(void (*treat_data)(int arg, char *str, zval *destArray TSRMLS_DC) TSRMLS_DC) { - if (SG(sapi_started) && EG(in_execution)) { + if (SG(sapi_started) && EG(current_execute_data)) { return FAILURE; } sapi_module.treat_data = treat_data; @@ -986,7 +986,7 @@ SAPI_API int sapi_register_treat_data(void (*treat_data)(int arg, char *str, zva SAPI_API int sapi_register_input_filter(unsigned int (*input_filter)(int arg, char *var, char **val, unsigned int val_len, unsigned int *new_val_len TSRMLS_DC), unsigned int (*input_filter_init)(TSRMLS_D) TSRMLS_DC) { - if (SG(sapi_started) && EG(in_execution)) { + if (SG(sapi_started) && EG(current_execute_data)) { return FAILURE; } sapi_module.input_filter = input_filter; |