Move legacy buffer work-around to Connection constructor

Author: clue

README.md

@@ -1237,8 +1237,11 @@ options as described above.
 All versions of PHP prior to 5.6.8 suffered from a buffering issue where reading
 from a streaming TLS connection could be one `data` event behind.
 This library implements a work-around to try to flush the complete incoming
-data buffers on these versions, but we have seen reports of people saying this
-could still affect some older versions (`5.5.23`, `5.6.7`, and `5.6.8`).
+data buffers on these legacy PHP versions, which has a penalty of around 10% of
+throughput on all connections.
+With this work-around, we have not been able to reproduce this issue anymore,
+but we have seen reports of people saying this could still affect some of the
+older PHP versions (`5.5.23`, `5.6.7`, and `5.6.8`).
 Note that this only affects *some* higher-level streaming protocols, such as
 IRC over TLS, but should not affect HTTP over TLS (HTTPS).
 Further investigation of this issue is needed.

src/Connection.php

@@ -3,6 +3,7 @@
 namespace React\Socket;
 
 use React\Stream\Stream;
+use React\EventLoop\LoopInterface;
 
 /**
  * The actual connection implementation for ConnectionInterface
@@ -24,6 +25,22 @@ class Connection extends Stream implements ConnectionInterface
      */
     public $encryptionEnabled = false;
 
+    public function __construct($stream, LoopInterface $loop)
+    {
+        parent::__construct($stream, $loop);
+
+        // PHP < 5.6.8 suffers from a buffer indicator bug on secure TLS connections
+        // as a work-around we always read the complete buffer until its end.
+        // The buffer size is limited due to TCP/IP buffers anyway, so this
+        // should not affect usage otherwise.
+        // See https://bugs.php.net/bug.php?id=65137
+        // https://bugs.php.net/bug.php?id=41631
+        // https://github.com/reactphp/socket-client/issues/24
+        if (version_compare(PHP_VERSION, '5.6.8', '<')) {
+            $this->bufferSize = null;
+        }
+    }
+
     public function handleClose()
     {
         if (!is_resource($this->stream)) {

src/StreamEncryption.php

@@ -21,22 +21,11 @@ class StreamEncryption
     private $errstr;
     private $errno;
 
-    private $wrapSecure = false;
-
     public function __construct(LoopInterface $loop, $server = true)
     {
         $this->loop = $loop;
         $this->server = $server;
 
-        // See https://bugs.php.net/bug.php?id=65137
-        // https://bugs.php.net/bug.php?id=41631
-        // https://github.com/reactphp/socket-client/issues/24
-        // On versions affected by this bug we need to fread the stream until we
-        //  get an empty string back because the buffer indicator could be wrong
-        if (version_compare(PHP_VERSION, '5.6.8', '<')) {
-            $this->wrapSecure = true;
-        }
-
         if ($server) {
             $this->method = STREAM_CRYPTO_METHOD_TLS_SERVER;
 
@@ -100,16 +89,11 @@ public function toggle(Connection $stream, $toggle)
             $toggleCrypto();
         }
 
-        $wrap = $this->wrapSecure && $toggle;
         $loop = $this->loop;
 
-        return $deferred->promise()->then(function () use ($stream, $socket, $wrap, $loop, $toggle) {
+        return $deferred->promise()->then(function () use ($stream, $socket, $loop, $toggle) {
             $loop->removeReadStream($socket);
 
-            if ($wrap) {
-                $stream->bufferSize = null;
-            }
-
             $stream->encryptionEnabled = $toggle;
             $stream->resume();