archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-5.5' into PHP-5.6

Browse source 
* PHP-5.5:
  Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
This commit is contained in:
Adam Harvey 2014-07-07 20:45:01 +00:00
commit 70e9d3e2f9
3 changed files with 50 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sapi/cli/php_cli_server.c
View file

@ -666,11 +666,10 @@ static int sapi_cli_server_send_headers(sapi_headers_struct *sapi_headers TSRMLS
h = (sapi_header_struct*)zend_llist_get_first_ex(&sapi_headers->headers, &pos);
while (h) {
if (!h->header_len) {
continue;
if (h->header_len) {
smart_str_appendl(&buffer, h->header, h->header_len);
smart_str_appendl(&buffer, "\r\n", 2);
}
smart_str_appendl(&buffer, h->header, h->header_len);
smart_str_appendl(&buffer, "\r\n", 2);
h = (sapi_header_struct*)zend_llist_get_next_ex(&sapi_headers->headers, &pos);
}
smart_str_appendl(&buffer, "\r\n", 2);