Merge branch 'set-connection-timeout-for-mail-transports' of https://…

…github.com/RTLer/framework into RTLer-set-connection-timeout-for-mail-transports

src/Illuminate/Mail/TransportManager.php

@@ -101,7 +101,7 @@ protected function createMailgunDriver()
         $config = $this->app['config']->get('services.mailgun', []);
 
         return new MailgunTransport(
-            new HttpClient(Arr::get($config, 'guzzle', [])),
+            $this->getHttpClient($config),
             $config['secret'], $config['domain']
         );
     }
@@ -116,7 +116,7 @@ protected function createMandrillDriver()
         $config = $this->app['config']->get('services.mandrill', []);
 
         return new MandrillTransport(
-            new HttpClient(Arr::get($config, 'guzzle', [])), $config['secret']
+            $this->getHttpClient($config), $config['secret']
         );
     }
 
@@ -130,7 +130,7 @@ protected function createSparkPostDriver()
         $config = $this->app['config']->get('services.sparkpost', []);
 
         return new SparkPostTransport(
-            new HttpClient(Arr::get($config, 'guzzle', [])), $config['secret']
+            $this->getHttpClient($config), $config['secret']
         );
     }
 
@@ -164,4 +164,19 @@ public function setDefaultDriver($name)
     {
         $this->app['config']['mail.driver'] = $name;
     }
+
+    /**
+     * get configured http client.
+     * @param $config
+     * @return HttpClient
+     */
+    protected function getHttpClient($config)
+    {
+        $guzzleConfig = Arr::get($config, 'guzzle', []);
+
+        // add default config for timeout
+        $guzzleConfig = Arr::add($guzzleConfig, 'connect_timeout', 60);
+
+        return new HttpClient($guzzleConfig);
+    }
 }