diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2007-03-14 23:40:46 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2007-03-14 23:40:46 +0000 |
| commit | d31445303711155262c733b4eb34c1d6461a0f41 (patch) | |
| tree | 02fbb6be5f1d87edc0867782d999954aefb9f16f | |
| parent | 9cb69f77f1a84706c44984444aaa8c430c50121c (diff) | |
yassl doesn't have SSL_get_shutdown() in its OpenSSL() layer so we check for
it and avoid it, even if this cripples the CCC command
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | lib/ssluse.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 22c86e36e..9bced6cb5 100644 --- a/configure.ac +++ b/configure.ac @@ -1023,6 +1023,9 @@ if test X"$OPT_SSL" != Xno; then OPENSSL_ENABLED=1 AC_DEFINE(USE_OPENSSL, 1, [if OpenSSL is in use])) + dnl yassl doesn't have SSL_get_shutdown ? + AC_CHECK_FUNCS( SSL_get_shutdown ) + if test $ac_cv_header_openssl_x509_h = no; then dnl we don't use the "action" part of the AC_CHECK_HEADERS macro dnl since 'err.h' might in fact find a krb4 header with the same diff --git a/lib/ssluse.c b/lib/ssluse.c index 5bcc3a1e3..815289df7 100644 --- a/lib/ssluse.c +++ b/lib/ssluse.c @@ -801,6 +801,7 @@ int Curl_ossl_shutdown(struct connectdata *conn, int sockindex) } /* while()-loop for the select() */ if(data->set.verbose) { +#ifdef HAVE_SSL_GET_SHUTDOWN switch(SSL_get_shutdown(connssl->handle)) { case SSL_SENT_SHUTDOWN: infof(data, "SSL_get_shutdown() returned SSL_SENT_SHUTDOWN\n"); @@ -813,6 +814,7 @@ int Curl_ossl_shutdown(struct connectdata *conn, int sockindex) "SSL_RECEIVED__SHUTDOWN\n"); break; } +#endif } connssl->use = FALSE; /* get back to ordinary socket usage */ |