cvs: php-src /ext/standard proc_open.c
| From: | Nuno Lopes | Date: | Sun, 31 Dec 2006 15:28:56 +0000 |
| Subject: | cvs: php-src /ext/standard proc_open.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-42494@lists.php.net to get a copy of this message | ||
nlopess Sun Dec 31 15:28:56 2006 UTC
Modified files:
/php-src/ext/standard proc_open.c
Log:
MFB: fix #36427. patch by jdolecek at NetBSD dot org
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/proc_open.c?r1=1.46&r2=1.47&diff_format=u
Index: php-src/ext/standard/proc_open.c
diff -u php-src/ext/standard/proc_open.c:1.46 php-src/ext/standard/proc_open.c:1.47
--- php-src/ext/standard/proc_open.c:1.46 Sun Dec 31 14:49:06 2006
+++ php-src/ext/standard/proc_open.c Sun Dec 31 15:28:56 2006
@@ -15,7 +15,7 @@
| Author: Wez Furlong <wez@thebrainroom.com> |
+----------------------------------------------------------------------+
*/
-/* $Id: proc_open.c,v 1.46 2006/12/31 14:49:06 nlopess Exp $ */
+/* $Id: proc_open.c,v 1.47 2006/12/31 15:28:56 nlopess Exp $ */
#if 0 && (defined(__linux__) || defined(sun) || defined(__IRIX__))
# define _BSD_SOURCE /* linux wants this when XOPEN mode is on */
@@ -652,7 +652,8 @@
}
#ifdef PHP_WIN32
- descriptors[ndesc].childend = (HANDLE)_get_osfhandle(fd);
+ descriptors[ndesc].childend = dup_fd_as_handle(fd);
+ _close(fd);
#else
descriptors[ndesc].childend = fd;
#endif