Alter the way that SMTP host lists are parsed, fixes PHPMailer#112

changelog.md

@@ -5,6 +5,7 @@
 * Add connection events and new level 3 to debug output options
 * Chinese language update (Thanks to @binaryoung)
 * Allow custom Mailer types (thanks to @michield)
+* Cope with spaces around SMTP host specs
 
 ## Version 5.2.7 (September 12th 2013)
 * Add Ukranian translation from @Krezalis

class.phpmailer.php

@@ -1248,17 +1248,10 @@ public function smtpConnect($options = array())
         $lastexception = null;
 
         foreach ($hosts as $hostentry) {
-            $hostinfo = array();
-            $host = $hostentry;
+            $host = trim($hostentry);
             $port = $this->Port;
-            if (preg_match(
-                '/^(.+):([0-9]+)$/',
-                $hostentry,
-                $hostinfo
-            )
-            ) { //If $hostentry contains 'address:port', override default
-                $host = $hostinfo[1];
-                $port = $hostinfo[2];
+            if (strpos($host, ':') !== false) {
+                list($host, $port) = explode(':', $host);
             }
             if ($this->smtp->connect(($ssl ? 'ssl://' : '') . $host, $port, $this->Timeout, $options)) {
                 try {

test/phpmailerTest.php

@@ -1039,6 +1039,9 @@ public function testSmtpConnect()
         $this->Mail->Host = "localhost:12345;10.10.10.10:54321;" . $_REQUEST['mail_host'];
         $this->assertTrue($this->Mail->smtpConnect(), 'SMTP multi-connect failed');
         $this->Mail->smtpClose();
+        $this->Mail->Host = " localhost:12345 ; " . $_REQUEST['mail_host'] . ' ';
+        $this->assertTrue($this->Mail->smtpConnect(), 'SMTP hosts with stray spaces failed');
+        $this->Mail->smtpClose();
         $this->Mail->Host = $_REQUEST['mail_host'];
         //Need to pick a harmless option so as not cause problems of its own! socket:bind doesn't work with Travis-CI
         $this->assertTrue(