svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/standard/proc_open.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/proc_open.c
trunk/ext/standard/proc_open.c
| From: | Felipe Pena | Date: | Mon, 03 Aug 2009 19:05:56 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_2/NEWS branches/PHP_5_2/ext/standard/proc_open.c branches/PHP_5_3/NEWS branches/PHP_5_3/ext/standard/proc_open.c trunk/ext/standard/proc_open.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-60000@lists.php.net to get a copy of this message | ||
felipe Mon, 03 Aug 2009 19:05:56 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=286752
Log:
- Fixed bug #49095 (proc_get_status['exitcode'] fails on win32)
Bug: http://bugs.php.net/49095 (Closed)
proc_get_status['exitcode'] fails on win32
Changed paths:
U php/php-src/branches/PHP_5_2/NEWS
U php/php-src/branches/PHP_5_2/ext/standard/proc_open.c
U php/php-src/branches/PHP_5_3/NEWS
U php/php-src/branches/PHP_5_3/ext/standard/proc_open.c
U php/php-src/trunk/ext/standard/proc_open.c
Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS 2009-08-03 18:15:30 UTC (rev 286751)
+++ php/php-src/branches/PHP_5_2/NEWS 2009-08-03 19:05:56 UTC (rev 286752)
@@ -8,6 +8,7 @@
- Fixed bug #49132 (posix_times returns false without error).
(phpbugs at gunnu dot us)
- Fixed bug #49125 (Error in dba_exists C code). (jdornan at stanford dot edu)
+- Fixed bug #49095 (proc_get_status['exitcode'] fails on win32). (Felipe)
- Fixed bug #49074 (private class static fields can be modified by using
reflection). (Jani)
- Fixed bug #49052 (context option headers freed too early when using
Modified: php/php-src/branches/PHP_5_2/ext/standard/proc_open.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/standard/proc_open.c 2009-08-03 18:15:30 UTC (rev 286751)
+++ php/php-src/branches/PHP_5_2/ext/standard/proc_open.c 2009-08-03 19:05:56 UTC (rev 286752)
@@ -412,7 +412,7 @@
GetExitCodeProcess(proc->childHandle, &wstatus);
running = wstatus == STILL_ACTIVE;
- exitcode == STILL_ACTIVE ? -1 : wstatus;
+ exitcode = running ? -1 : wstatus;
#elif HAVE_SYS_WAIT_H
Modified: php/php-src/branches/PHP_5_3/NEWS
===================================================================
--- php/php-src/branches/PHP_5_3/NEWS 2009-08-03 18:15:30 UTC (rev 286751)
+++ php/php-src/branches/PHP_5_3/NEWS 2009-08-03 19:05:56 UTC (rev 286752)
@@ -13,6 +13,7 @@
- Fixed bug #49125 (Error in dba_exists C code). (jdornan at stanford dot edu)
- Fixed bug #49122 (undefined reference to mysqlnd_stmt_next_result on compile with
--with-mysqli and MySQL 6.0). (Jani)
+- Fixed bug #49095 (proc_get_status['exitcode'] fails on win32). (Felipe)
- Fixed bug #49092 (ReflectionFunction fails to work with functions in fully
qualified namespaces). (Kalle, Jani)
- Fixed bug #49074 (private class static fields can be modified by using
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 2009-08-03 18:15:30 UTC (rev 286751)
+++ php/php-src/branches/PHP_5_3/ext/standard/proc_open.c 2009-08-03 19:05:56 UTC (rev 286752)
@@ -412,7 +412,7 @@
GetExitCodeProcess(proc->childHandle, &wstatus);
running = wstatus == STILL_ACTIVE;
- exitcode == STILL_ACTIVE ? -1 : wstatus;
+ exitcode = running ? -1 : wstatus;
#elif HAVE_SYS_WAIT_H
Modified: php/php-src/trunk/ext/standard/proc_open.c
===================================================================
--- php/php-src/trunk/ext/standard/proc_open.c 2009-08-03 18:15:30 UTC (rev 286751)
+++ php/php-src/trunk/ext/standard/proc_open.c 2009-08-03 19:05:56 UTC (rev 286752)
@@ -394,7 +394,7 @@
GetExitCodeProcess(proc->childHandle, &wstatus);
running = wstatus == STILL_ACTIVE;
- exitcode == STILL_ACTIVE ? -1 : wstatus;
+ exitcode = running ? -1 : wstatus;
#elif HAVE_SYS_WAIT_H