diff options
| author | Christoph M. Becker <cmbecker69@gmx.de> | 2020-05-26 17:46:56 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2020-05-26 17:46:56 +0200 |
| commit | d2508ef94704b10332e2af2ed0c09d0012cffd69 (patch) | |
| tree | dbd8a1d5057d383b407e38dc0f963d10de2cbe9f /sapi/phpdbg/phpdbg_cmd.c | |
| parent | 31e410e0980e5c9272c4e4d00ef99c6b50fe0499 (diff) | |
| parent | 9fad9addb5707efe96dc5b9eeea4e4f00816d1f6 (diff) | |
| download | php-git-d2508ef94704b10332e2af2ed0c09d0012cffd69.tar.gz | |
Merge branch 'PHP-7.4'
* PHP-7.4:
Enable phpdbg tests on AppVeyor
Make phpdbg test portable
Fix several mostly Windows related phpdbg bugs
Fix #73926: phpdbg will not accept input on restart execution
Diffstat (limited to 'sapi/phpdbg/phpdbg_cmd.c')
| -rw-r--r-- | sapi/phpdbg/phpdbg_cmd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg_cmd.c b/sapi/phpdbg/phpdbg_cmd.c index 750628c800..61f17d1c0e 100644 --- a/sapi/phpdbg/phpdbg_cmd.c +++ b/sapi/phpdbg/phpdbg_cmd.c @@ -821,7 +821,7 @@ PHPDBG_API int phpdbg_ask_user_permission(const char *question) { while (1) { phpdbg_consume_stdin_line(buf); - if (buf[1] == '\n' && (buf[0] == 'y' || buf[0] == 'n')) { + if ((buf[1] == '\n' || (buf[1] == '\r' && buf[2] == '\n')) && (buf[0] == 'y' || buf[0] == 'n')) { if (buf[0] == 'y') { return SUCCESS; } |