diff options
author | Patrick Monnerat <Patrick.Monnerat@datasphere.ch> | 2010-02-22 12:41:02 +0000 |
---|---|---|
committer | Patrick Monnerat <Patrick.Monnerat@datasphere.ch> | 2010-02-22 12:41:02 +0000 |
commit | 338553eda38a7ed163f935e28461eeda6dde294f (patch) | |
tree | 62e46e9a2580449f181c6933fa580d37443c4098 /tests | |
parent | 2abcd132f832cbd1f3a476e655f47b6a02862db3 (diff) | |
download | curl-338553eda38a7ed163f935e28461eeda6dde294f.tar.gz |
- 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.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/data/DISABLED | 1 | ||||
-rw-r--r-- | tests/data/Makefile.am | 2 | ||||
-rw-r--r-- | tests/data/test804 | 59 |
3 files changed, 61 insertions, 1 deletions
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 @@ +<testcase>
+<info>
+<keywords>
+SMTP
+SMTP HELO
+RFC821
+</keywords>
+</info>
+
+#
+# Server-side
+<reply>
+<servercmd>
+REPLY EHLO 500 Command unrecognized
+REPLY HELO 250 Already old but still servicing...
+</servercmd>
+</reply>
+
+#
+# Client-side
+<client>
+<server>
+smtp
+</server>
+ <name>
+RFC821-only SMTP server (EHLO not supported)
+ </name>
+<stdin>
+From: different
+To: another
+
+body
+</stdin>
+ <command>
+smtp://%HOSTIP:%SMTPPORT/user --mail-rcpt 804@foo --mail-from 804@from -T -
+</command>
+</client>
+
+#
+# Verify data after the test has been "shot"
+<verify>
+<protocol>
+EHLO user
+HELO user
+MAIL FROM:804@from
+RCPT TO:<804@foo>
+DATA
+QUIT
+</protocol>
+<upload>
+From: different
+To: another
+
+body
+
+.
+</upload>
+</verify>
+</testcase>
|