summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2013-11-15 09:49:42 +0100
committerRemi Collet <remi@php.net>2013-11-15 09:49:42 +0100
commitb8d88bf2c588dcaec185468da8db306cd7e6ab8d (patch)
tree4eeef0125cabb3bfb199cdaa292a0028a6ed1c1e
parentd7441f66959b8bee0a059b057e45bd48643153ab (diff)
downloadphp-git-b8d88bf2c588dcaec185468da8db306cd7e6ab8d.tar.gz
Fix Bug #65714 PHP cli forces the tty to cooked mode
Only drop the using_history() call with libedit as I don't know if it is required with readline. This also allow to run a php script in background without it being aborted on first output.
-rw-r--r--ext/readline/readline.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/ext/readline/readline.c b/ext/readline/readline.c
index bd460696bd..d4032ca947 100644
--- a/ext/readline/readline.c
+++ b/ext/readline/readline.c
@@ -170,7 +170,10 @@ ZEND_GET_MODULE(readline)
PHP_MINIT_FUNCTION(readline)
{
- using_history();
+#if HAVE_LIBREADLINE
+ /* libedit don't need this call which set the tty in cooked mode */
+ using_history();
+#endif
return PHP_MINIT(cli_readline)(INIT_FUNC_ARGS_PASSTHRU);
}