Log message for revision 108731: Fall back to HELO when EHLO (an optional extension) fails
Changed: U Zope/branches/2.12/doc/CHANGES.rst U Zope/branches/2.12/src/Products/MailHost/mailer.py -=- Modified: Zope/branches/2.12/doc/CHANGES.rst =================================================================== --- Zope/branches/2.12/doc/CHANGES.rst 2010-02-03 09:07:14 UTC (rev 108730) +++ Zope/branches/2.12/doc/CHANGES.rst 2010-02-03 14:07:58 UTC (rev 108731) @@ -5,6 +5,14 @@ Change information for previous versions of Zope can be found in the file HISTORY.txt. +Zope 2.12.4 (Unreleased) +------------------------ + +Bugs Fixed +++++++++++ + +- MailHost should fall back to HELO when EHLO fails. + Zope 2.12.3 (2010/01/12) ------------------------ Modified: Zope/branches/2.12/src/Products/MailHost/mailer.py =================================================================== --- Zope/branches/2.12/src/Products/MailHost/mailer.py 2010-02-03 09:07:14 UTC (rev 108730) +++ Zope/branches/2.12/src/Products/MailHost/mailer.py 2010-02-03 14:07:58 UTC (rev 108731) @@ -49,8 +49,10 @@ # send EHLO code, response = connection.ehlo() if code < 200 or code >300: - raise RuntimeError('Error sending EHLO to the SMTP server ' - '(code=%s, response=%s)' % (code, response)) + code, response = connection.helo() + if code < 200 or code >300: + raise RuntimeError('Error sending HELO to the SMTP server ' + '(code=%s, response=%s)' % (code, response)) # encryption support have_tls = connection.has_extn('starttls') _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org https://mail.zope.org/mailman/listinfo/zope-checkins