Merge branch 'refs/heads/0.3' into 0.4

cboden · cboden · commit 960e6a9bd7f4 · 2014-03-30T13:19:02.000-04:00
Conflicts:
	CHANGELOG.md
	src/Stream/Buffer.php
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+### 0.3.4 (2014-03-30)
+
+  * Bug fix: [Stream] Fixed 100% CPU spike from non-empty write buffer on closed stream
+  * Buf fix: [Socket] Reset socket to non-blocking after shutting down (PHP bug)
+
 ### 0.4.0 (2014-02-02)
 
   * Feature: Added ChildProcess to run async child processes within the event loop (@jmikola)
diff --git a/src/Socket/Connection.php b/src/Socket/Connection.php
@@ -21,7 +21,9 @@ public function handleData($stream)
     public function handleClose()
     {
         if (is_resource($this->stream)) {
+            // http://chat.stackoverflow.com/transcript/message/7727858#7727858
             stream_socket_shutdown($this->stream, STREAM_SHUT_RDWR);
+            stream_set_blocking($this->stream, false);
             fclose($this->stream);
         }
     }
diff --git a/src/Stream/Buffer.php b/src/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.'), $this));
+        if (!is_resource($this->stream)) {
+            $this->emit('error', array(new \RuntimeException('Tried to write to invalid stream.'), $this));
 
             return;
         }
@@ -110,6 +104,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', [$this]);
diff --git a/tests/Stream/BufferTest.php b/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()

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,9 @@ public function handleData($stream)`
`21`	`21`	`public function handleClose()`
`22`	`22`	`{`
`23`	`23`	`if (is_resource($this->stream)) {`
	`24`	`+ // http://chat.stackoverflow.com/transcript/message/7727858#7727858`
`24`	`25`	`stream_socket_shutdown($this->stream, STREAM_SHUT_RDWR);`
	`26`	`+ stream_set_blocking($this->stream, false);`
`25`	`27`	`fclose($this->stream);`
`26`	`28`	`}`
`27`	`29`	`}`