diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.c | 6 | ||||
| -rw-r--r-- | main/php_variables.c | 4 | ||||
| -rw-r--r-- | main/php_variables.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/main/main.c b/main/main.c index bbb2a9174d..7b4a8ec0c9 100644 --- a/main/main.c +++ b/main/main.c @@ -1007,21 +1007,21 @@ static int php_hash_environment(ELS_D SLS_DC PLS_DC) case 'p': case 'P': if (!_gpc_flags[0] && !SG(headers_sent) && SG(request_info).request_method && !strcasecmp(SG(request_info).request_method, "POST")) { - php_treat_data(PARSE_POST, NULL ELS_CC PLS_CC SLS_CC); /* POST Data */ + php_treat_data(PARSE_POST, NULL, NULL ELS_CC PLS_CC SLS_CC); /* POST Data */ _gpc_flags[0]=1; } break; case 'c': case 'C': if (!_gpc_flags[1]) { - php_treat_data(PARSE_COOKIE, NULL ELS_CC PLS_CC SLS_CC); /* Cookie Data */ + php_treat_data(PARSE_COOKIE, NULL, NULL ELS_CC PLS_CC SLS_CC); /* Cookie Data */ _gpc_flags[1]=1; } break; case 'g': case 'G': if (!_gpc_flags[2]) { - php_treat_data(PARSE_GET, NULL ELS_CC PLS_CC SLS_CC); /* GET Data */ + php_treat_data(PARSE_GET, NULL, NULL ELS_CC PLS_CC SLS_CC); /* GET Data */ _gpc_flags[2]=1; } break; diff --git a/main/php_variables.c b/main/php_variables.c index 65baee6248..4187d00eba 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -209,7 +209,7 @@ SAPI_POST_HANDLER_FUNC(php_std_post_handler) } -void php_treat_data(int arg, char *str ELS_DC PLS_DC SLS_DC) +void php_treat_data(int arg, char *str, zval* destArray ELS_DC PLS_DC SLS_DC) { char *res = NULL, *var, *val; pval *array_ptr; @@ -236,7 +236,7 @@ void php_treat_data(int arg, char *str ELS_DC PLS_DC SLS_DC) } break; default: - array_ptr=NULL; + array_ptr=destArray; break; } diff --git a/main/php_variables.h b/main/php_variables.h index ad65a089cf..f71fe2762b 100644 --- a/main/php_variables.h +++ b/main/php_variables.h @@ -30,7 +30,7 @@ #define PARSE_COOKIE 2 #define PARSE_STRING 3 -void php_treat_data(int arg, char *str ELS_DC PLS_DC SLS_DC); +void php_treat_data(int arg, char *str, zval* destArray ELS_DC PLS_DC SLS_DC); void php_import_environment_variables(ELS_D PLS_DC); PHPAPI void php_register_variable(char *var, char *val, pval *track_vars_array ELS_DC PLS_DC); PHPAPI void php_register_variable_ex(char *var, zval *val, pval *track_vars_array ELS_DC PLS_DC); |