Fix closing of gif stream

reactphp-legacy · Nov 3, 2012 · 47e8f26 · 47e8f26
1 parent f76803e
commit 47e8f26
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/React/Gifsocket/GifStream.php b/src/React/Gifsocket/GifStream.php
@@ -38,7 +38,11 @@ public function resume()
 
     public function close()
     {
-        $data = $this->finish();
+        if ($this->closed) {
+            return;
+        }
+
+        $data = $this->encoder->finish();
         $this->emit('data', [$data]);
 
         $this->closed = true;

diff --git a/src/React/Gifsocket/Server.php b/src/React/Gifsocket/Server.php
@@ -41,8 +41,13 @@ public function __invoke($request, $response)
         $gif->pipe($response);
 
         $this->gifStreams->attach($gif);
-        $request->on('close',
-            Curry::bind([$this->gifStreams, 'detach'], $gif));
+
+        $response->on('close', function () use ($gif) {
+            echo "response:close\n";
+
+            $this->gifStreams->detach($gif);
+            $gif->close();
+        });
     }
 
     public function resendFrame(GifStream $gif, $frame)