merge back from stable, rfc2821 fix. Fall back to HELO if EHLO is not

supported.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@7206 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/class/deliver/Deliver_SMTP.class.php b/class/deliver/Deliver_SMTP.class.php
index f2e980ee6fbddcec4848571cd115d406d2223911..1aecdfab566c0cdd6c54204fbfbd38a1bac4b6a8 100644 (file)
--- a/class/deliver/Deliver_SMTP.class.php
+++ b/class/deliver/Deliver_SMTP.class.php
@@ -85,7 +85,16 @@ class Deliver_SMTP extends Deliver {
         fputs($stream, "EHLO $helohost\r\n");
         $tmp = fgets($stream,1024);
         if ($this->errorCheck($tmp,$stream)) {
-            return(0);
+            // fall back to HELO if EHLO is not supported
+            if ($this->dlv_ret_no == '500') {
+                fputs($stream, "HELO $helohost\r\n");
+                $tmp = fgets($stream,1024);
+                if ($this->errorCheck($tmp,$stream)) {
+                    return(0);
+                }
+            } else {
+                return(0);
+            }
         }
     
         if (( $smtp_auth_mech == 'cram-md5') or ( $smtp_auth_mech == 'digest-md5' )) {