diff options
Diffstat (limited to 'main/SAPI.h')
| -rw-r--r-- | main/SAPI.h | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/main/SAPI.h b/main/SAPI.h index e8eae2f106..d52835b7b1 100644 --- a/main/SAPI.h +++ b/main/SAPI.h @@ -232,7 +232,7 @@ struct _sapi_module_struct { zend_stat_t *(*get_stat)(void); char *(*getenv)(char *name, size_t name_len); - void (*sapi_error)(int type, const char *error_msg, ...); + void (*sapi_error)(int type, const char *error_msg, ...) ZEND_ATTRIBUTE_FORMAT(printf, 2, 3); int (*header_handler)(sapi_header_struct *sapi_header, sapi_header_op_enum op, sapi_headers_struct *sapi_headers); int (*send_headers)(sapi_headers_struct *sapi_headers); @@ -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; @@ -275,7 +272,6 @@ struct _sapi_module_struct { unsigned int (*input_filter_init)(void); }; - struct _sapi_post_entry { char *content_type; uint content_type_len; @@ -308,7 +304,23 @@ SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data); SAPI_API SAPI_INPUT_FILTER_FUNC(php_default_input_filter); END_EXTERN_C() -#define STANDARD_SAPI_MODULE_PROPERTIES +#define STANDARD_SAPI_MODULE_PROPERTIES \ + NULL, /* php_ini_path_override */ \ + NULL, /* default_post_reader */ \ + NULL, /* treat_data */ \ + NULL, /* executable_location */ \ + 0, /* php_ini_ignore */ \ + 0, /* php_ini_ignore_cwd */ \ + NULL, /* get_fd */ \ + NULL, /* force_http_10 */ \ + NULL, /* get_target_uid */ \ + NULL, /* get_target_gid */ \ + NULL, /* input_filter */ \ + NULL, /* ini_defaults */ \ + 0, /* phpinfo_as_text; */ \ + NULL, /* ini_entries; */ \ + NULL, /* additional_functions */ \ + NULL /* input_filter_init */ #endif /* SAPI_H */ |