Fix borked v3.0.7 release with null pointer access

amphp · Oct 9, 2017 · 252eb90 · 252eb90
1 parent 1898018
commit 252eb90
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Changelog
 
-## 3.0.7
+## 3.0.8
+
+ - Fixed null pointer access in response handling completely breaking the client.
+
+## 3.0.7 [ borked ]
 
  - Clean references correctly, so unused bodies aren't consumed and the connection is closed.
 

diff --git a/lib/DefaultClient.php b/lib/DefaultClient.php
@@ -250,6 +250,7 @@ private function doRead(RequestCycle $requestCycle, ClientSocket $socket): \Gene
                 $parseResult["headers"] = \array_change_key_case($parseResult["headers"], \CASE_LOWER);
 
                 $response = $this->finalizeResponse($requestCycle, $parseResult, $connectionInfo);
+                $shouldCloseSocketAfterResponse = $this->shouldCloseSocketAfterResponse($response);
 
                 if ($requestCycle->deferred) {
                     $deferred = $requestCycle->deferred;
@@ -293,7 +294,7 @@ private function doRead(RequestCycle $requestCycle, ClientSocket $socket): \Gene
                     }
                 }
 
-                if ($this->shouldCloseSocketAfterResponse($response)) {
+                if ($shouldCloseSocketAfterResponse) {
                     $this->socketPool->clear($socket);
                     $socket->close();
                 } else {