Fix #73926: phpdbg will not accept input on restart execution

cmb69 · cmb69 · commit e483761a1e8a · 2020-05-26T17:44:39.000+02:00
We are more liberal, and accept Windows line endings (CRLF) as well.
diff --git a/NEWS b/NEWS
@@ -5,6 +5,9 @@ PHP                                                                        NEWS
 - Core:
   . Fixed bug #79595 (zend_init_fpu() alters FPU precision). (cmb, Nikita)
 
+- phpdbg:
+  . Fixed bug #73926 (phpdbg will not accept input on restart execution). (cmb)
+
 11 Jun 2020, PHP 7.4.7
 
 - Core:
diff --git a/sapi/phpdbg/phpdbg_cmd.c b/sapi/phpdbg/phpdbg_cmd.c
@@ -823,7 +823,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;
 				}

Original file line number	Diff line number	Diff line change
`@@ -823,7 +823,7 @@ PHPDBG_API int phpdbg_ask_user_permission(const char *question) {`
`823`	`823`
`824`	`824`	`while (1) {`
`825`	`825`	`phpdbg_consume_stdin_line(buf);`
`826`		`- if (buf[1] == '\n' && (buf[0] == 'y' \|\| buf[0] == 'n')) {`
	`826`	`+ if ((buf[1] == '\n' \|\| (buf[1] == '\r' && buf[2] == '\n')) && (buf[0] == 'y' \|\| buf[0] == 'n')) {`
`827`	`827`	`if (buf[0] == 'y') {`
`828`	`828`	`return SUCCESS;`
`829`	`829`	`}`