cvs: php-src(PHP_5_0) / NEWS /ext/standard proc_open.c
| From: | Ilia Alshanetsky | Date: | Thu, 07 Apr 2005 23:08:48 +0000 |
| Subject: | cvs: php-src(PHP_5_0) / NEWS /ext/standard proc_open.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-31302@lists.php.net to get a copy of this message | ||
iliaa Thu Apr 7 19:08:48 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src NEWS
/php-src/ext/standard proc_open.c
Log:
MFH: Fixed bug #32533 (proc_get_status() returns the incorrect process status).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1760.2.315&r2=1.1760.2.316&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.315 php-src/NEWS:1.1760.2.316
--- php-src/NEWS:1.1760.2.315 Thu Apr 7 18:24:43 2005
+++ php-src/NEWS Thu Apr 7 19:08:45 2005
@@ -7,6 +7,7 @@
(Ilia)
- Fixed bug #32560 (configure looks for incorrect db2 library). (Tony)
- Fixed bug #32553 (mmap loads only the 1st 2000000 bytes on Win32). (Ilia)
+- Fixed bug #32533 (proc_get_status() returns the incorrect process status). (Ilia)
- Fixed bug #32530 (chunk_split() does not append endstr if chunklen is
longer then the original string). (Ilia)
- Fixed bug #32491 (File upload error - unable to create a temporary file).
http://cvs.php.net/diff.php/php-src/ext/standard/proc_open.c?r1=1.28.2.3&r2=1.28.2.4&ty=u
Index: php-src/ext/standard/proc_open.c
diff -u php-src/ext/standard/proc_open.c:1.28.2.3 php-src/ext/standard/proc_open.c:1.28.2.4
--- php-src/ext/standard/proc_open.c:1.28.2.3 Fri Mar 11 04:01:52 2005
+++ php-src/ext/standard/proc_open.c Thu Apr 7 19:08:48 2005
@@ -15,7 +15,7 @@
| Author: Wez Furlong <wez@thebrainroom.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: proc_open.c,v 1.28.2.3 2005/03/11 09:01:52 hyanantha Exp $ */
+/* $Id: proc_open.c,v 1.28.2.4 2005/04/07 23:08:48 iliaa Exp $ */
#if 0 && (defined(__linux__) || defined(sun) || defined(__IRIX__))
# define _BSD_SOURCE /* linux wants this when XOPEN mode is on */
@@ -397,6 +397,7 @@
exitcode = WEXITSTATUS(wstatus);
}
if (WIFSIGNALED(wstatus)) {
+ running = 0;
signaled = 1;
#ifdef NETWARE
termsig = WIFTERMSIG(wstatus);
@@ -408,7 +409,7 @@
stopped = 1;
stopsig = WSTOPSIG(wstatus);
}
- } else {
+ } else if (wait_pid == -1) {
running = 0;
}
#endif