scottmac Fri May 30 16:56:57 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard exec.c
Log:
MFH Fixed bug #43261
(Use ^ as an escape character for Windows escapeshellcmd)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/exec.c?r1=1.113.2.3.2.1.2.8&r2=1.113.2.3.2.1.2.9&diff_format=u
Index: php-src/ext/standard/exec.c
diff -u php-src/ext/standard/exec.c:1.113.2.3.2.1.2.8
php-src/ext/standard/exec.c:1.113.2.3.2.1.2.9
--- php-src/ext/standard/exec.c:1.113.2.3.2.1.2.8 Sun Mar 30 12:24:10 2008
+++ php-src/ext/standard/exec.c Fri May 30 16:56:57 2008
@@ -16,7 +16,7 @@
| Ilia Alshanetsky <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: exec.c,v 1.113.2.3.2.1.2.8 2008/03/30 12:24:10 felipe Exp $ */
+/* $Id: exec.c,v 1.113.2.3.2.1.2.9 2008/05/30 16:56:57 scottmac Exp $ */
#include <stdio.h>
#include "php.h"
@@ -322,12 +322,12 @@
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];
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
