Fixed bug #43261

(Use ^ as an escape character for Windows escapeshellcmd)

diff --git a/ext/standard/exec.c b/ext/standard/exec.c
index 4bb59bde3879e5178f4516f9fa70f4cfa9ad3066..f085fc68aa52186f074674c3bef5cc6cd7af4f58 100644 (file)
--- a/ext/standard/exec.c
+++ b/ext/standard/exec.c
@@ -307,12 +307,12 @@ PHPAPI char *php_escape_shell_cmd(char *str)
                        case '\x0A': /* excluding these two */
                        case '\xFF':
 #ifdef PHP_WIN32
-                       /* since Windows does not allow us to escape these chars, just remove them */
+                       /* This is Windows specific for enviromental variables */
                        case '%':
-                               cmd[y++] = ' ';
-                               break;
-#endif
+                               cmd[y++] = '^';
+#else
                                cmd[y++] = '\\';
+#endif
                                /* fall-through */
                        default:
                                cmd[y++] = str[x];