diff options
| author | Michael Wallner <mike@php.net> | 2012-01-31 09:58:26 +0000 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2012-01-31 09:58:26 +0000 |
| commit | c64a69c8b885ac138fa5971c8f784919fd003ca5 (patch) | |
| tree | 37f1d884cb00b48805e54d42689ddc014f750550 /sapi/cli/php_cli_server.c | |
| parent | 0c87d70b1a2660cf3340f4ef93ac858de47b6a25 (diff) | |
| download | php-git-c64a69c8b885ac138fa5971c8f784919fd003ca5.tar.gz | |
MFH: r322963
fix headers print to stdout/stderr if no output written;
fix crashes and invalid usage of output control in cli server while passing by
Diffstat (limited to 'sapi/cli/php_cli_server.c')
| -rw-r--r-- | sapi/cli/php_cli_server.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sapi/cli/php_cli_server.c b/sapi/cli/php_cli_server.c index d702e8ad1d..ffb971618f 100644 --- a/sapi/cli/php_cli_server.c +++ b/sapi/cli/php_cli_server.c @@ -325,6 +325,9 @@ static const char *get_template_string(int code) /* {{{ */ static void append_http_status_line(smart_str *buffer, int protocol_version, int response_code, int persistent) /* {{{ */ { + if (!response_code) { + response_code = 200; + } smart_str_appendl_ex(buffer, "HTTP", 4, persistent); smart_str_appendc_ex(buffer, '/', persistent); smart_str_append_generic_ex(buffer, protocol_version / 100, persistent, int, _unsigned); @@ -1752,13 +1755,11 @@ static int php_cli_server_send_error_page(php_cli_server *server, php_cli_server int err = 0; zval *style = NULL; zend_try { - php_output_activate(TSRMLS_C); php_output_start_user(NULL, 0, PHP_OUTPUT_HANDLER_STDFLAGS TSRMLS_CC); php_info_print_style(TSRMLS_C); MAKE_STD_ZVAL(style); php_output_get_contents(style TSRMLS_CC); php_output_discard(TSRMLS_C); - php_output_deactivate(TSRMLS_C); if (style && Z_STRVAL_P(style)) { char *block = pestrndup(Z_STRVAL_P(style), Z_STRLEN_P(style), 1); php_cli_server_chunk *chunk = php_cli_server_chunk_heap_new(block, block, Z_STRLEN_P(style)); |