diff options
| author | Adam Harvey <aharvey@php.net> | 2014-07-07 20:40:47 +0000 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2014-07-07 20:40:47 +0000 |
| commit | 1939b34c788c57de452b3cf1540182d08ff8f1ad (patch) | |
| tree | bef2e180ccdda6506e9989401514325ca4b79c1e | |
| parent | 551696363332942d26209368f441f6f152be4769 (diff) | |
| parent | 604de67b7d0b8c6db76002011e3b55dd9c7aeec8 (diff) | |
| download | php-git-1939b34c788c57de452b3cf1540182d08ff8f1ad.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | sapi/cli/php_cli_server.c | 7 | ||||
| -rw-r--r-- | sapi/cli/tests/bug66830.phpt | 43 |
3 files changed, 48 insertions, 4 deletions
@@ -16,6 +16,8 @@ PHP NEWS - CLI server: . Implemented FR #67429 (CLI server is missing some new HTTP response codes). (Adam) + . Fixed bug #66830 (Empty header causes PHP built-in web server to hang). + (Adam) - FPM: . Fixed bug #67531 (syslog cannot be set in pool configuration). (Remi) diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index 88eb5743ba..15b4f29bf3 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); diff --git a/sapi/cli/tests/bug66830.phpt b/sapi/cli/tests/bug66830.phpt new file mode 100644 index 0000000000..68fcf21c11 --- /dev/null +++ b/sapi/cli/tests/bug66830.phpt @@ -0,0 +1,43 @@ +--TEST-- +Bug #66830 (Empty header causes PHP built-in web server to hang) +--SKIPIF-- +<?php +include "skipif.inc"; +?> +--FILE-- +<?php +include "php_cli_server.inc"; +php_cli_server_start(<<<'PHP' +header(' '); +PHP +); + +list($host, $port) = explode(':', PHP_CLI_SERVER_ADDRESS); +$port = intval($port)?:80; + +$fp = fsockopen($host, $port, $errno, $errstr, 0.5); +if (!$fp) { + die("connect failed"); +} + +if(fwrite($fp, <<<HEADER +GET / HTTP/1.1 +Host: {$host} + + +HEADER +)) { + while (!feof($fp)) { + echo fgets($fp); + } +} + +fclose($fp); +?> +--EXPECTF-- +HTTP/1.1 200 OK +Host: %s +Connection: close +X-Powered-By: %s +Content-type: text/html + |