diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-07-08 11:32:29 +0400 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-07-08 11:32:29 +0400 |
| commit | 8ce2f2caacc99c8a579ebfaa078ac9a063e2936f (patch) | |
| tree | eeac185eb793b7a4e81d32ae4bbf84fb66b05246 /sapi/cli/php_cli_server.c | |
| parent | b36aaea6ede499589b3298e204095c292d025c34 (diff) | |
| parent | 6e9bc95f6726f4d397d6f78e778f512b92b1b54b (diff) | |
| download | php-git-8ce2f2caacc99c8a579ebfaa078ac9a063e2936f.tar.gz | |
Merge branch 'master' into phpng
* master:
Fix still broken session test. Only return true/false.
Fixed bug #66830 (Empty header causes PHP built-in web server to hang).
Followup fix to custom session save handlers
create locales and re-add test
rm test for now
Conflicts:
ext/session/tests/session_set_save_handler_class_012.phpt
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 85881bcab5..4b16e97a56 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -597,11 +597,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); |