diff options
| author | Felipe Pena <felipensp@gmail.com> | 2013-10-05 12:53:10 -0300 |
|---|---|---|
| committer | Felipe Pena <felipensp@gmail.com> | 2013-10-05 12:53:10 -0300 |
| commit | 93f3ba66a7e238f82706cc38006836022a53aeb4 (patch) | |
| tree | 5a6be13d12b8ac0a58c1ce2449e1b6c93314d75c /sapi/cli/php_cli_server.c | |
| parent | 5bc377457e155ceaddd27a536467a4d353fdcd4f (diff) | |
| parent | 3aaee86ee33af276d2e879f5a645cc6dc850de22 (diff) | |
| download | php-git-93f3ba66a7e238f82706cc38006836022a53aeb4.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
- Fixed bug #65818 (Segfault with built-in webserver and chunked transfer encoding)
- BFN
Diffstat (limited to 'sapi/cli/php_cli_server.c')
| -rw-r--r-- | sapi/cli/php_cli_server.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index e84d9ea97a..1315a62b87 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -1600,6 +1600,7 @@ static int php_cli_server_client_read_request_on_body(php_http_parser *parser, c } client->request.content_len = 0; } + client->request.content = perealloc(client->request.content, client->request.content_len + length, 1); memmove(client->request.content + client->request.content_len, at, length); client->request.content_len += length; return 0; |