From 338553eda38a7ed163f935e28461eeda6dde294f Mon Sep 17 00:00:00 2001 From: Patrick Monnerat Date: Mon, 22 Feb 2010 12:41:02 +0000 Subject: - Proper handling of STARTTLS on SMTP, taking CURLUSESSL_TRY into account. - SMTP falls back to RFC821 HELO when EHLO fails (and SSL is not required). - Use of true local host name (i.e.: via gethostname()) when available, as default argument to SMTP HELO/EHLO. - Test case 804 for HELO fallback. --- tests/data/DISABLED | 1 + tests/data/Makefile.am | 2 +- tests/data/test804 | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 tests/data/test804 (limited to 'tests') diff --git a/tests/data/DISABLED b/tests/data/DISABLED index c65cdd90b..24bc532c2 100644 --- a/tests/data/DISABLED +++ b/tests/data/DISABLED @@ -7,3 +7,4 @@ 564 802 803 +804 diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index 0a9ac547c..1878e013c 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -65,7 +65,7 @@ EXTRA_DIST = test1 test108 test117 test127 test20 test27 test34 test46 \ test564 test1101 test1102 test1103 test1104 test299 test310 test311 \ test312 test1105 test565 test800 test1106 test801 test566 test802 test803 \ test1107 test1108 test1109 test1110 test1111 test1112 test129 test567 \ - test568 test569 test570 test571 + test568 test569 test570 test571 test804 filecheck: @mkdir test-place; \ diff --git a/tests/data/test804 b/tests/data/test804 new file mode 100644 index 000000000..e1fc419e9 --- /dev/null +++ b/tests/data/test804 @@ -0,0 +1,59 @@ + + + +SMTP +SMTP HELO +RFC821 + + + +# +# Server-side + + +REPLY EHLO 500 Command unrecognized +REPLY HELO 250 Already old but still servicing... + + + +# +# Client-side + + +smtp + + +RFC821-only SMTP server (EHLO not supported) + + +From: different +To: another + +body + + +smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 804@foo --mail-from 804@from -T - + + + +# +# Verify data after the test has been "shot" + + +EHLO user +HELO user +MAIL FROM:804@from +RCPT TO:<804@foo> +DATA +QUIT + + +From: different +To: another + +body + +. + + + -- cgit v1.2.3