diff options
| -rw-r--r-- | Zend/zend.c | 6 | ||||
| -rw-r--r-- | Zend/zend.h | 8 | ||||
| -rw-r--r-- | main/SAPI.h | 3 | ||||
| -rw-r--r-- | main/main.c | 2 | ||||
| -rw-r--r-- | sapi/litespeed/lsapi_main.c | 2 |
5 files changed, 2 insertions, 19 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 42cd65ed9c..2fdb502548 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -51,8 +51,6 @@ ZEND_API size_t (*zend_printf)(const char *format, ...); ZEND_API zend_write_func_t zend_write; ZEND_API FILE *(*zend_fopen)(const char *filename, zend_string **opened_path); ZEND_API int (*zend_stream_open_function)(const char *filename, zend_file_handle *handle); -ZEND_API void (*zend_block_interruptions)(void); -ZEND_API void (*zend_unblock_interruptions)(void); ZEND_API void (*zend_ticks_function)(int ticks); ZEND_API void (*zend_error_cb)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args); size_t (*zend_vspprintf)(char **pbuf, size_t max_len, const char *format, va_list ap); @@ -676,10 +674,6 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions) / } zend_stream_open_function = utility_functions->stream_open_function; zend_message_dispatcher_p = utility_functions->message_handler; -#ifndef ZEND_SIGNALS - zend_block_interruptions = utility_functions->block_interruptions; - zend_unblock_interruptions = utility_functions->unblock_interruptions; -#endif zend_get_configuration_directive_p = utility_functions->get_configuration_directive; zend_ticks_function = utility_functions->ticks_function; zend_on_timeout = utility_functions->on_timeout; diff --git a/Zend/zend.h b/Zend/zend.h index 42130cadf8..23cf6ad831 100644 --- a/Zend/zend.h +++ b/Zend/zend.h @@ -49,8 +49,8 @@ /* block/unblock interruptions callbacks might be used by SAPI, and were used * by mod_php for Apache 1, but now they are not usefull anymore. */ -# define HANDLE_BLOCK_INTERRUPTIONS() /*if (zend_block_interruptions) { zend_block_interruptions(); }*/ -# define HANDLE_UNBLOCK_INTERRUPTIONS() /*if (zend_unblock_interruptions) { zend_unblock_interruptions(); }*/ +# define HANDLE_BLOCK_INTERRUPTIONS() +# define HANDLE_UNBLOCK_INTERRUPTIONS() #else # define HANDLE_BLOCK_INTERRUPTIONS() ZEND_SIGNAL_BLOCK_INTERRUPUTIONS() # define HANDLE_UNBLOCK_INTERRUPTIONS() ZEND_SIGNAL_UNBLOCK_INTERRUPTIONS() @@ -194,8 +194,6 @@ typedef struct _zend_utility_functions { size_t (*write_function)(const char *str, size_t str_length); FILE *(*fopen_function)(const char *filename, zend_string **opened_path); void (*message_handler)(zend_long message, const void *data); - void (*block_interruptions)(void); - void (*unblock_interruptions)(void); zval *(*get_configuration_directive)(zend_string *name); void (*ticks_function)(int ticks); void (*on_timeout)(int seconds); @@ -270,8 +268,6 @@ BEGIN_EXTERN_C() extern ZEND_API size_t (*zend_printf)(const char *format, ...) ZEND_ATTRIBUTE_PTR_FORMAT(printf, 1, 2); extern ZEND_API zend_write_func_t zend_write; extern ZEND_API FILE *(*zend_fopen)(const char *filename, zend_string **opened_path); -extern ZEND_API void (*zend_block_interruptions)(void); -extern ZEND_API void (*zend_unblock_interruptions)(void); extern ZEND_API void (*zend_ticks_function)(int ticks); extern ZEND_API void (*zend_error_cb)(int type, const char *error_filename, const uint error_lineno, const char *format, va_list args) ZEND_ATTRIBUTE_PTR_FORMAT(printf, 4, 0); extern ZEND_API void (*zend_on_timeout)(int seconds); diff --git a/main/SAPI.h b/main/SAPI.h index e8eae2f106..30290b6188 100644 --- a/main/SAPI.h +++ b/main/SAPI.h @@ -248,9 +248,6 @@ struct _sapi_module_struct { char *php_ini_path_override; - void (*block_interruptions)(void); - void (*unblock_interruptions)(void); - void (*default_post_reader)(void); void (*treat_data)(int arg, char *str, zval *destArray); char *executable_location; diff --git a/main/main.c b/main/main.c index cc4b30b462..ad65483437 100644 --- a/main/main.c +++ b/main/main.c @@ -2078,8 +2078,6 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod zuf.write_function = php_output_wrapper; zuf.fopen_function = php_fopen_wrapper_for_zend; zuf.message_handler = php_message_handler_for_zend; - zuf.block_interruptions = sapi_module.block_interruptions; - zuf.unblock_interruptions = sapi_module.unblock_interruptions; zuf.get_configuration_directive = php_get_configuration_directive_for_zend; zuf.ticks_function = php_run_ticks; zuf.on_timeout = php_on_timeout; diff --git a/sapi/litespeed/lsapi_main.c b/sapi/litespeed/lsapi_main.c index b0ea105a88..4dede3f717 100644 --- a/sapi/litespeed/lsapi_main.c +++ b/sapi/litespeed/lsapi_main.c @@ -444,8 +444,6 @@ static sapi_module_struct lsapi_sapi_module = sapi_lsapi_log_message, /* Log message */ NULL, /* php.ini path override */ - NULL, /* block interruptions */ - NULL, /* unblock interruptions */ NULL, /* default post reader */ NULL, /* treat data */ NULL, /* executable location */ |