Browse files

Merge remote-tracking branch 'origin/patches-2.0'

  • Loading branch information...
2 parents 0fcc536 + 4a34394 commit 909c40e5d1888a3b6898a3777080a8c06dc20e53 Nick Mathewson committed Aug 3, 2011
Showing with 3 additions and 0 deletions.
  1. +3 −0 bufferevent_openssl.c
View
3 bufferevent_openssl.c
@@ -815,6 +815,9 @@ be_openssl_eventcb(struct bufferevent *bev_base, short what, void *ctx)
} else if (what & BEV_EVENT_TIMEOUT) {
/* We sure didn't set this. Propagate it to the user. */
event = what;
+ } else if (what & BEV_EVENT_ERROR) {
+ /* An error occurred on the connection. Propagate it to the user. */
+ event = what;
} else if (what & BEV_EVENT_CONNECTED) {
/* Ignore it. We're saying SSL_connect() already, which will
eat it. */

0 comments on commit 909c40e

Please sign in to comment.