- Fixed test case 405 to not fail when libcurl is built with GnuTLS

diff --git a/CHANGES b/CHANGES
index 1c6dc19c675e1ac0d5117092fc5ab27be324e816..d66e23ac907086296ba4232e84649c758dd9d388 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,8 @@
                                   Changelog
 
 Daniel S (20 Feb 2008)
+- Fixed test case 405 to not fail when libcurl is built with GnuTLS
+
 - Based on initial work done by Gautam Kachroo to address a bug, we now keep
   better control at the exact state of the connection's SSL status so that we
   know exactly when it has completed the SSL negotiation or not so that there

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 44b31da8c77aa7a210b666e77f4045743cc07993..4993be1fd47358f7321ff87380e6baa97a019e9e 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -28,6 +28,7 @@ This release includes the following bugfixes:
  o when using the multi interface and a handle is removed while still having
    a transfer going on, the connection is now closed by force
  o bad re-use of SSL connections in non-complete state
+ o test case 405 failures with GnuTLS builds
 
 This release includes the following known bugs:
 

diff --git a/tests/data/test405 b/tests/data/test405
index 8560285ac2affc9db0025e09404e5f2a22305dd3..29e7af28e7983dbd54c65f3613905ec7ea0360d9 100644 (file)
--- a/tests/data/test405
+++ b/tests/data/test405
@@ -18,14 +18,17 @@ ftp
 FTPS operation to FTP port
  </name>
  <command>
--k ftps://%HOSTIP:%FTPPORT/path/to/file/405
+-m 5 -k ftps://%HOSTIP:%FTPPORT/path/to/file/405
 </command>
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
+# error code 35 is CURLE_SSL_CONNECT_ERROR
+# GnuTLS seems to not fail on its handshake but instead times out which gives
+# error 28
 <errorcode>
-35
+35,28
 </errorcode>
 </verify>
 </testcase>