summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2016-08-17 00:58:54 +0200
committerAnatol Belski <ab@php.net>2016-08-17 00:58:54 +0200
commitabc7d1f14072b841a845a60de38f72e5fcf602cc (patch)
tree8e454d6c53512ee64451603a83b606143ecfeef0
parent620bb201c49479dea32dedca9323ed76474bfdcf (diff)
parent20f76efb78b1fbe7b9af505ce2995436516e473a (diff)
downloadphp-git-abc7d1f14072b841a845a60de38f72e5fcf602cc.tar.gz
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0: fix test fix blocking pipe stream option value
-rw-r--r--ext/standard/tests/streams/bug72857.phpt2
-rw-r--r--main/php_streams.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/standard/tests/streams/bug72857.phpt b/ext/standard/tests/streams/bug72857.phpt
index fdf0ff1dc6..97d145b595 100644
--- a/ext/standard/tests/streams/bug72857.phpt
+++ b/ext/standard/tests/streams/bug72857.phpt
@@ -15,6 +15,6 @@ Bug #72857 stream_socket_recvfrom read access violation
?>
==DONE==
--EXPECT--
-string(0) ""
+bool(false)
NULL
==DONE==
diff --git a/main/php_streams.h b/main/php_streams.h
index cd5319ca22..5da29a2f4f 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 */