diff options
| author | Felipe Pena <felipensp@gmail.com> | 2013-10-05 12:53:24 -0300 |
|---|---|---|
| committer | Felipe Pena <felipensp@gmail.com> | 2013-10-05 12:53:24 -0300 |
| commit | 8153dd2a9564df6b835652ab58a9c85e1a618749 (patch) | |
| tree | 1bd7d89fc20fa35b00524665c2a8f9fda3ec153a /sapi/cli/php_cli_server.c | |
| parent | 44a2ae059ebbd1068ac09d5705e1debdc3c0144e (diff) | |
| parent | 93f3ba66a7e238f82706cc38006836022a53aeb4 (diff) | |
| download | php-git-8153dd2a9564df6b835652ab58a9c85e1a618749.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
- Fixed bug #65818 (Segfault with built-in webserver and chunked transfer encoding)
- BFN
Allow the ldap extension to be compiled with Oracle's LDAP implementation, if desired. Note the implementations differ so you will see different ldap behavior.
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 4a9ee3dc6a..ab4ac4341b 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; |