summaryrefslogtreecommitdiff
path: root/sapi/cli
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2013-10-07 13:50:59 +0200
committerAnatol Belski <ab@php.net>2013-10-07 13:50:59 +0200
commit4fe7ec33f1eef1ae0344acef6189911e03066b25 (patch)
tree13ccfb876e244b4fe7e0577022d5273064dd75bf /sapi/cli
parent9c7dbb0487f5991fde03873ea8f5e66d6688415f (diff)
parent0117eb747e1b36a301d58fa29aa3ae48b5aa2ac7 (diff)
downloadphp-git-4fe7ec33f1eef1ae0344acef6189911e03066b25.tar.gz
Merge branch 'PHP-5.5'
* PHP-5.5: added fixed tests for ICU >= 51.2 fixed failing tests for ICU >= 51.2 FIX BUG #65219 - Typo correction FIX BUG #65219 - USE DB not being sent for FreeTDS version < 0.92 FreeTDS <0.92 does not support DBSETLDBNAME option and therefore will not work with SQL Azure. Fallback to dbuse command in letter versions. - Fixed bug #65818 (Segfault with built-in webserver and chunked transfer encoding) - BFN
Diffstat (limited to 'sapi/cli')
-rw-r--r--sapi/cli/php_cli_server.c1
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;