Lots of users on Windows have reported getting the "SSL: couldn't set

callback" error message so I've now made the setting of that callback not be
as critical as before. The function is only used for additional loggging/
trace anyway so a failure just means slightly less data. It should still be
able to proceed and connect fine to the server.

diff --git a/CHANGES b/CHANGES
index 9f6e54a..a41ae9b 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,13 @@
 
                                   Changelog
 
+Daniel (6 March 2006)
+- Lots of users on Windows have reported getting the "SSL: couldn't set
+  callback" error message so I've now made the setting of that callback not be
+  as critical as before. The function is only used for additional loggging/
+  trace anyway so a failure just means slightly less data. It should still be
+  able to proceed and connect fine to the server.
+
 Daniel (4 March 2006)
 - Thomas Klausner provided a patch written by Todd Vierling in bug report
   #1442471 that fixes a build problem on Interix.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index a464efb..c0fc161 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -15,12 +15,14 @@ This release includes the following changes:
 
 This release includes the following bugfixes:
 
+ o "SSL: couldn't set callback" is now a less serious problem
  o Interix build fix
  o fixed "hang" when out of file handles at start
+ o prevent FTP uploads to URLs with trailing slash
 
 Other curl-related news since the previous public release:
 
- o 
+ o pycurl-7.15.2 has been released: http://pycurl.sf.net
 
 This release would not have looked like this without help, code, reports and
 advice from friends like these:

diff --git a/lib/ssluse.c b/lib/ssluse.c
index fdc540e..046003c 100644 (file)
--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2005, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2006, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -1167,15 +1167,15 @@ Curl_ossl_connect(struct connectdata *conn,
 
 #ifdef SSL_CTRL_SET_MSG_CALLBACK
   if (data->set.fdebug) {
+    /* the SSL trace callback is only used for verbose logging so we only
+       inform about failures of setting it */
     if (!SSL_CTX_callback_ctrl(connssl->ctx, SSL_CTRL_SET_MSG_CALLBACK,
                                (void (*)(void))ssl_tls_trace)) {
-      failf(data, "SSL: couldn't set callback!");
-      return CURLE_SSL_CONNECT_ERROR;
+      infof(data, "SSL: couldn't set callback!");
     }
-
-    if (!SSL_CTX_ctrl(connssl->ctx, SSL_CTRL_SET_MSG_CALLBACK_ARG, 0, conn)) {
-      failf(data, "SSL: couldn't set callback argument!");
-      return CURLE_SSL_CONNECT_ERROR;
+    else if (!SSL_CTX_ctrl(connssl->ctx, SSL_CTRL_SET_MSG_CALLBACK_ARG, 0,
+                           conn)) {
+      infof(data, "SSL: couldn't set callback argument!");
     }
   }
 #endif