Fixed #55450 (Built in web server not accepting file uploads), which might break...

Reopened #55121 to let somebody redone the fixing(as I can't reproduce 55121 in redhat 64-bit).

diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c
index 3202afe00d943cfb29c354ea4e523eee2e183ba3..afd41541a39fa4ba5de2c72de4800813fa240a56 100644 (file)
--- 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);
        }
 } /* }}} */