diff options
| author | Adam Harvey <aharvey@php.net> | 2014-07-07 20:45:01 +0000 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2014-07-07 20:45:01 +0000 |
| commit | 70e9d3e2f9d7bc0b48811f01c084f82524af604c (patch) | |
| tree | ca17b6b646a9b4af6c95e349b5cb602d81888f70 /sapi/cli/php_cli_server.c | |
| parent | 41448bff7cd00623f7b43e9aff0a443e7731e93b (diff) | |
| parent | 1939b34c788c57de452b3cf1540182d08ff8f1ad (diff) | |
| download | php-git-70e9d3e2f9d7bc0b48811f01c084f82524af604c.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
Diffstat (limited to 'sapi/cli/php_cli_server.c')
| -rw-r--r-- | sapi/cli/php_cli_server.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 64cca0eb6f..9239f6a02c 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -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); |