com php-src: fixes to SAPI.c: main/SAPI.c main/SAPI.h

From: Date: Wed, 16 Oct 2013 09:32:22 +0000
Subject: com php-src: fixes to SAPI.c: main/SAPI.c main/SAPI.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-73505@lists.php.net to get a copy of this message
Commit: 0020a89c432bc92eca919706fb0755a13803f4ca Author: Anatol Belski <ab@php.net> Wed, 17 Jul 2013 06:06:35 -0700 Parents: 9f294bf2827e28c8fe5dd5a326a5b7c072bf2194 Branches: str_size_and_int64 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0020a89c432bc92eca919706fb0755a13803f4ca Log: fixes to SAPI.c Changed paths: M main/SAPI.c M main/SAPI.h Diff: diff --git a/main/SAPI.c b/main/SAPI.c index 8ee7649..ab97edc 100644 --- a/main/SAPI.c +++ b/main/SAPI.c @@ -188,7 +188,7 @@ SAPI_API void sapi_handle_post(void *arg TSRMLS_DC) static void sapi_read_post_data(TSRMLS_D) { sapi_post_entry *post_entry; - uint content_type_length = strlen(SG(request_info).content_type); + zend_str_size_uint content_type_length = strlen(SG(request_info).content_type); char *content_type = estrndup(SG(request_info).content_type, content_type_length); char *p; char oldchar=0; @@ -305,10 +305,10 @@ SAPI_API SAPI_POST_READER_FUNC(sapi_read_standard_form_data) } -static inline char *get_default_content_type(uint prefix_len, uint *len TSRMLS_DC) +static inline char *get_default_content_type(zend_str_size_uint prefix_len, zend_str_size_uint *len TSRMLS_DC) { char *mimetype, *charset, *content_type; - uint mimetype_len, charset_len; + zend_str_size_uint mimetype_len, charset_len; if (SG(default_mimetype)) { mimetype = SG(default_mimetype); @@ -347,7 +347,7 @@ static inline char *get_default_content_type(uint prefix_len, uint *len TSRMLS_D SAPI_API char *sapi_get_default_content_type(TSRMLS_D) { - uint len; + zend_str_size_uint len; return get_default_content_type(0, &len TSRMLS_CC); } @@ -355,7 +355,7 @@ SAPI_API char *sapi_get_default_content_type(TSRMLS_D) SAPI_API void sapi_get_default_content_type_header(sapi_header_struct *default_header TSRMLS_DC) { - uint len; + zend_str_size_uint len; default_header->header = get_default_content_type(sizeof("Content-type: ")-1, &len TSRMLS_CC); default_header->header_len = len; @@ -599,7 +599,7 @@ static void sapi_update_response_code(int ncode TSRMLS_DC) * since zend_llist_del_element only remove one matched item once, * we should remove them by ourself */ -static void sapi_remove_header(zend_llist *l, char *name, uint len) { +static void sapi_remove_header(zend_llist *l, char *name, zend_str_size_uint len) { sapi_header_struct *header; zend_llist_element *next; zend_llist_element *current=l->head; @@ -866,7 +866,7 @@ SAPI_API int sapi_send_headers(TSRMLS_D) */ if (SG(sapi_headers).send_default_content_type && sapi_module.send_headers) { sapi_header_struct default_header; - uint len; + zend_str_size_uint len; SG(sapi_headers).mimetype = get_default_content_type(0, &len TSRMLS_CC); default_header.header_len = sizeof("Content-type: ") - 1 + len; @@ -983,7 +983,7 @@ SAPI_API int sapi_register_treat_data(void (*treat_data)(int arg, char *str, zva return SUCCESS; } -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) +SAPI_API int sapi_register_input_filter(unsigned int (*input_filter)(int arg, char *var, char **val, zend_str_size_uint val_len, zend_str_size_uint *new_val_len TSRMLS_DC), unsigned int (*input_filter_init)(TSRMLS_D) TSRMLS_DC) { if (SG(sapi_started) && EG(in_execution)) { return FAILURE; diff --git a/main/SAPI.h b/main/SAPI.h index 928fca9..8b40c26 100644 --- a/main/SAPI.h +++ b/main/SAPI.h @@ -50,7 +50,7 @@ typedef struct { char *header; - uint header_len; + zend_str_size_uint header_len; } sapi_header_struct; @@ -196,7 +196,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); SAPI_API int sapi_register_default_post_reader(void (*default_post_reader)(TSRMLS_D) TSRMLS_DC); SAPI_API int sapi_register_treat_data(void (*treat_data)(int arg, char *str, zval *destArray TSRMLS_DC) TSRMLS_DC); -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); +SAPI_API int sapi_register_input_filter(unsigned int (*input_filter)(int arg, char *var, char **val, zend_str_size_uint val_len, zend_str_size_uint *new_val_len TSRMLS_DC), unsigned int (*input_filter_init)(TSRMLS_D) TSRMLS_DC); SAPI_API int sapi_flush(TSRMLS_D); SAPI_API struct stat *sapi_get_stat(TSRMLS_D); @@ -264,7 +264,7 @@ struct _sapi_module_struct { int (*get_target_uid)(uid_t * TSRMLS_DC); int (*get_target_gid)(gid_t * TSRMLS_DC); - 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)(int arg, char *var, char **val, zend_str_size_uint val_len, zend_str_size_uint *new_val_len TSRMLS_DC); void (*ini_defaults)(HashTable *configuration_hash); int phpinfo_as_text; @@ -298,7 +298,7 @@ struct _sapi_post_entry { #define SAPI_POST_HANDLER_FUNC(post_handler) void post_handler(char *content_type_dup, void *arg TSRMLS_DC) #define SAPI_TREAT_DATA_FUNC(treat_data) void treat_data(int arg, char *str, zval* destArray TSRMLS_DC) -#define SAPI_INPUT_FILTER_FUNC(input_filter) unsigned int input_filter(int arg, char *var, char **val, unsigned int val_len, unsigned int *new_val_len TSRMLS_DC) +#define SAPI_INPUT_FILTER_FUNC(input_filter) unsigned int input_filter(int arg, char *var, char **val, zend_str_size_uint val_len, zend_str_size_uint *new_val_len TSRMLS_DC) BEGIN_EXTERN_C() SAPI_API SAPI_POST_READER_FUNC(sapi_read_standard_form_data);

« previous php.cvs (#73505) next »