diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/php_version.h | 4 | ||||
| -rw-r--r-- | main/streams/plain_wrapper.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/main/php_version.h b/main/php_version.h index d51fdb707..30d715658 100644 --- a/main/php_version.h +++ b/main/php_version.h @@ -2,6 +2,6 @@ /* edit configure.in to change version number */ #define PHP_MAJOR_VERSION 5 #define PHP_MINOR_VERSION 1 -#define PHP_RELEASE_VERSION 5 +#define PHP_RELEASE_VERSION 6 #define PHP_EXTRA_VERSION "" -#define PHP_VERSION "5.1.5" +#define PHP_VERSION "5.1.6" diff --git a/main/streams/plain_wrapper.c b/main/streams/plain_wrapper.c index 1af042752..98a7bd636 100644 --- a/main/streams/plain_wrapper.c +++ b/main/streams/plain_wrapper.c @@ -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 @@ 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 |