[5.1] Yet another attempt to fix Swift Mailer related SSL failures (Issue #4573)

src/Illuminate/Mail/Mailer.php

@@ -156,8 +156,6 @@ public function plain($view, array $data, $callback)
      */
     public function send($view, array $data, $callback)
     {
-        $this->forceReconnection();
-
         // First we need to parse the view, which could either be a string or an array
         // containing both an HTML and plain text versions of the view which should
         // be used when sending an e-mail. We will extract both of them out here.
@@ -303,18 +301,6 @@ protected function getQueuedCallable(array $data)
         return $data['callback'];
     }
 
-    /**
-     * Force the transport to re-connect.
-     *
-     * This will prevent errors in daemon queue situations.
-     *
-     * @return void
-     */
-    protected function forceReconnection()
-    {
-        $this->getSwiftMailer()->getTransport()->stop();
-    }
-
     /**
      * Add the content to a given message.
      *
@@ -392,7 +378,10 @@ protected function sendSwiftMessage($message)
         }
 
         if (! $this->pretending) {
-            return $this->swift->send($message, $this->failedRecipients);
+            $result = $this->getSwiftMailer()->send($message, $this->failedRecipients);
+            $this->getSwiftMailer()->getTransport()->stop();
+
+            return $result;
         } elseif (isset($this->logger)) {
             $this->logMessage($message);
         }