[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/standard/proc_open.c branches/PHP_5_4/ext/standard/proc_open.c trunk/ext/standard/proc_open.c

[Pierre Joye]

pajoye                                   Mon, 24 Oct 2011 10:53:17 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=318364

Log:
- win9x is not supported anymore since 5.3

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/standard/proc_open.c
    U   php/php-src/branches/PHP_5_4/ext/standard/proc_open.c
    U   php/php-src/trunk/ext/standard/proc_open.c

Modified: php/php-src/branches/PHP_5_3/ext/standard/proc_open.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/proc_open.c       2011-10-24 
10:10:40 UTC (rev 318363)
+++ php/php-src/branches/PHP_5_3/ext/standard/proc_open.c       2011-10-24 
10:53:17 UTC (rev 318364)
@@ -454,7 +454,6 @@
 # define pipe(pair)            (CreatePipe(&pair[0], &pair[1], &security, 
2048L) ? 0 : -1)

 # define COMSPEC_NT    "cmd.exe"
-# define COMSPEC_9X    "command.com"

 static inline HANDLE dup_handle(HANDLE src, BOOL inherit, BOOL closeorig)
 {
@@ -800,7 +799,7 @@
        if (bypass_shell) {
                newprocok = CreateProcess(NULL, command, &security, &security, 
TRUE, dwCreateFlags, env.envp, cwd, &si, &pi);
        } else {
-               spprintf(&command_with_cmd, 0, "%s /c %s", GetVersion() < 
0x80000000 ? COMSPEC_NT : COMSPEC_9X, command);
+               spprintf(&command_with_cmd, 0, "%s /c %s", COMSPEC_NT, command);

                newprocok = CreateProcess(NULL, command_with_cmd, &security, 
&security, TRUE, dwCreateFlags, env.envp, cwd, &si, &pi);


Modified: php/php-src/branches/PHP_5_4/ext/standard/proc_open.c
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/proc_open.c       2011-10-24 
10:10:40 UTC (rev 318363)
+++ php/php-src/branches/PHP_5_4/ext/standard/proc_open.c       2011-10-24 
10:53:17 UTC (rev 318364)
@@ -380,7 +380,6 @@
 # define pipe(pair)            (CreatePipe(&pair[0], &pair[1], &security, 
2048L) ? 0 : -1)

 # define COMSPEC_NT    "cmd.exe"
-# define COMSPEC_9X    "command.com"

 static inline HANDLE dup_handle(HANDLE src, BOOL inherit, BOOL closeorig)
 {
@@ -724,7 +723,7 @@
        if (bypass_shell) {
                newprocok = CreateProcess(NULL, command, &security, &security, 
TRUE, dwCreateFlags, env.envp, cwd, &si, &pi);
        } else {
-               spprintf(&command_with_cmd, 0, "%s /c %s", GetVersion() < 
0x80000000 ? COMSPEC_NT : COMSPEC_9X, command);
+               spprintf(&command_with_cmd, 0, "%s /c %s", COMSPEC_NT, command);

                newprocok = CreateProcess(NULL, command_with_cmd, &security, 
&security, TRUE, dwCreateFlags, env.envp, cwd, &si, &pi);


Modified: php/php-src/trunk/ext/standard/proc_open.c
===================================================================
--- php/php-src/trunk/ext/standard/proc_open.c  2011-10-24 10:10:40 UTC (rev 
318363)
+++ php/php-src/trunk/ext/standard/proc_open.c  2011-10-24 10:53:17 UTC (rev 
318364)
@@ -380,7 +380,6 @@
 # define pipe(pair)            (CreatePipe(&pair[0], &pair[1], &security, 
2048L) ? 0 : -1)

 # define COMSPEC_NT    "cmd.exe"
-# define COMSPEC_9X    "command.com"

 static inline HANDLE dup_handle(HANDLE src, BOOL inherit, BOOL closeorig)
 {
@@ -724,7 +723,7 @@
        if (bypass_shell) {
                newprocok = CreateProcess(NULL, command, &security, &security, 
TRUE, dwCreateFlags, env.envp, cwd, &si, &pi);
        } else {
-               spprintf(&command_with_cmd, 0, "%s /c %s", GetVersion() < 
0x80000000 ? COMSPEC_NT : COMSPEC_9X, command);
+               spprintf(&command_with_cmd, 0, "%s /c %s", COMSPEC_NT, command);

                newprocok = CreateProcess(NULL, command_with_cmd, &security, 
&security, TRUE, dwCreateFlags, env.envp, cwd, &si, &pi);



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php