From 6de67244d40f43fbbc7d019cfccf8c3537a3ee31 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Wed, 17 Aug 2016 00:53:15 +0200 Subject: [PATCH] fix blocking pipe stream option value As revealed by #72857, this value conflicts with the xport option. Wrong code can otherwise cause streams misbehave, fe if local and network streams APIs are mixed. --- main/php_streams.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main/php_streams.h b/main/php_streams.h index cd5319ca227..5da29a2f4f6 100644 --- a/main/php_streams.h +++ b/main/php_streams.h @@ -406,9 +406,6 @@ END_EXTERN_C() /* set or release lock on a stream */ #define PHP_STREAM_OPTION_LOCKING 6 -/* Enable/disable blocking reads on anonymous pipes on Windows. */ -#define PHP_STREAM_OPTION_PIPE_BLOCKING 7 - /* whether or not locking is supported */ #define PHP_STREAM_LOCK_SUPPORTED 1 @@ -438,6 +435,9 @@ END_EXTERN_C() * is still connected; for files, this does not really have meaning */ #define PHP_STREAM_OPTION_CHECK_LIVENESS 12 /* no parameters */ +/* Enable/disable blocking reads on anonymous pipes on Windows. */ +#define PHP_STREAM_OPTION_PIPE_BLOCKING 13 + #define PHP_STREAM_OPTION_RETURN_OK 0 /* option set OK */ #define PHP_STREAM_OPTION_RETURN_ERR -1 /* problem setting option */ #define PHP_STREAM_OPTION_RETURN_NOTIMPL -2 /* underlying stream does not implement; streams can handle it instead */