diff options
| author | Rasmus Lerdorf <rasmus@php.net> | 2013-11-07 07:55:26 -0800 |
|---|---|---|
| committer | Rasmus Lerdorf <rasmus@php.net> | 2013-11-07 07:55:26 -0800 |
| commit | 8cb128159d07d80aaf751b252a94ff63d7f6ae06 (patch) | |
| tree | 1d8ebb09facf44bbf6a406ab681e537f6643e089 /sapi/cli/php_cli_server.c | |
| parent | f0c926564c5f7de9462d9ca7bd75014b14a63f56 (diff) | |
| parent | 8b6b39fdcffc8486fedd391b8d8aa7700f0c7f93 (diff) | |
| download | php-git-8cb128159d07d80aaf751b252a94ff63d7f6ae06.tar.gz | |
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
* 'PHP-5.4' of git.php.net:php-src: (65 commits)
Add a couple more test cases to parse_url() tests
fix missing change from 'tcp_socket' to the more common 'server'
fix many parallel test issues
Cleanup temp test file
Fixed Bug #66034 (Segmentation Fault when constructor of PDO statement throws an exception)
Typo fix: umknown -> unknown
Fix bug #66008
5.4.23-dev
Update NEWS
Fixed Bug 64760 var_export() does not use full precision for floating-point numbers
add bundled libzip LICENSE, as required by BSD License terms
- Updated to version 2013.8 (2013h)
remove "PHP 6" staff
Fixed bug #65950 Field name truncation if the field name is bigger than 32 characters
- Updated to version 2013.7 (2013g)
Fix Coverity issue reporting wrong sizeof()
exif NEWS
add tests for bug #62523
Merged PR #293 (Exif crash on unknown encoding was fixed) By: Draal Conflicts: configure.in main/php_version.h
Just SKIP that test on travis
...
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 4da55acc6c..aa4b2cd622 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -1589,6 +1589,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; |