com php-src: Fix bug #55496 Interactive mode doesn't force a newline before the prompt: NEWS ext/readline/readline_cli.c

Commit: 71d3a69425449972f4efdf7228c6f7e49e090755 Author: Johannes Schlüter <johannes@php.net> Thu, 24 Jul 2014 16:53:51 +0200 Parents: dc3a5d783f92c63c1c2645b542d5f5487f3bd952 Branches: PHP-5.4 PHP-5.5 PHP-5.6 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=71d3a69425449972f4efdf7228c6f7e49e090755 Log: Fix bug #55496 Interactive mode doesn't force a newline before the prompt Bugs: https://bugs.php.net/55496 Changed paths: M NEWS M ext/readline/readline_cli.c Diff: diff --git a/NEWS b/NEWS index 144d86b..c4592a3 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 c2bf876..9655777 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)) {