From 2876046398950e59c3b3c460e67e6fec7ff2ba3c Mon Sep 17 00:00:00 2001
From: SVN Migration <svn@php.net>
Date: Wed, 3 Dec 2008 20:30:45 +0000
Subject: This commit was manufactured by cvs2svn to create tag
 'php_5_3_0alpha2'.

---
 sapi/cli/php_cli.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'sapi/cli/php_cli.c')

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index e554051d29..66e206df62 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -260,10 +260,11 @@ static int sapi_cli_ub_write(const char *str, uint str_length TSRMLS_DC) /* {{{
 	{
 		ret = sapi_cli_single_write(ptr, remaining);
 		if (!ret) {
-#ifndef PHP_CLI_WIN32_NO_CONSOLE
+#ifdef PHP_CLI_WIN32_NO_CONSOLE
+			break;
+#else
 			php_handle_aborted_connection();
 #endif
-			break;
 		}
 		ptr += ret;
 		remaining -= ret;
@@ -346,8 +347,11 @@ static char* sapi_cli_read_cookies(TSRMLS_D) /* {{{ */
 }
 /* }}} */
 
-static int sapi_cli_header_handler(sapi_header_struct *h, sapi_header_op_enum op, sapi_headers_struct *s TSRMLS_DC) /* {{{ */
+static int sapi_cli_header_handler(sapi_header_struct *h, sapi_headers_struct *s TSRMLS_DC) /* {{{ */
 {
+	/* free allocated header line */
+	efree(h->header);
+	/* avoid pushing headers into SAPI headers list */
 	return 0;
 }
 /* }}} */
-- 
cgit v1.2.1