com php-src: fix blocking pipe stream option value: main/php_streams.h
| From: | Anatol Belski | Date: | Tue, 16 Aug 2016 22:53:15 +0000 |
| Subject: | com php-src: fix blocking pipe stream option value: main/php_streams.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-93811@lists.php.net to get a copy of this message | ||
Commit: 6de67244d40f43fbbc7d019cfccf8c3537a3ee31
Author: Anatol Belski <ab@php.net> Wed, 17 Aug 2016 00:53:15 +0200
Parents: f18f394386a931d936d8d7dcc09a9be253d631d2
Branches: PHP-7.0 PHP-7.1 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=6de67244d40f43fbbc7d019cfccf8c3537a3ee31
Log:
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.
Bugs:
https://bugs.php.net/72857
Changed paths:
M main/php_streams.h
Diff:
diff --git a/main/php_streams.h b/main/php_streams.h
index cd5319c..5da29a2 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 */