svn: /php/php-src/ branches/PHP_5_4/sapi/cli/php_cli_server.c trunk/sapi/cli/php_cli_server.c

fa Mon, 25 Jul 2011 16:45:39 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=313677 Log: Fix #55121 Segfault with multipart/form-data POST Bug: https://bugs.php.net/55121 (Assigned) Segfault with multipart/form-data POST / 404 request Changed paths: U php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c U php/php-src/trunk/sapi/cli/php_cli_server.c Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c =================================================================== --- php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c 2011-07-25 15:35:10 UTC (rev 313676) +++ php/php-src/branches/PHP_5_4/sapi/cli/php_cli_server.c 2011-07-25 16:45:39 UTC (rev 313677) @@ -1409,8 +1409,9 @@ 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 = *val; + request_info->content_type = strtok(*val, delimiter); } } } /* }}} */ Modified: php/php-src/trunk/sapi/cli/php_cli_server.c =================================================================== --- php/php-src/trunk/sapi/cli/php_cli_server.c 2011-07-25 15:35:10 UTC (rev 313676) +++ php/php-src/trunk/sapi/cli/php_cli_server.c 2011-07-25 16:45:39 UTC (rev 313677) @@ -1409,8 +1409,9 @@ 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 = *val; + request_info->content_type = strtok(*val, delimiter); } } } /* }}} */