Merge branch 'refs/heads/0.3-buffer-fix' into 0.3

cboden · cboden · commit b46e8e697917 · 2014-03-21T08:42:25.000-04:00
diff --git a/src/React/Stream/Buffer.php b/src/React/Stream/Buffer.php
@@ -4,7 +4,6 @@
 
 use Evenement\EventEmitter;
 use React\EventLoop\LoopInterface;
-use React\Stream\WritableStreamInterface;
 
 /** @event full-drain */
 class Buffer extends EventEmitter implements WritableStreamInterface
@@ -21,16 +20,11 @@ class Buffer extends EventEmitter implements WritableStreamInterface
         'file'    => '',
         'line'    => 0,
     );
-    private $meta;
 
     public function __construct($stream, LoopInterface $loop)
     {
         $this->stream = $stream;
         $this->loop = $loop;
-
-        if (is_resource($stream)) {
-            $this->meta = stream_get_meta_data($stream);
-        }
     }
 
     public function isWritable()
@@ -83,8 +77,8 @@ public function close()
 
     public function handleWrite()
     {
-        if (!is_resource($this->stream) || ('generic_socket' === $this->meta['stream_type'] && feof($this->stream))) {
-            $this->emit('error', array(new \RuntimeException('Tried to write to closed or invalid stream.')));
+        if (!is_resource($this->stream)) {
+            $this->emit('error', array(new \RuntimeException('Tried to write to invalid stream.'), $this));
 
             return;
         }
@@ -107,6 +101,12 @@ public function handleWrite()
             return;
         }
 
+        if (0 === $sent && feof($this->stream)) {
+            $this->emit('error', array(new \RuntimeException('Tried to write to closed stream.'), $this));
+
+            return;
+        }
+
         $len = strlen($this->data);
         if ($len >= $this->softLimit && $len - $sent < $this->softLimit) {
             $this->emit('drain');
diff --git a/tests/React/Tests/Stream/BufferTest.php b/tests/React/Tests/Stream/BufferTest.php
@@ -184,7 +184,32 @@ public function testError()
 
         $buffer->write('Attempting to write to bad stream');
         $this->assertInstanceOf('Exception', $error);
-        $this->assertSame('Tried to write to closed or invalid stream.', $error->getMessage());
+        $this->assertSame('Tried to write to invalid stream.', $error->getMessage());
+    }
+
+    public function testWritingToClosedStream()
+    {
+        if ('Darwin' === PHP_OS) {
+            $this->markTestSkipped('OS X issue with shutting down pair for writing');
+        }
+
+        list($a, $b) = stream_socket_pair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, STREAM_IPPROTO_IP);
+        $loop = $this->createWriteableLoopMock();
+
+        $error = null;
+
+        $buffer = new Buffer($a, $loop);
+        $buffer->on('error', function($message) use (&$error) {
+            $error = $message;
+        });
+
+        $buffer->write('foo');
+        stream_socket_shutdown($b, STREAM_SHUT_RD);
+        stream_socket_shutdown($a, STREAM_SHUT_RD);
+        $buffer->write('bar');
+
+        $this->assertInstanceOf('Exception', $error);
+        $this->assertSame('Tried to write to closed stream.', $error->getMessage());
     }
 
     private function createWriteableLoopMock()
