From: Arnaud Le Blanc <lbarnaud@php.net>
Date: Tue, 4 Nov 2008 16:46:03 +0000 (+0000)
Subject: MDH: Avoids fclose() from complaining that stream_socket_pair() streams
X-Git-Tag: BEFORE_NS_RULES_CHANGE~100
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=55ccadecbe635d5dfc015f1e07388e2cdd35dc2a;p=php

MDH: Avoids fclose() from complaining that stream_socket_pair() streams
have not been closed
---

diff --git a/ext/standard/streamsfuncs.c b/ext/standard/streamsfuncs.c
index 1726675efe..6384478a6e 100644
--- a/ext/standard/streamsfuncs.c
+++ b/ext/standard/streamsfuncs.c
@@ -69,6 +69,11 @@ PHP_FUNCTION(stream_socket_pair)
 	s1 = php_stream_sock_open_from_socket(pair[0], 0);
 	s2 = php_stream_sock_open_from_socket(pair[1], 0);
 
+	/* set the __exposed flag. 
+	 * php_stream_to_zval() does, add_next_index_resource() does not */
+	php_stream_auto_cleanup(s1);
+	php_stream_auto_cleanup(s2);
+
 	add_next_index_resource(return_value, php_stream_get_resource_id(s1));
 	add_next_index_resource(return_value, php_stream_get_resource_id(s2));
 }
diff --git a/ext/standard/tests/streams/stream_socket_pair.phpt b/ext/standard/tests/streams/stream_socket_pair.phpt
new file mode 100644
index 0000000000..5556d8e22c
--- /dev/null
+++ b/ext/standard/tests/streams/stream_socket_pair.phpt
@@ -0,0 +1,22 @@
+--TEST--
+stream_socket_pair()
+--SKIPIF--
+<?php
+if (substr(PHP_OS, 0, 3) == 'WIN') die("skip: non windows test");
+?>
+--FILE--
+<?php
+$sockets = stream_socket_pair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, 0);
+var_dump($sockets);
+fwrite($sockets[0], b"foo");
+var_dump(fread($sockets[1], strlen(b"foo")));
+fclose($sockets[0]);
+?>
+--EXPECTF--
+array(2) {
+  [0]=>
+  resource(%d) of type (stream)
+  [1]=>
+  resource(%d) of type (stream)
+}
+string(3) "foo"