From: Johannes Schlüter <johannes@php.net>
Date: Thu, 24 Jul 2014 14:53:51 +0000 (+0200)
Subject: Fix bug #55496 Interactive mode doesn't force a newline before the prompt
X-Git-Tag: php-5.4.32RC1~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=71d3a69425449972f4efdf7228c6f7e49e090755;p=php

Fix bug #55496 Interactive mode doesn't force a newline before the prompt
---

diff --git a/NEWS b/NEWS
index 144d86b4e2..c4592a3536 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2014, PHP 5.4.32
 
+- Readline:
+  . Fixed bug #55496 (Interactive mode doesn't force a newline before the
+    prompt). (Bob, Johannes)
+
 ?? ??? 2014, PHP 5.4.31
 
 - Core:
diff --git a/ext/readline/readline_cli.c b/ext/readline/readline_cli.c
index c2bf8764cb..9655777775 100644
--- a/ext/readline/readline_cli.c
+++ b/ext/readline/readline_cli.c
@@ -99,6 +99,9 @@ static size_t readline_shell_write(const char *str, uint str_length TSRMLS_DC) /
 
 static int readline_shell_ub_write(const char *str, uint str_length TSRMLS_DC) /* {{{ */
 {
+	/* We just store the last char here and then pass back to the
+	   caller (sapi_cli_single_write in sapi/cli) which will actually
+	   write due to -1 return code */
 	php_last_char = str[str_length-1];
 	return -1;
 }
@@ -667,7 +670,7 @@ static int readline_shell_run(TSRMLS_D) /* {{{ */
 		pos = 0;
 					
 		if (!pager_pipe && php_last_char != '\0' && php_last_char != '\n') {
-			readline_shell_write("\n", 1 TSRMLS_CC);
+			php_write("\n", 1 TSRMLS_CC);
 		}
 
 		if (EG(exception)) {