Fixed incompatible pointer type (int64)

diff --git a/main/SAPI.c b/main/SAPI.c
index acf884a8428dfeaf4eec363a7ec1a3c52fad85c0..e80dcb01ec86059ec3af49c95a74f7f01c1e5dd0 100644 (file)
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -984,7 +984,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, size_t val_len, size_t *new_val_len TSRMLS_DC), unsigned int (*input_filter_init)(TSRMLS_D) TSRMLS_DC)
 {
        if (SG(sapi_started) && EG(current_execute_data)) {
                return FAILURE;

diff --git a/main/SAPI.h b/main/SAPI.h
index d4bc075f84e360cd2648e00cd343c1f029fbc34c..9172a3e4dd73b478872c23a2a466bd6bb86bbb79 100644 (file)
--- a/main/SAPI.h
+++ b/main/SAPI.h
@@ -198,7 +198,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, size_t val_len, size_t *new_val_len TSRMLS_DC), unsigned int (*input_filter_init)(TSRMLS_D) TSRMLS_DC);
 
 SAPI_API int sapi_flush(TSRMLS_D);
 SAPI_API zend_stat_t *sapi_get_stat(TSRMLS_D);

diff --git a/sapi/fpm/fpm/fpm_main.c b/sapi/fpm/fpm/fpm_main.c
index 953cc182d45052c88d8dbd237bb906d1daa45cea..ff303696975b69426d151746e7fdd07c3b5c6318 100644 (file)
--- a/sapi/fpm/fpm/fpm_main.c
+++ b/sapi/fpm/fpm/fpm_main.c
@@ -298,7 +298,7 @@ static inline size_t sapi_cgibin_single_write(const char *str, uint str_length T
 #endif
 }
 
-static int sapi_cgibin_ub_write(const char *str, uint str_length TSRMLS_DC)
+static size_t sapi_cgibin_ub_write(const char *str, size_t str_length TSRMLS_DC)
 {
        const char *ptr = str;
        uint remaining = str_length;
@@ -497,7 +497,7 @@ static int sapi_cgi_send_headers(sapi_headers_struct *sapi_headers TSRMLS_DC)
 # define STDIN_FILENO 0
 #endif
 
-static int sapi_cgi_read_post(char *buffer, uint count_bytes TSRMLS_DC)
+static size_t sapi_cgi_read_post(char *buffer, size_t count_bytes TSRMLS_DC)
 {
        uint read_bytes = 0;
        int tmp_read_bytes;
@@ -598,7 +598,7 @@ void cgi_php_import_environment_variables(zval *array_ptr TSRMLS_DC)
                ? PARSE_ENV : PARSE_SERVER;
 
        ZEND_HASH_FOREACH_STR_KEY_PTR(request->env, var, val) {
-               unsigned int new_val_len;
+               size_t new_val_len;
 
                if (var && sapi_module.input_filter(filter_arg, var->val, &val, strlen(val), &new_val_len TSRMLS_CC)) {
                        php_register_variable_safe(var->val, val, new_val_len, array_ptr TSRMLS_CC);
@@ -608,7 +608,7 @@ void cgi_php_import_environment_variables(zval *array_ptr TSRMLS_DC)
 
 static void sapi_cgi_register_variables(zval *track_vars_array TSRMLS_DC)
 {
-       unsigned int php_self_len;
+       size_t php_self_len;
        char *php_self;
 
        /* In CGI mode, we consider the environment to be a part of the server