Merge pull request #91 from clue-labs/hhvm

WyriHaximus · web-flow · commit 668a5bfe3019 · 2017-04-10T20:29:02.000+02:00
Ignore HHVM errors when closing connection that is already closing
diff --git a/src/Connection.php b/src/Connection.php
@@ -20,8 +20,11 @@ public function handleClose()
             return;
         }
 
-        // http://chat.stackoverflow.com/transcript/message/7727858#7727858
-        stream_socket_shutdown($this->stream, STREAM_SHUT_RDWR);
+        // Try to cleanly shut down socket and ignore any errors in case other
+        // side already closed. Shutting down may return to blocking mode on
+        // some legacy versions, so reset to non-blocking just in case before
+        // continuing to close the socket resource.
+        @stream_socket_shutdown($this->stream, STREAM_SHUT_RDWR);
         stream_set_blocking($this->stream, false);
         fclose($this->stream);
     }
diff --git a/tests/IntegrationTest.php b/tests/IntegrationTest.php
@@ -81,6 +81,24 @@ public function gettingEncryptedStuffFromGoogleShouldWorkIfHostIsResolvedFirst()
         $this->assertRegExp('#^HTTP/1\.0#', $response);
     }
 
+    /** @test */
+    public function gettingPlaintextStuffFromEncryptedGoogleShouldNotWork()
+    {
+        $loop = new StreamSelectLoop();
+        $connector = new Connector($loop);
+
+        $conn = Block\await($connector->connect('google.com:443'), $loop);
+
+        $this->assertContains(':443', $conn->getRemoteAddress());
+        $this->assertNotEquals('google.com:443', $conn->getRemoteAddress());
+
+        $conn->write("GET / HTTP/1.0\r\n\r\n");
+
+        $response = Block\await(BufferedSink::createPromise($conn), $loop, self::TIMEOUT);
+
+        $this->assertNotRegExp('#^HTTP/1\.0#', $response);
+    }
+
     /** @test */
     public function testConnectingFailsIfDnsUsesInvalidResolver()
     {

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,11 @@ public function handleClose()`
`20`	`20`	`return;`
`21`	`21`	`}`
`22`	`22`
`23`		`- // http://chat.stackoverflow.com/transcript/message/7727858#7727858`
`24`		`- stream_socket_shutdown($this->stream, STREAM_SHUT_RDWR);`
	`23`	`+ // Try to cleanly shut down socket and ignore any errors in case other`
	`24`	`+ // side already closed. Shutting down may return to blocking mode on`
	`25`	`+ // some legacy versions, so reset to non-blocking just in case before`
	`26`	`+ // continuing to close the socket resource.`
	`27`	`+ @stream_socket_shutdown($this->stream, STREAM_SHUT_RDWR);`
`25`	`28`	`stream_set_blocking($this->stream, false);`
`26`	`29`	`fclose($this->stream);`
`27`	`30`	`}`