Merge branch 'fix-eventloop-read-end' of https://github.com/clue/react into clue-fix-eventloop-read-end

cboden · cboden · commit f1e7f9aaf890 · 2013-07-08T16:51:00.000-04:00
diff --git a/src/React/EventLoop/StreamSelectLoop.php b/src/React/EventLoop/StreamSelectLoop.php
@@ -137,6 +137,10 @@ protected function runStreamSelect()
         if (stream_select($read, $write, $except, 0, $this->getNextEventTimeInMicroSeconds()) > 0) {
             if ($read) {
                 foreach ($read as $stream) {
+                    if (!isset($this->readListeners[(int) $stream])) {
+                        continue;
+                    }
+
                     $listener = $this->readListeners[(int) $stream];
                     call_user_func($listener, $stream, $this);
                 }
diff --git a/tests/React/Tests/EventLoop/AbstractLoopTest.php b/tests/React/Tests/EventLoop/AbstractLoopTest.php
@@ -167,6 +167,27 @@ public function stopShouldStopRunningLoop()
         $this->assertRunFasterThan(0.005);
     }
 
+    public function testIgnoreRemovedCallback()
+    {
+        $stream1 = fopen('php://temp', 'r+');
+        $stream2 = fopen('php://temp', 'r+');
+        // two independant streams, both should be readable right away
+
+        $loop = $this->loop;
+        $loop->addReadStream($stream1, function ($stream) use ($loop, $stream2) {
+            // stream1 is readable, remove stream2 as well => this will invalidate its callback
+            $loop->removeReadStream($stream);
+            $loop->removeReadStream($stream2);
+        });
+        $loop->addReadStream($stream2, function ($stream) use ($loop, $stream1) {
+            // this callback would have to be called as well, but the first stream already removed us
+            $loop->removeReadStream($stream);
+            $loop->removeReadStream($stream1);
+        });
+
+        $loop->run();
+    }
+
     private function assertRunFasterThan($maxInterval)
     {
         $start = microtime(true);
