summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@freehaven.net>2014-10-09 11:30:01 -0400
committerNick Mathewson <nickm@freehaven.net>2014-10-09 11:30:01 -0400
commite69f390859a59dc0039145f92e65a964dae8119d (patch)
tree9b72af2f9be37075537b1856554a32f70b709a57
parent2e2d18bcd381070b9f77fa3f12f70c9e18306d63 (diff)
parent3da84c2949cc693bb6e6a65a3b1de48af1be0483 (diff)
downloadlibevent-e69f390859a59dc0039145f92e65a964dae8119d.tar.gz
Merge pull request #171 from azat/bufferevent-openssl-fixes-v4
bufferevent_openssl: reset fd_is_set when setfd with -1 is called
-rw-r--r--bufferevent_openssl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/bufferevent_openssl.c b/bufferevent_openssl.c
index 423b34f1..b30f90ff 100644
--- a/bufferevent_openssl.c
+++ b/bufferevent_openssl.c
@@ -1276,6 +1276,8 @@ be_openssl_ctrl(struct bufferevent *bev,
SSL_set_bio(bev_ssl->ssl, bio, bio);
bev_ssl->fd_is_set = 1;
}
+ if (data->fd == -1)
+ bev_ssl->fd_is_set = 0;
if (bev_ssl->state == BUFFEREVENT_SSL_OPEN)
return set_open_callbacks(bev_ssl, data->fd);
else {