From e6f90ecc27f5d305a0e755da67db75da786f4568 Mon Sep 17 00:00:00 2001 From: Anthony Ferrara Date: Tue, 2 Jul 2013 09:46:30 -0400 Subject: It compiles. Sort-of. In a way. Yeah. But nothing works. Sigh --- main/php_variables.c | 50 ++++++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 26 deletions(-) (limited to 'main/php_variables.c') diff --git a/main/php_variables.c b/main/php_variables.c index ab9aee3ae3..af7c69ed84 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -43,14 +43,14 @@ PHPAPI void php_register_variable(char *var, char *strval, zval *track_vars_arra } /* binary-safe version */ -PHPAPI void php_register_variable_safe(char *var, char *strval, int str_len, zval *track_vars_array TSRMLS_DC) +PHPAPI void php_register_variable_safe(char *var, char *strval, zend_str_size_int str_len, zval *track_vars_array TSRMLS_DC) { zval new_entry; assert(strval != NULL); /* Prepare value */ - Z_STRLEN(new_entry) = str_len; - Z_STRVAL(new_entry) = estrndup(strval, Z_STRLEN(new_entry)); + Z_STRSIZE(new_entry) = str_len; + Z_STRVAL(new_entry) = estrndup(strval, Z_STRSIZE(new_entry)); Z_TYPE(new_entry) = IS_STRING; php_register_variable_ex(var, &new_entry, track_vars_array TSRMLS_CC); @@ -62,7 +62,7 @@ PHPAPI void php_register_variable_ex(char *var_name, zval *val, zval *track_vars char *ip = NULL; /* index pointer */ char *index; char *var, *var_orig; - int var_len, index_len; + zend_str_size var_len, index_len; zval *gpc_element, **gpc_element_p; zend_bool is_array = 0; HashTable *symtable1 = NULL; @@ -128,7 +128,7 @@ PHPAPI void php_register_variable_ex(char *var_name, zval *val, zval *track_vars int nest_level = 0; while (1) { char *index_s; - int new_idx_len = 0; + zend_str_size new_idx_len = 0; if(++nest_level > PG(max_input_nesting_level)) { HashTable *ht; @@ -454,8 +454,7 @@ SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data) } if (val) { /* have a value */ - int val_len; - unsigned int new_val_len; + zend_str_size val_len, new_val_len; *val++ = '\0'; php_url_decode(var, strlen(var)); @@ -466,8 +465,7 @@ SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data) } efree(val); } else { - int val_len; - unsigned int new_val_len; + zend_str_size val_len, new_val_len; php_url_decode(var, strlen(var)); val_len = 0; @@ -494,7 +492,7 @@ void _php_import_environment_variables(zval *array_ptr TSRMLS_DC) { char buf[128]; char **env, *p, *t = buf; - size_t alloc_size = sizeof(buf); + zend_str_size alloc_size = sizeof(buf); unsigned long nlen; /* ptrdiff_t is not portable */ for (env = environ; env != NULL && *env != NULL; env++) { @@ -516,7 +514,7 @@ void _php_import_environment_variables(zval *array_ptr TSRMLS_DC) } } -zend_bool php_std_auto_global_callback(char *name, uint name_len TSRMLS_DC) +zend_bool php_std_auto_global_callback(char *name, zend_str_size_uint name_len TSRMLS_DC) { zend_printf("%s\n", name); return 0; /* don't rearm */ @@ -543,8 +541,8 @@ static void php_build_argv(char *s, zval *track_vars_array TSRMLS_DC) for (i = 0; i < SG(request_info).argc; i++) { ALLOC_ZVAL(tmp); Z_TYPE_P(tmp) = IS_STRING; - Z_STRLEN_P(tmp) = strlen(SG(request_info).argv[i]); - Z_STRVAL_P(tmp) = estrndup(SG(request_info).argv[i], Z_STRLEN_P(tmp)); + Z_STRSIZE_P(tmp) = strlen(SG(request_info).argv[i]); + Z_STRVAL_P(tmp) = estrndup(SG(request_info).argv[i], Z_STRSIZE_P(tmp)); INIT_PZVAL(tmp); if (zend_hash_next_index_insert(Z_ARRVAL_P(arr), &tmp, sizeof(zval *), NULL) == FAILURE) { if (Z_TYPE_P(tmp) == IS_STRING) { @@ -562,8 +560,8 @@ static void php_build_argv(char *s, zval *track_vars_array TSRMLS_DC) /* auto-type */ ALLOC_ZVAL(tmp); Z_TYPE_P(tmp) = IS_STRING; - Z_STRLEN_P(tmp) = strlen(ss); - Z_STRVAL_P(tmp) = estrndup(ss, Z_STRLEN_P(tmp)); + Z_STRSIZE_P(tmp) = strlen(ss); + Z_STRVAL_P(tmp) = estrndup(ss, Z_STRSIZE_P(tmp)); INIT_PZVAL(tmp); count++; if (zend_hash_next_index_insert(Z_ARRVAL_P(arr), &tmp, sizeof(zval *), NULL) == FAILURE) { @@ -655,7 +653,7 @@ static void php_autoglobal_merge(HashTable *dest, HashTable *src TSRMLS_DC) { zval **src_entry, **dest_entry; char *string_key; - uint string_key_len; + zend_str_size string_key_len; ulong num_key; HashPosition pos; int key_type; @@ -688,9 +686,9 @@ static void php_autoglobal_merge(HashTable *dest, HashTable *src TSRMLS_DC) } /* }}} */ -static zend_bool php_auto_globals_create_server(const char *name, uint name_len TSRMLS_DC); -static zend_bool php_auto_globals_create_env(const char *name, uint name_len TSRMLS_DC); -static zend_bool php_auto_globals_create_request(const char *name, uint name_len TSRMLS_DC); +static zend_bool php_auto_globals_create_server(const char *name, zend_str_size_uint name_len TSRMLS_DC); +static zend_bool php_auto_globals_create_env(const char *name, zend_str_size_uint name_len TSRMLS_DC); +static zend_bool php_auto_globals_create_request(const char *name, zend_str_size_uint name_len TSRMLS_DC); /* {{{ php_hash_environment */ @@ -705,7 +703,7 @@ int php_hash_environment(TSRMLS_D) } /* }}} */ -static zend_bool php_auto_globals_create_get(const char *name, uint name_len TSRMLS_DC) +static zend_bool php_auto_globals_create_get(const char *name, zend_str_size_uint name_len TSRMLS_DC) { zval *vars; @@ -728,7 +726,7 @@ static zend_bool php_auto_globals_create_get(const char *name, uint name_len TSR return 0; /* don't rearm */ } -static zend_bool php_auto_globals_create_post(const char *name, uint name_len TSRMLS_DC) +static zend_bool php_auto_globals_create_post(const char *name, zend_str_size_uint name_len TSRMLS_DC) { zval *vars; @@ -755,7 +753,7 @@ static zend_bool php_auto_globals_create_post(const char *name, uint name_len TS return 0; /* don't rearm */ } -static zend_bool php_auto_globals_create_cookie(const char *name, uint name_len TSRMLS_DC) +static zend_bool php_auto_globals_create_cookie(const char *name, zend_str_size_uint name_len TSRMLS_DC) { zval *vars; @@ -778,7 +776,7 @@ static zend_bool php_auto_globals_create_cookie(const char *name, uint name_len return 0; /* don't rearm */ } -static zend_bool php_auto_globals_create_files(const char *name, uint name_len TSRMLS_DC) +static zend_bool php_auto_globals_create_files(const char *name, zend_str_size_uint name_len TSRMLS_DC) { zval *vars; @@ -797,7 +795,7 @@ static zend_bool php_auto_globals_create_files(const char *name, uint name_len T return 0; /* don't rearm */ } -static zend_bool php_auto_globals_create_server(const char *name, uint name_len TSRMLS_DC) +static zend_bool php_auto_globals_create_server(const char *name, zend_str_size_uint name_len TSRMLS_DC) { if (PG(variables_order) && (strchr(PG(variables_order),'S') || strchr(PG(variables_order),'s'))) { php_register_server_variables(TSRMLS_C); @@ -835,7 +833,7 @@ static zend_bool php_auto_globals_create_server(const char *name, uint name_len return 0; /* don't rearm */ } -static zend_bool php_auto_globals_create_env(const char *name, uint name_len TSRMLS_DC) +static zend_bool php_auto_globals_create_env(const char *name, zend_str_size_uint name_len TSRMLS_DC) { zval *env_vars = NULL; ALLOC_ZVAL(env_vars); @@ -856,7 +854,7 @@ static zend_bool php_auto_globals_create_env(const char *name, uint name_len TSR return 0; /* don't rearm */ } -static zend_bool php_auto_globals_create_request(const char *name, uint name_len TSRMLS_DC) +static zend_bool php_auto_globals_create_request(const char *name, zend_str_size_uint name_len TSRMLS_DC) { zval *form_variables; unsigned char _gpc_flags[3] = {0, 0, 0}; -- cgit v1.2.1 From de99f93aa5a7791c8ad46945cd9c96a3280f2e78 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 7 Nov 2013 17:47:48 +0100 Subject: fix datatype for hash vars --- main/php_variables.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main/php_variables.c') diff --git a/main/php_variables.c b/main/php_variables.c index af7c69ed84..97d5ea12cc 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -654,7 +654,7 @@ static void php_autoglobal_merge(HashTable *dest, HashTable *src TSRMLS_DC) zval **src_entry, **dest_entry; char *string_key; zend_str_size string_key_len; - ulong num_key; + zend_uint_t num_key; HashPosition pos; int key_type; int globals_check = (dest == (&EG(symbol_table))); -- cgit v1.2.1 From 27a86a4402022bf5ba180a6dbb46cf86c9a05b72 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sat, 9 Nov 2013 02:09:14 +0100 Subject: fixed 64 bit pass by ref --- main/php_variables.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'main/php_variables.c') diff --git a/main/php_variables.c b/main/php_variables.c index 97d5ea12cc..22eae39b9d 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -243,8 +243,7 @@ static zend_bool add_post_var(zval *arr, post_var_data_t *var, zend_bool eof TSR { char *ksep, *vsep; size_t klen, vlen; - /* FIXME: string-size_t */ - unsigned int new_vlen; + zend_str_size_uint new_vlen; if (var->ptr >= var->end) { return 0; -- cgit v1.2.1 From 3198533e92cbd860addddf325ea7ddf8886f30cb Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sun, 24 Nov 2013 22:28:58 +0100 Subject: ZEND_INT_FMT again --- main/php_variables.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'main/php_variables.c') diff --git a/main/php_variables.c b/main/php_variables.c index 22eae39b9d..8d460b4f09 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -144,7 +144,7 @@ PHPAPI void php_register_variable_ex(char *var_name, zval *val, zval *track_vars /* do not output the error message to the screen, this helps us to to avoid "information disclosure" */ if (!PG(display_errors)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Input variable nesting level exceeded %ld. To increase the limit change max_input_nesting_level in php.ini.", PG(max_input_nesting_level)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Input variable nesting level exceeded " ZEND_INT_FMT ". To increase the limit change max_input_nesting_level in php.ini.", PG(max_input_nesting_level)); } free_alloca(var_orig, use_heap); return; @@ -448,7 +448,7 @@ SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data) } if (++count > PG(max_input_vars)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Input variables exceeded %ld. To increase the limit change max_input_vars in php.ini.", PG(max_input_vars)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Input variables exceeded " ZEND_INT_FMT ". To increase the limit change max_input_vars in php.ini.", PG(max_input_vars)); break; } -- cgit v1.2.1 From b1abe4ca21e10b04a8bae2d00e8113f4b2b02567 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 18 Dec 2013 14:46:44 -0800 Subject: mass replacement for zend_size_t/php_size_t --- main/php_variables.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) (limited to 'main/php_variables.c') diff --git a/main/php_variables.c b/main/php_variables.c index 8d460b4f09..6ce861c8aa 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -43,7 +43,7 @@ PHPAPI void php_register_variable(char *var, char *strval, zval *track_vars_arra } /* binary-safe version */ -PHPAPI void php_register_variable_safe(char *var, char *strval, zend_str_size_int str_len, zval *track_vars_array TSRMLS_DC) +PHPAPI void php_register_variable_safe(char *var, char *strval, php_size_t str_len, zval *track_vars_array TSRMLS_DC) { zval new_entry; assert(strval != NULL); @@ -62,7 +62,7 @@ PHPAPI void php_register_variable_ex(char *var_name, zval *val, zval *track_vars char *ip = NULL; /* index pointer */ char *index; char *var, *var_orig; - zend_str_size var_len, index_len; + php_size_t var_len, index_len; zval *gpc_element, **gpc_element_p; zend_bool is_array = 0; HashTable *symtable1 = NULL; @@ -128,7 +128,7 @@ PHPAPI void php_register_variable_ex(char *var_name, zval *val, zval *track_vars int nest_level = 0; while (1) { char *index_s; - zend_str_size new_idx_len = 0; + php_size_t new_idx_len = 0; if(++nest_level > PG(max_input_nesting_level)) { HashTable *ht; @@ -243,7 +243,7 @@ static zend_bool add_post_var(zval *arr, post_var_data_t *var, zend_bool eof TSR { char *ksep, *vsep; size_t klen, vlen; - zend_str_size_uint new_vlen; + php_size_t new_vlen; if (var->ptr >= var->end) { return 0; @@ -453,7 +453,7 @@ SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data) } if (val) { /* have a value */ - zend_str_size val_len, new_val_len; + php_size_t val_len, new_val_len; *val++ = '\0'; php_url_decode(var, strlen(var)); @@ -464,7 +464,7 @@ SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data) } efree(val); } else { - zend_str_size val_len, new_val_len; + php_size_t val_len, new_val_len; php_url_decode(var, strlen(var)); val_len = 0; @@ -491,7 +491,7 @@ void _php_import_environment_variables(zval *array_ptr TSRMLS_DC) { char buf[128]; char **env, *p, *t = buf; - zend_str_size alloc_size = sizeof(buf); + php_size_t alloc_size = sizeof(buf); unsigned long nlen; /* ptrdiff_t is not portable */ for (env = environ; env != NULL && *env != NULL; env++) { @@ -513,7 +513,7 @@ void _php_import_environment_variables(zval *array_ptr TSRMLS_DC) } } -zend_bool php_std_auto_global_callback(char *name, zend_str_size_uint name_len TSRMLS_DC) +zend_bool php_std_auto_global_callback(char *name, php_size_t name_len TSRMLS_DC) { zend_printf("%s\n", name); return 0; /* don't rearm */ @@ -652,7 +652,7 @@ static void php_autoglobal_merge(HashTable *dest, HashTable *src TSRMLS_DC) { zval **src_entry, **dest_entry; char *string_key; - zend_str_size string_key_len; + php_size_t string_key_len; zend_uint_t num_key; HashPosition pos; int key_type; @@ -685,9 +685,9 @@ static void php_autoglobal_merge(HashTable *dest, HashTable *src TSRMLS_DC) } /* }}} */ -static zend_bool php_auto_globals_create_server(const char *name, zend_str_size_uint name_len TSRMLS_DC); -static zend_bool php_auto_globals_create_env(const char *name, zend_str_size_uint name_len TSRMLS_DC); -static zend_bool php_auto_globals_create_request(const char *name, zend_str_size_uint name_len TSRMLS_DC); +static zend_bool php_auto_globals_create_server(const char *name, php_size_t name_len TSRMLS_DC); +static zend_bool php_auto_globals_create_env(const char *name, php_size_t name_len TSRMLS_DC); +static zend_bool php_auto_globals_create_request(const char *name, php_size_t name_len TSRMLS_DC); /* {{{ php_hash_environment */ @@ -702,7 +702,7 @@ int php_hash_environment(TSRMLS_D) } /* }}} */ -static zend_bool php_auto_globals_create_get(const char *name, zend_str_size_uint name_len TSRMLS_DC) +static zend_bool php_auto_globals_create_get(const char *name, php_size_t name_len TSRMLS_DC) { zval *vars; @@ -725,7 +725,7 @@ static zend_bool php_auto_globals_create_get(const char *name, zend_str_size_uin return 0; /* don't rearm */ } -static zend_bool php_auto_globals_create_post(const char *name, zend_str_size_uint name_len TSRMLS_DC) +static zend_bool php_auto_globals_create_post(const char *name, php_size_t name_len TSRMLS_DC) { zval *vars; @@ -752,7 +752,7 @@ static zend_bool php_auto_globals_create_post(const char *name, zend_str_size_ui return 0; /* don't rearm */ } -static zend_bool php_auto_globals_create_cookie(const char *name, zend_str_size_uint name_len TSRMLS_DC) +static zend_bool php_auto_globals_create_cookie(const char *name, php_size_t name_len TSRMLS_DC) { zval *vars; @@ -775,7 +775,7 @@ static zend_bool php_auto_globals_create_cookie(const char *name, zend_str_size_ return 0; /* don't rearm */ } -static zend_bool php_auto_globals_create_files(const char *name, zend_str_size_uint name_len TSRMLS_DC) +static zend_bool php_auto_globals_create_files(const char *name, php_size_t name_len TSRMLS_DC) { zval *vars; @@ -794,7 +794,7 @@ static zend_bool php_auto_globals_create_files(const char *name, zend_str_size_u return 0; /* don't rearm */ } -static zend_bool php_auto_globals_create_server(const char *name, zend_str_size_uint name_len TSRMLS_DC) +static zend_bool php_auto_globals_create_server(const char *name, php_size_t name_len TSRMLS_DC) { if (PG(variables_order) && (strchr(PG(variables_order),'S') || strchr(PG(variables_order),'s'))) { php_register_server_variables(TSRMLS_C); @@ -832,7 +832,7 @@ static zend_bool php_auto_globals_create_server(const char *name, zend_str_size_ return 0; /* don't rearm */ } -static zend_bool php_auto_globals_create_env(const char *name, zend_str_size_uint name_len TSRMLS_DC) +static zend_bool php_auto_globals_create_env(const char *name, php_size_t name_len TSRMLS_DC) { zval *env_vars = NULL; ALLOC_ZVAL(env_vars); @@ -853,7 +853,7 @@ static zend_bool php_auto_globals_create_env(const char *name, zend_str_size_uin return 0; /* don't rearm */ } -static zend_bool php_auto_globals_create_request(const char *name, zend_str_size_uint name_len TSRMLS_DC) +static zend_bool php_auto_globals_create_request(const char *name, php_size_t name_len TSRMLS_DC) { zval *form_variables; unsigned char _gpc_flags[3] = {0, 0, 0}; -- cgit v1.2.1 From f58d0b35edf25a8f39fad6bd5e0e4eeb5cdfe9a7 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 19 Dec 2013 05:07:37 -0800 Subject: massive update semantical LONG vs INT replacements --- main/php_variables.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'main/php_variables.c') diff --git a/main/php_variables.c b/main/php_variables.c index 6ce861c8aa..b2a68e8892 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -580,11 +580,11 @@ static void php_build_argv(char *s, zval *track_vars_array TSRMLS_DC) /* prepare argc */ ALLOC_INIT_ZVAL(argc); if (SG(request_info).argc) { - Z_LVAL_P(argc) = SG(request_info).argc; + Z_IVAL_P(argc) = SG(request_info).argc; } else { - Z_LVAL_P(argc) = count; + Z_IVAL_P(argc) = count; } - Z_TYPE_P(argc) = IS_LONG; + Z_TYPE_P(argc) = IS_INT; if (SG(request_info).argc) { Z_ADDREF_P(arr); @@ -638,8 +638,8 @@ static inline void php_register_server_variables(TSRMLS_D) Z_TYPE(request_time_float) = IS_DOUBLE; Z_DVAL(request_time_float) = sapi_get_request_time(TSRMLS_C); php_register_variable_ex("REQUEST_TIME_FLOAT", &request_time_float, array_ptr TSRMLS_CC); - Z_TYPE(request_time_long) = IS_LONG; - Z_LVAL(request_time_long) = zend_dval_to_lval(Z_DVAL(request_time_float)); + Z_TYPE(request_time_long) = IS_INT; + Z_IVAL(request_time_long) = zend_dval_to_lval(Z_DVAL(request_time_float)); php_register_variable_ex("REQUEST_TIME", &request_time_long, array_ptr TSRMLS_CC); } @@ -663,7 +663,7 @@ static void php_autoglobal_merge(HashTable *dest, HashTable *src TSRMLS_DC) key_type = zend_hash_get_current_key_ex(src, &string_key, &string_key_len, &num_key, 0, &pos); if (Z_TYPE_PP(src_entry) != IS_ARRAY || (key_type == HASH_KEY_IS_STRING && zend_hash_find(dest, string_key, string_key_len, (void **) &dest_entry) != SUCCESS) - || (key_type == HASH_KEY_IS_LONG && zend_hash_index_find(dest, num_key, (void **)&dest_entry) != SUCCESS) + || (key_type == HASH_KEY_IS_INT && zend_hash_index_find(dest, num_key, (void **)&dest_entry) != SUCCESS) || Z_TYPE_PP(dest_entry) != IS_ARRAY ) { Z_ADDREF_PP(src_entry); -- cgit v1.2.1 From f2fc935502b110b7a706d1641c000a9e9500315b Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Thu, 19 Dec 2013 23:28:52 -0800 Subject: next wave on semantical replacements long vs. int --- main/php_variables.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main/php_variables.c') diff --git a/main/php_variables.c b/main/php_variables.c index b2a68e8892..64b51ca618 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -639,7 +639,7 @@ static inline void php_register_server_variables(TSRMLS_D) Z_DVAL(request_time_float) = sapi_get_request_time(TSRMLS_C); php_register_variable_ex("REQUEST_TIME_FLOAT", &request_time_float, array_ptr TSRMLS_CC); Z_TYPE(request_time_long) = IS_INT; - Z_IVAL(request_time_long) = zend_dval_to_lval(Z_DVAL(request_time_float)); + Z_IVAL(request_time_long) = zend_dval_to_ival(Z_DVAL(request_time_float)); php_register_variable_ex("REQUEST_TIME", &request_time_long, array_ptr TSRMLS_CC); } -- cgit v1.2.1 From 9a7f242f861ee2a27cde1794aa1b0f4119102fde Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sat, 15 Feb 2014 14:33:11 +0100 Subject: backported main/ --- main/php_variables.c | 1 - 1 file changed, 1 deletion(-) (limited to 'main/php_variables.c') diff --git a/main/php_variables.c b/main/php_variables.c index 7c13424169..8e2671d356 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -731,7 +731,6 @@ static zend_bool php_auto_globals_create_post(const char *name, php_size_t name_ if (PG(variables_order) && (strchr(PG(variables_order),'P') || strchr(PG(variables_order),'p')) && - !SG(headers_sent) && SG(request_info).request_method && !strcasecmp(SG(request_info).request_method, "POST")) { sapi_module.treat_data(PARSE_POST, NULL, NULL TSRMLS_CC); -- cgit v1.2.1 From 8ee2a4a9b5de682c0b37670e1f4f86242b1650ce Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sat, 16 Aug 2014 11:16:11 +0200 Subject: first shot on merging the core fro the int64 branch --- main/php_variables.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'main/php_variables.c') diff --git a/main/php_variables.c b/main/php_variables.c index 3bb6d65aa5..94ec65f7de 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -141,7 +141,7 @@ PHPAPI void php_register_variable_ex(char *var_name, zval *val, zval *track_vars /* do not output the error message to the screen, this helps us to to avoid "information disclosure" */ if (!PG(display_errors)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Input variable nesting level exceeded %ld. To increase the limit change max_input_nesting_level in php.ini.", PG(max_input_nesting_level)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Input variable nesting level exceeded " ZEND_INT_FMT ". To increase the limit change max_input_nesting_level in php.ini.", PG(max_input_nesting_level)); } free_alloca(var_orig, use_heap); return; @@ -246,7 +246,7 @@ static zend_bool add_post_var(zval *arr, post_var_data_t *var, zend_bool eof TSR char *ksep, *vsep; size_t klen, vlen; /* FIXME: string-size_t */ - unsigned int new_vlen; + php_size_t new_vlen; if (var->ptr >= var->end) { return 0; @@ -442,13 +442,13 @@ SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data) } if (++count > PG(max_input_vars)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Input variables exceeded %ld. To increase the limit change max_input_vars in php.ini.", PG(max_input_vars)); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Input variables exceeded " ZEND_INT_FMT ". To increase the limit change max_input_vars in php.ini.", PG(max_input_vars)); break; } if (val) { /* have a value */ - int val_len; - unsigned int new_val_len; + php_size_t val_len; + php_size_t new_val_len; *val++ = '\0'; php_url_decode(var, strlen(var)); @@ -459,8 +459,8 @@ SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data) } efree(val); } else { - int val_len; - unsigned int new_val_len; + php_size_t val_len; + php_size_t new_val_len; php_url_decode(var, strlen(var)); val_len = 0; @@ -562,9 +562,9 @@ static void php_build_argv(char *s, zval *track_vars_array TSRMLS_DC) /* prepare argc */ if (SG(request_info).argc) { - ZVAL_LONG(&argc, SG(request_info).argc); + ZVAL_INT(&argc, SG(request_info).argc); } else { - ZVAL_LONG(&argc, count); + ZVAL_INT(&argc, count); } if (SG(request_info).argc) { @@ -608,7 +608,7 @@ static inline void php_register_server_variables(TSRMLS_D) zval request_time_float, request_time_long; ZVAL_DOUBLE(&request_time_float, sapi_get_request_time(TSRMLS_C)); php_register_variable_ex("REQUEST_TIME_FLOAT", &request_time_float, &PG(http_globals)[TRACK_VARS_SERVER] TSRMLS_CC); - ZVAL_LONG(&request_time_long, zend_dval_to_lval(Z_DVAL(request_time_float))); + ZVAL_INT(&request_time_long, zend_dval_to_ival(Z_DVAL(request_time_float))); php_register_variable_ex("REQUEST_TIME", &request_time_long, &PG(http_globals)[TRACK_VARS_SERVER] TSRMLS_CC); } @@ -621,7 +621,7 @@ static void php_autoglobal_merge(HashTable *dest, HashTable *src TSRMLS_DC) { zval *src_entry, *dest_entry; zend_string *string_key; - ulong num_key; + php_uint_t num_key; int globals_check = (dest == (&EG(symbol_table).ht)); ZEND_HASH_FOREACH_KEY_VAL(src, num_key, string_key, src_entry) { -- cgit v1.2.1 From 90d6f60bc17bb4fea69feeab506eb02bfeec20fd Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Sun, 17 Aug 2014 13:31:39 +0200 Subject: mostly fixes to spl, but also some other --- main/php_variables.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main/php_variables.c') diff --git a/main/php_variables.c b/main/php_variables.c index 94ec65f7de..8a38e97d60 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -43,7 +43,7 @@ PHPAPI void php_register_variable(char *var, char *strval, zval *track_vars_arra } /* binary-safe version */ -PHPAPI void php_register_variable_safe(char *var, char *strval, int str_len, zval *track_vars_array TSRMLS_DC) +PHPAPI void php_register_variable_safe(char *var, char *strval, php_size_t str_len, zval *track_vars_array TSRMLS_DC) { zval new_entry; assert(strval != NULL); -- cgit v1.2.1 From 745a71be33f8eafc8081add8c2c6a393b9deb349 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 20 Aug 2014 14:46:14 +0200 Subject: yet more fixes to zpp --- main/php_variables.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main/php_variables.c') diff --git a/main/php_variables.c b/main/php_variables.c index 8a38e97d60..949bd6c6b0 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -358,7 +358,7 @@ SAPI_API SAPI_TREAT_DATA_FUNC(php_default_treat_data) zval array; int free_buffer = 0; char *strtok_buf = NULL; - long count = 0; + php_int_t count = 0; ZVAL_UNDEF(&array); switch (arg) { -- cgit v1.2.1