diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2013-01-17 12:59:23 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2013-01-17 19:40:35 +0100 |
| commit | c43127414d89ccb9ef6517081f68986d991bcfb3 (patch) | |
| tree | f6a639061f5e199089a923b052904aa24901243c /lib/ssluse.c | |
| parent | 9fd88abb7032346e88636165e688232e36f5c336 (diff) | |
| download | curl-c43127414d89ccb9ef6517081f68986d991bcfb3.tar.gz | |
always-multi: always use non-blocking internals
Remove internal separated behavior of the easy vs multi intercace.
curl_easy_perform() is now using the multi interface itself.
Several minor multi interface quirks and bugs have been fixed in the
process.
Much help with debugging this has been provided by: Yang Tse
Diffstat (limited to 'lib/ssluse.c')
| -rw-r--r-- | lib/ssluse.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/lib/ssluse.c b/lib/ssluse.c index c4c465c2c..4a0dba734 100644 --- a/lib/ssluse.c +++ b/lib/ssluse.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2013, 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 @@ -1520,16 +1520,6 @@ ossl_connect_step1(struct connectdata *conn, SSL_CTX_set_options(connssl->ctx, ctx_options); -#if 0 - /* - * Not sure it's needed to tell SSL_connect() that socket is - * non-blocking. It doesn't seem to care, but just return with - * SSL_ERROR_WANT_x. - */ - if(data->state.used_interface == Curl_if_multi) - SSL_CTX_ctrl(connssl->ctx, BIO_C_SET_NBIO, 1, NULL); -#endif - if(data->set.str[STRING_CERT] || data->set.str[STRING_CERT_TYPE]) { if(!cert_stuff(conn, connssl->ctx, |