diff options
| author | Nick Zitzmann <nick@chronosnet.com> | 2012-07-16 20:20:57 -0600 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2012-07-25 23:22:11 +0200 |
| commit | f92779198d07abb18e8a5c4dd3a2e1b7c4c8726a (patch) | |
| tree | 258327de5670f3570e7a932ce7c94b9fe8d7a510 /lib/urldata.h | |
| parent | 9ac5cdfc2f0a0fed15588b8a007c565fa711c9c3 (diff) | |
| download | curl-f92779198d07abb18e8a5c4dd3a2e1b7c4c8726a.tar.gz | |
darwinssl: fixed freeze involving the multi interface
Previously the curl_multi interface would freeze if darwinssl was
enabled and at least one of the handles tried to connect to a Web site
using HTTPS. Removed the "wouldblock" state darwinssl was using because
I figured out a solution for our "would block but in which direction?"
dilemma.
Diffstat (limited to 'lib/urldata.h')
| -rw-r--r-- | lib/urldata.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/urldata.h b/lib/urldata.h index 5ad07c5f1..fddfc0d05 100644 --- a/lib/urldata.h +++ b/lib/urldata.h @@ -248,9 +248,6 @@ typedef enum { ssl_connect_2, ssl_connect_2_reading, ssl_connect_2_writing, -#ifdef USE_DARWINSSL - ssl_connect_2_wouldblock, -#endif /* USE_DARWINSSL */ ssl_connect_3, ssl_connect_done } ssl_connect_state; @@ -327,6 +324,7 @@ struct ssl_connect_data { SSLContextRef ssl_ctx; curl_socket_t ssl_sockfd; ssl_connect_state connecting_state; + bool ssl_direction; /* true if writing, false if reading */ #endif /* USE_DARWINSSL */ }; |