dmitry Tue Aug 22 06:15:27 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/main/streams plain_wrapper.c
Log:
Fixed bug #38488 (Access to "php://stdin" and family crashes PHP on win32)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.212&r2=1.2027.2.547.2.213&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.212 php-src/NEWS:1.2027.2.547.2.213
--- php-src/NEWS:1.2027.2.547.2.212 Mon Aug 21 16:53:49 2006
+++ php-src/NEWS Tue Aug 22 06:15:26 2006
@@ -5,6 +5,8 @@
inside a failed query executed via query() method). (Ilia)
- Fixed bug #38524 (strptime() does not initialize the internal date storage
structure). (Ilia)
+- Fixed bug #38488 (Access to "php://stdin" and family crashes PHP on win32).
+ (Dmitry)
- Fixed PECL bug #8112 (OCI8 persistent connections misbehave when Apache
process times out). (Tony)
http://cvs.php.net/viewvc.cgi/php-src/main/streams/plain_wrapper.c?r1=1.52.2.6.2.3&r2=1.52.2.6.2.4&diff_format=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.52.2.6.2.3
php-src/main/streams/plain_wrapper.c:1.52.2.6.2.4
--- php-src/main/streams/plain_wrapper.c:1.52.2.6.2.3 Mon Jun 5 22:39:50 2006
+++ php-src/main/streams/plain_wrapper.c Tue Aug 22 06:15:26 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: plain_wrapper.c,v 1.52.2.6.2.3 2006/06/05 22:39:50 tony2001 Exp $ */
+/* $Id: plain_wrapper.c,v 1.52.2.6.2.4 2006/08/22 06:15:26 dmitry Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -194,10 +194,9 @@
#elif defined(PHP_WIN32)
{
long handle = _get_osfhandle(self->fd);
- DWORD in_buf_size, out_buf_size;
if (handle != 0xFFFFFFFF) {
- self->is_pipe = GetNamedPipeInfo((HANDLE)handle, NULL,
&out_buf_size, &in_buf_size, NULL);
+ self->is_pipe = GetFileType((HANDLE)handle) ==
FILE_TYPE_PIPE;
}
}
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
