diff options
| author | Xinchen Hui <laruence@php.net> | 2011-08-19 08:30:26 +0000 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2011-08-19 08:30:26 +0000 |
| commit | c296c9148fd15c456f0506d4032bc9e3586e0e4c (patch) | |
| tree | d8bb1b0b23e406ba297c2d39cf1dc6c65a523cf1 /sapi/cli/php_cli_server.c | |
| parent | 9cdb9a80a77933cbd205b4447a118ff40d42e74d (diff) | |
| download | php-git-c296c9148fd15c456f0506d4032bc9e3586e0e4c.tar.gz | |
Fixed #55450 (Built in web server not accepting file uploads), which might break #55121 fixing(r313677)
Reopened #55121 to let somebody redone the fixing(as I can't reproduce 55121 in redhat 64-bit).
Diffstat (limited to 'sapi/cli/php_cli_server.c')
| -rw-r--r-- | sapi/cli/php_cli_server.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 3202afe00d..afd41541a3 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -1401,6 +1401,8 @@ static size_t php_cli_server_client_send_through(php_cli_server_client *client, static void php_cli_server_client_populate_request_info(const php_cli_server_client *client, sapi_request_info *request_info) /* {{{ */ { + char **val; + request_info->request_method = php_http_method_str(client->request.request_method); request_info->proto_num = client->request.protocol_version; request_info->request_uri = client->request.request_uri; @@ -1408,12 +1410,8 @@ static void php_cli_server_client_populate_request_info(const php_cli_server_cli request_info->query_string = client->request.query_string; request_info->post_data = client->request.content; request_info->content_length = request_info->post_data_length = client->request.content_len; - { - char **val; - const char delimiter[] = ";"; - if (SUCCESS == zend_hash_find(&client->request.headers, "Content-Type", sizeof("Content-Type"), (void**)&val)) { - request_info->content_type = strtok(*val, delimiter); - } + if (SUCCESS == zend_hash_find(&client->request.headers, "Content-Type", sizeof("Content-Type"), (void**)&val)) { + request_info->content_type = strtok(*val, delimiter); } } /* }}} */ |