Merge branch 'PHP-5.4' into PHP-5.5

johannes · johannes · commit ffc1d25b378f · 2014-07-24T16:56:05.000+02:00
diff --git 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)) {

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,9 @@ static size_t readline_shell_write(const char *str, uint str_length TSRMLS_DC) /`
`99`	`99`
`100`	`100`	`static int readline_shell_ub_write(const char str, uint str_length TSRMLS_DC) / {{{ */`
`101`	`101`	`{`
	`102`	`+ /* We just store the last char here and then pass back to the`
	`103`	`+ caller (sapi_cli_single_write in sapi/cli) which will actually`
	`104`	`+ write due to -1 return code */`
`102`	`105`	`php_last_char = str[str_length-1];`
`103`	`106`	`return -1;`
`104`	`107`	`}`
`@@ -667,7 +670,7 @@ static int readline_shell_run(TSRMLS_D) /* {{{ */`
`667`	`670`	`pos = 0;`
`668`	`671`
`669`	`672`	`if (!pager_pipe && php_last_char != '\0' && php_last_char != '\n') {`
`670`		`- readline_shell_write("\n", 1 TSRMLS_CC);`
	`673`	`+ php_write("\n", 1 TSRMLS_CC);`
`671`	`674`	`}`
`672`	`675`
`673`	`676`	`if (EG(exception)) {`