[Hastymail-cvs] SF.net SVN: hastymail:[2040] trunk/hastymail2/lib/smtp_class.php

[<sai...@us...>]

Revision: 2040
          http://hastymail.svn.sourceforge.net/hastymail/?rev=2040&view=rev
Author:   sailfrog
Date:     2012-01-30 18:11:10 +0000 (Mon, 30 Jan 2012)
Log Message:
-----------
SMTP servers don't seem to care for ports appended to hostnames in the
EHLO command (MS exchange at least).

Modified Paths:
--------------
    trunk/hastymail2/lib/smtp_class.php

Modified: trunk/hastymail2/lib/smtp_class.php
===================================================================
--- trunk/hastymail2/lib/smtp_class.php	2012-01-17 03:47:27 UTC (rev 2039)
+++ trunk/hastymail2/lib/smtp_class.php	2012-01-30 18:11:10 UTC (rev 2040)
@@ -48,6 +48,10 @@
     function smtp() {
         global $conf;
         $this->hostname = $conf['host_name'];
+        /* SMTP servers (exchange at least) don't like port numbers in the EHLO hostname */
+        if (preg_match("/:\d+$/", $this->hostname)) {
+            $this->hostname = substr($this->hostname, 0, strpos($this->hostname, ':'));
+        }
         $this->debug = array();
         if (isset($conf['smtp_server'])) {
             $this->server = $conf['smtp_server'];

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.