From 5b9d87dfdd217fe38dba12065d5d840b1aecc45e Mon Sep 17 00:00:00 2001
From: Cees-Jan Kiewiet <ceesjank@gmail.com>
Date: Sat, 24 Nov 2018 18:19:31 +0100
Subject: [PATCH] Only close stream when the we reached end of the stream

---
 src/DuplexResourceStream.php                  |  2 +-
 src/ReadableResourceStream.php                |  2 +-
 tests/DuplexResourceStreamIntegrationTest.php | 38 +++++++++++++++++++
 tests/ReadableResourceStreamTest.php          | 19 ++++++++++
 4 files changed, 59 insertions(+), 2 deletions(-)

diff --git a/src/DuplexResourceStream.php b/src/DuplexResourceStream.php
index cf9a894..5f038c6 100644
--- a/src/DuplexResourceStream.php
+++ b/src/DuplexResourceStream.php
@@ -191,7 +191,7 @@ public function handleData($stream)
 
         if ($data !== '') {
             $this->emit('data', array($data));
-        } else{
+        } elseif (\feof($this->stream)) {
             // no data read => we reached the end and close the stream
             $this->emit('end');
             $this->close();
diff --git a/src/ReadableResourceStream.php b/src/ReadableResourceStream.php
index 231739b..461f6e4 100644
--- a/src/ReadableResourceStream.php
+++ b/src/ReadableResourceStream.php
@@ -144,7 +144,7 @@ public function handleData()
 
         if ($data !== '') {
             $this->emit('data', array($data));
-        } else{
+        } elseif (\feof($this->stream)) {
             // no data read => we reached the end and close the stream
             $this->emit('end');
             $this->close();
diff --git a/tests/DuplexResourceStreamIntegrationTest.php b/tests/DuplexResourceStreamIntegrationTest.php
index fb5f02a..7135e15 100644
--- a/tests/DuplexResourceStreamIntegrationTest.php
+++ b/tests/DuplexResourceStreamIntegrationTest.php
@@ -2,6 +2,7 @@
 
 namespace React\Tests\Stream;
 
+use Clue\StreamFilter as Filter;
 use React\Stream\DuplexResourceStream;
 use React\Stream\ReadableResourceStream;
 use React\EventLoop\ExtEventLoop;
@@ -342,6 +343,43 @@ public function testReadsNothingFromProcessPipeWithNoOutput($condition, $loopFac
         $loop->run();
     }
 
+    /**
+     * @covers React\Stream\ReadableResourceStream::handleData
+     * @dataProvider loopProvider
+     */
+    public function testEmptyReadShouldntFcloseStream($condition, $loopFactory)
+    {
+        if (true !== $condition()) {
+            return $this->markTestSkipped('Loop implementation not available');
+        }
+
+        $server = stream_socket_server('tcp://127.0.0.1:0');
+
+        $client = stream_socket_client(stream_socket_get_name($server, false));
+        $stream = stream_socket_accept($server);
+
+
+        // add a filter which returns an error when encountering an 'a' when reading
+        Filter\append($stream, function ($chunk) {
+            return '';
+        }, STREAM_FILTER_READ);
+
+        $loop = $loopFactory();
+
+        $conn = new DuplexResourceStream($stream, $loop);
+        $conn->on('error', $this->expectCallableNever());
+        $conn->on('data', $this->expectCallableNever());
+        $conn->on('end', $this->expectCallableNever());
+
+        fwrite($client, "foobar\n");
+
+        $conn->handleData($stream);
+
+        fclose($stream);
+        fclose($client);
+        fclose($server);
+    }
+
     private function loopTick(LoopInterface $loop)
     {
         $loop->addTimer(0, function () use ($loop) {
diff --git a/tests/ReadableResourceStreamTest.php b/tests/ReadableResourceStreamTest.php
index 20da96f..7566f92 100644
--- a/tests/ReadableResourceStreamTest.php
+++ b/tests/ReadableResourceStreamTest.php
@@ -365,6 +365,25 @@ public function testDataErrorShouldEmitErrorAndClose()
         $conn->handleData($stream);
     }
 
+    /**
+     * @covers React\Stream\ReadableResourceStream::handleData
+     */
+    public function testEmptyReadShouldntFcloseStream()
+    {
+        list($stream, $_) = stream_socket_pair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, 0);
+        $loop = $this->createLoopMock();
+
+        $conn = new ReadableResourceStream($stream, $loop);
+        $conn->on('error', $this->expectCallableNever());
+        $conn->on('data', $this->expectCallableNever());
+        $conn->on('end', $this->expectCallableNever());
+
+        $conn->handleData();
+
+        fclose($stream);
+        fclose($_);
+    }
+
     private function createLoopMock()
     {
         return $this->getMockBuilder('React\EventLoop\LoopInterface')->getMock();