dmitry          Tue Aug 22 06:16:19 2006 UTC

  Modified files:              (Branch: PHP_5_1)
    /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.569&r2=1.2027.2.570&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.569 php-src/NEWS:1.2027.2.570
--- php-src/NEWS:1.2027.2.569   Tue Aug 15 13:17:08 2006
+++ php-src/NEWS        Tue Aug 22 06:16:19 2006
@@ -1,6 +1,8 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2006, PHP 5.1.6
+- Fixed bug #38488 (Access to "php://stdin" and family crashes PHP on win32).
+  (Dmitry)
 
 17 Aug 2006, PHP 5.1.5
 - Fixed memory_limit on 64bit systems. (Stefan E.)
http://cvs.php.net/viewvc.cgi/php-src/main/streams/plain_wrapper.c?r1=1.52.2.6&r2=1.52.2.7&diff_format=u
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.52.2.6 
php-src/main/streams/plain_wrapper.c:1.52.2.7
--- php-src/main/streams/plain_wrapper.c:1.52.2.6       Tue Jan 17 02:32:09 2006
+++ php-src/main/streams/plain_wrapper.c        Tue Aug 22 06:16:19 2006
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: plain_wrapper.c,v 1.52.2.6 2006/01/17 02:32:09 iliaa Exp $ */
+/* $Id: plain_wrapper.c,v 1.52.2.7 2006/08/22 06:16:19 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

Reply via email to