Don't block when SMTP server quits.

Port changes from #10227 to 3.x
cakephp · Feb 16, 2017 · 988dd17 · 988dd17
1 parent 2411728
commit 988dd17
Show file tree

Hide file tree

Showing 2 changed files with 125 additions and 158 deletions.
diff --git a/src/Mailer/Transport/SmtpTransport.php b/src/Mailer/Transport/SmtpTransport.php
@@ -433,7 +433,11 @@ protected function _smtpSend($data, $checkCode = '250')
             $response = '';
             $startTime = time();
             while (substr($response, -2) !== "\r\n" && ((time() - $startTime) < $timeout)) {
-                $response .= $this->_socket->read();
+                $bytes = $this->_socket->read();
+                if ($bytes === false || $bytes === null) {
+                    break;
+                }
+                $response .= $bytes;
             }
             if (substr($response, -2) !== "\r\n") {
                 throw new SocketException('SMTP timeout.');