diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-08-22 06:15:26 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-08-22 06:15:26 +0000 |
| commit | 7dfbf5b2e4dc4030dbbe137e7d4b52f15e43e5bd (patch) | |
| tree | e6e3ce54f2dcb4243982dbb5754814c10416d4f0 | |
| parent | 4180155a4791c65aa2c184de99185e30d4d66d0a (diff) | |
| download | php-git-7dfbf5b2e4dc4030dbbe137e7d4b52f15e43e5bd.tar.gz | |
Fixed bug #38488 (Access to "php://stdin" and family crashes PHP on win32)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | main/streams/plain_wrapper.c | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -5,6 +5,8 @@ PHP NEWS 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) diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c index 99fcf7ee10..54cc39b7f6 100644 --- a/main/streams/plain_wrapper.c +++ b/main/streams/plain_wrapper.c @@ -194,10 +194,9 @@ PHPAPI php_stream *_php_stream_fopen_from_fd(int fd, const char *mode, const cha #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 |