diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/SAPI.c | 8 | ||||
| -rw-r--r-- | main/SAPI.h | 2 | ||||
| -rw-r--r-- | main/main.c | 12 | ||||
| -rw-r--r-- | main/php_ini.c | 14 | ||||
| -rw-r--r-- | main/php_ini.h | 2 | ||||
| -rw-r--r-- | main/php_ticks.c | 5 | ||||
| -rw-r--r-- | main/rfc1867.c | 4 |
7 files changed, 24 insertions, 23 deletions
diff --git a/main/SAPI.c b/main/SAPI.c index 618f16f140..08fa6afcc5 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -496,17 +496,17 @@ SAPI_API int sapi_send_headers() http_status_line.header = SG(sapi_headers).http_status_line; http_status_line.header_len = strlen(SG(sapi_headers).http_status_line); - sapi_module.send_header(&http_status_line, SG(server_context)); + sapi_module.send_header(&http_status_line, SG(server_context) TSRMLS_CC); } - zend_llist_apply_with_argument(&SG(sapi_headers).headers, (void (*)(void *, void *)) sapi_module.send_header, SG(server_context)); + zend_llist_apply_with_argument(&SG(sapi_headers).headers, (llist_apply_with_arg_func_t) sapi_module.send_header, SG(server_context) TSRMLS_CC); if(SG(sapi_headers).send_default_content_type) { sapi_header_struct default_header; sapi_get_default_content_type_header(&default_header TSRMLS_CC); - sapi_module.send_header(&default_header, SG(server_context)); + sapi_module.send_header(&default_header, SG(server_context) TSRMLS_CC); sapi_free_header(&default_header); } - sapi_module.send_header(NULL, SG(server_context)); + sapi_module.send_header(NULL, SG(server_context) TSRMLS_CC); ret = SUCCESS; break; case SAPI_HEADER_SEND_FAILED: diff --git a/main/SAPI.h b/main/SAPI.h index 85dd8a2079..95015a7f81 100644 --- a/main/SAPI.h +++ b/main/SAPI.h @@ -169,7 +169,7 @@ struct _sapi_module_struct { int (*header_handler)(sapi_header_struct *sapi_header, sapi_headers_struct *sapi_headers TSRMLS_DC); int (*send_headers)(sapi_headers_struct *sapi_headers TSRMLS_DC); - void (*send_header)(sapi_header_struct *sapi_header, void *server_context); + void (*send_header)(sapi_header_struct *sapi_header, void *server_context TSRMLS_DC); int (*read_post)(char *buffer, uint count_bytes TSRMLS_DC); char *(*read_cookies)(TSRMLS_D); diff --git a/main/main.c b/main/main.c index bfe8b67d0c..8e9c1c0dc2 100644 --- a/main/main.c +++ b/main/main.c @@ -128,7 +128,7 @@ static PHP_INI_MH(OnUpdateErrorReporting) /* {{{ php_disable_functions */ -static void php_disable_functions() +static void php_disable_functions(TSRMLS_D) { char *func; char *new_value_dup = strdup(INI_STR("disable_functions")); /* This is an intentional leak, @@ -137,7 +137,7 @@ static void php_disable_functions() func = strtok(new_value_dup, ", "); while (func) { - zend_disable_function(func, strlen(func)); + zend_disable_function(func, strlen(func) TSRMLS_CC); func = strtok(NULL, ", "); } } @@ -655,7 +655,7 @@ int php_request_startup(TSRMLS_D) /* PG(during_request_startup) = 0; */ php_hash_environment(TSRMLS_C); - zend_activate_modules(); + zend_activate_modules(TSRMLS_C); PG(modules_activated)=1; } zend_catch { retval = FAILURE; @@ -909,10 +909,10 @@ int php_module_startup(sapi_module_struct *sf) which is always an internal extension and to be initialized ahead of all other internals */ - php_ini_delayed_modules_startup(); + php_ini_delayed_modules_startup(TSRMLS_C); /* disable certain functions as requested by php.ini */ - php_disable_functions(); + php_disable_functions(TSRMLS_C); zend_startup_extensions(); @@ -961,7 +961,7 @@ void php_module_shutdown() php_shutdown_ticks(TSRMLS_C); sapi_flush(); - zend_shutdown(); + zend_shutdown(TSRMLS_C); php_shutdown_fopen_wrappers(); php_shutdown_info_logos(); UNREGISTER_INI_ENTRIES(); diff --git a/main/php_ini.c b/main/php_ini.c index 5e2a54b87e..d47dcac226 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -77,7 +77,7 @@ static void php_ini_displayer_cb(zend_ini_entry *ini_entry, int type) /* {{{ php_ini_displayer */ -static int php_ini_displayer(zend_ini_entry *ini_entry, int module_number) +static int php_ini_displayer(zend_ini_entry *ini_entry, int module_number TSRMLS_DC) { if (ini_entry->module_number != module_number) { return 0; @@ -109,7 +109,7 @@ PHPAPI void display_ini_entries(zend_module_entry *module) } php_info_print_table_start(); php_info_print_table_header(3, "Directive", "Local Value", "Master Value"); - zend_hash_apply_with_argument(&EG(ini_directives), (apply_func_arg_t) php_ini_displayer, (void *) (long) module_number); + zend_hash_apply_with_argument(&EG(ini_directives), (apply_func_arg_t) php_ini_displayer, (void *) (long) module_number TSRMLS_CC); php_info_print_table_end(); } /* }}} */ @@ -176,7 +176,7 @@ static void php_config_ini_parser_cb(zval *arg1, zval *arg2, int callback_type, /* {{{ php_load_function_extension_cb */ -static void php_load_function_extension_cb(void *arg) +static void php_load_function_extension_cb(void *arg TSRMLS_DC) { zval *extension = (zval *) arg; zval zval; @@ -187,7 +187,7 @@ static void php_load_function_extension_cb(void *arg) /* {{{ php_load_zend_extension_cb */ -static void php_load_zend_extension_cb(void *arg) +static void php_load_zend_extension_cb(void *arg TSRMLS_DC) { zend_load_extension(*((char **) arg)); } @@ -294,10 +294,10 @@ int php_shutdown_config(void) /* {{{ php_ini_delayed_modules_startup */ -void php_ini_delayed_modules_startup(void) +void php_ini_delayed_modules_startup(TSRMLS_D) { - zend_llist_apply(&extension_lists.engine, php_load_zend_extension_cb); - zend_llist_apply(&extension_lists.functions, php_load_function_extension_cb); + zend_llist_apply(&extension_lists.engine, php_load_zend_extension_cb TSRMLS_CC); + zend_llist_apply(&extension_lists.functions, php_load_function_extension_cb TSRMLS_CC); zend_llist_destroy(&extension_lists.engine); zend_llist_destroy(&extension_lists.functions); diff --git a/main/php_ini.h b/main/php_ini.h index 107a1cdc53..bc78876e79 100644 --- a/main/php_ini.h +++ b/main/php_ini.h @@ -23,7 +23,7 @@ int php_init_config(char *php_ini_path_override); int php_shutdown_config(void); -void php_ini_delayed_modules_startup(void); +void php_ini_delayed_modules_startup(TSRMLS_D); zval *cfg_get_entry(char *name, uint name_length); #define PHP_INI_USER ZEND_INI_USER diff --git a/main/php_ticks.c b/main/php_ticks.c index de79d9cc84..b82d5b03a9 100644 --- a/main/php_ticks.c +++ b/main/php_ticks.c @@ -56,19 +56,20 @@ PHPAPI void php_remove_tick_function(void (*func)(int)) (int(*)(void*,void*))php_compare_tick_functions); } -static void php_tick_iterator(void *data, void *arg) +static void php_tick_iterator(void *data, void *arg TSRMLS_DC) { void (*func)(int); memcpy(&func, data, sizeof(void(*)(int))); func(*((int *)arg)); + return SUCCESS; } void php_run_ticks(int count) { TSRMLS_FETCH(); - zend_llist_apply_with_argument(&PG(tick_functions), (void(*)(void*,void*))php_tick_iterator, &count); + zend_llist_apply_with_argument(&PG(tick_functions), (llist_apply_with_arg_func_t) php_tick_iterator, &count TSRMLS_CC); } /* diff --git a/main/rfc1867.c b/main/rfc1867.c index 92615a4292..6ad499e5e9 100644 --- a/main/rfc1867.c +++ b/main/rfc1867.c @@ -83,7 +83,7 @@ static void register_http_post_files_variable_ex(char *var, zval *val, zval *htt } -static int unlink_filename(char **filename) +static int unlink_filename(char **filename TSRMLS_DC) { VCWD_UNLINK(*filename); return 0; @@ -92,7 +92,7 @@ static int unlink_filename(char **filename) void destroy_uploaded_files_hash(TSRMLS_D) { - zend_hash_apply(SG(rfc1867_uploaded_files), (apply_func_t) unlink_filename); + zend_hash_apply(SG(rfc1867_uploaded_files), (apply_func_t) unlink_filename TSRMLS_CC); zend_hash_destroy(SG(rfc1867_uploaded_files)); FREE_HASHTABLE(SG(rfc1867_uploaded_files)); } |