diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2006-03-06 22:35:51 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2006-03-06 22:35:51 +0000 |
| commit | 8bba99ae56ec15b12daf7f7c851cc178f69e749f (patch) | |
| tree | f73e31c4c98e44de66d66d7b478963ba046ce0ed /lib | |
| parent | b5c5f576135235fd7f5aae0337a79c546e247651 (diff) | |
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.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssluse.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/ssluse.c b/lib/ssluse.c index fdc540e90..046003c42 100644 --- 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 |