Merge branch 'PHP-5.4' into PHP-5.5

felipensp · felipensp · commit 93f3ba66a7e2 · 2013-10-05T12:53:10.000-03:00
* PHP-5.4:
  - Fixed bug #65818 (Segfault with built-in webserver and chunked transfer encoding)
  - BFN
diff --git 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;

Original file line number	Diff line number	Diff line change
`@@ -1600,6 +1600,7 @@ static int php_cli_server_client_read_request_on_body(php_http_parser *parser, c`
`1600`	`1600`	`}`
`1601`	`1601`	`client->request.content_len = 0;`
`1602`	`1602`	`}`
	`1603`	`+ client->request.content = perealloc(client->request.content, client->request.content_len + length, 1);`
`1603`	`1604`	`memmove(client->request.content + client->request.content_len, at, length);`
`1604`	`1605`	`client->request.content_len += length;`
`1605`	`1606`	`return 0;`