cvs: php-src /ext/standard proc_open.c
| From: | Ilia Alshanetsky | Date: | Thu, 07 Apr 2005 23:07:46 +0000 |
| Subject: | cvs: php-src /ext/standard proc_open.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-31301@lists.php.net to get a copy of this message | ||
iliaa Thu Apr 7 19:07:46 2005 EDT
Modified files:
/php-src/ext/standard proc_open.c
Log:
Fixed bug #32533 (proc_get_status() returns the incorrect process status).
http://cvs.php.net/diff.php/php-src/ext/standard/proc_open.c?r1=1.32&r2=1.33&ty=u
Index: php-src/ext/standard/proc_open.c
diff -u php-src/ext/standard/proc_open.c:1.32 php-src/ext/standard/proc_open.c:1.33
--- php-src/ext/standard/proc_open.c:1.32 Mon Mar 7 11:17:12 2005
+++ php-src/ext/standard/proc_open.c Thu Apr 7 19:07:45 2005
@@ -15,7 +15,7 @@
| Author: Wez Furlong <wez@thebrainroom.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: proc_open.c,v 1.32 2005/03/07 16:17:12 iliaa Exp $ */
+/* $Id: proc_open.c,v 1.33 2005/04/07 23:07:45 iliaa Exp $ */
#if 0 && (defined(__linux__) || defined(sun) || defined(__IRIX__))
# define _BSD_SOURCE /* linux wants this when XOPEN mode is on */
@@ -402,6 +402,7 @@
exitcode = WEXITSTATUS(wstatus);
}
if (WIFSIGNALED(wstatus)) {
+ running = 0;
signaled = 1;
#ifdef NETWARE
termsig = WIFTERMSIG(wstatus);
@@ -413,7 +414,7 @@
stopped = 1;
stopsig = WSTOPSIG(wstatus);
}
- } else {
+ } else if (wait_pid == -1) {
running = 0;
}
#endif