cvs: php4(PHP_4_0_5) /main php_variables.c

sniper Tue Mar 27 06:03:03 2001 EDT Modified files: (Branch: PHP_4_0_5) /php4/main php_variables.c Log: MFH Index: php4/main/php_variables.c diff -u php4/main/php_variables.c:1.21 php4/main/php_variables.c:1.21.2.1 --- php4/main/php_variables.c:1.21 Sun Feb 25 22:07:31 2001 +++ php4/main/php_variables.c Tue Mar 27 06:03:03 2001 @@ -277,13 +277,7 @@ return; } - if (arg == PARSE_COOKIE) { - var = php_strtok_r(res, ";", &strtok_buf); - } else if (arg == PARSE_POST) { - var = php_strtok_r(res, "&", &strtok_buf); - } else { - var = php_strtok_r(res, PG(arg_separator), &strtok_buf); - } + var = php_strtok_r(res, ";&", &strtok_buf); while (var) { val = strchr(var, '='); @@ -294,18 +288,13 @@ php_url_decode(var, strlen(var)); val_len = php_url_decode(val, strlen(val)); php_register_variable_safe(var, val, val_len, array_ptr ELS_CC PLS_CC); - } - if (arg == PARSE_COOKIE) { - var = php_strtok_r(NULL, ";", &strtok_buf); - } else { - var = php_strtok_r(NULL, PG(arg_separator), &strtok_buf); } + var = php_strtok_r(NULL, ";&", &strtok_buf); } if (free_buffer) { efree(res); } } - void php_import_environment_variables(zval *array_ptr ELS_DC PLS_DC)