nlopess Sun Dec 31 15:27:13 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard proc_open.c
/php-src NEWS
Log:
- Fixed bug #36427 (proc_open() / proc_close() leak handles on windows).
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/proc_open.c?r1=1.36.2.1.2.3&r2=1.36.2.1.2.4&diff_format=u
Index: php-src/ext/standard/proc_open.c
diff -u php-src/ext/standard/proc_open.c:1.36.2.1.2.3
php-src/ext/standard/proc_open.c:1.36.2.1.2.4
--- php-src/ext/standard/proc_open.c:1.36.2.1.2.3 Sun Dec 31 14:47:17 2006
+++ php-src/ext/standard/proc_open.c Sun Dec 31 15:27:13 2006
@@ -15,7 +15,7 @@
| Author: Wez Furlong <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: proc_open.c,v 1.36.2.1.2.3 2006/12/31 14:47:17 nlopess Exp $ */
+/* $Id: proc_open.c,v 1.36.2.1.2.4 2006/12/31 15:27:13 nlopess Exp $ */
#if 0 && (defined(__linux__) || defined(sun) || defined(__IRIX__))
# define _BSD_SOURCE /* linux wants this when XOPEN mode is on */
@@ -660,7 +660,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
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.466&r2=1.2027.2.547.2.467&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.466 php-src/NEWS:1.2027.2.547.2.467
--- php-src/NEWS:1.2027.2.547.2.466 Sun Dec 31 14:47:17 2006
+++ php-src/NEWS Sun Dec 31 15:27:13 2006
@@ -51,6 +51,8 @@
- Fixed bug #38542 (proc_get_status() returns wrong PID on windows). (Nuno)
- Fixed bug #37588 (COM Property propputref converts to PHP function
and can't be accesed). (Rob)
+- Fixed bug #36427 (proc_open() / proc_close() leak handles on windows).
+ (jdolecek at NetBSD dot org, Nuno)
- Fixed bug #36392 (wrong number of decimal digits with %e specifier in
sprintf). (Matt,Ilia)
- Fixed bug #33734 (Something strange with COM Object). (Rob)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
