diff options
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | 2017-09-07 00:55:38 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-09-07 16:08:24 +0200 |
| commit | f4a623825bf18bc3a6b11193230e44983d20446a (patch) | |
| tree | 1506bad072b0dc3400c61bfed45bb667ba691bb6 | |
| parent | dde4f5c81a8e3c7151338bef6e3c6b3ee391d2c7 (diff) | |
| download | curl-f4a623825bf18bc3a6b11193230e44983d20446a.tar.gz | |
OpenSSL: fix yet another mistake while encapsulating SSL backend data
Another mistake in my manual fixups of the largely mechanical
search-and-replace ("connssl->" -> "BACKEND->"), just like the previous
commit concerning HTTPS proxies (and hence not caught during my
earlier testing).
Fixes #1855
Closes #1871
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
| -rw-r--r-- | lib/vtls/openssl.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index c3b935f38..3472c2492 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -3366,10 +3366,12 @@ static bool Curl_ossl_data_pending(const struct connectdata *conn, int connindex) { const struct ssl_connect_data *connssl = &conn->ssl[connindex]; + const struct ssl_connect_data *proxyssl = &conn->proxy_ssl[connindex]; if(BACKEND->handle) /* SSL is in use */ return (0 != SSL_pending(BACKEND->handle) || - (BACKEND->handle && 0 != SSL_pending(BACKEND->handle))) ? + (proxyssl->backend->handle && + 0 != SSL_pending(proxyssl->backend->handle))) ? TRUE : FALSE; return FALSE; } |