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.
This commit is contained in:
Anatol Belski 2016-08-17 00:53:15 +02:00
parent f18f394386
commit 6de67244d4

View File

@ -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 */