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
This commit is contained in:
Felipe Pena 2013-10-05 12:53:10 -03:00
commit 93f3ba66a7

View file

@ -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;