Make bufferevent_set_timeouts(bev, NULL, NULL) have plausible semantics

1 files changed, 17 insertions, 6 deletions

diff --git a/bufferevent_openssl.c b/bufferevent_openssl.c
index 55173d92..99ed5f8d 100644
--- a/bufferevent_openssl.c
+++ b/bufferevent_openssl.c
@@ -1221,14 +1221,25 @@ be_openssl_adj_timeouts(struct bufferevent *bev)
 {
 	struct bufferevent_openssl *bev_ssl = upcast(bev);
 
-	if (bev_ssl->underlying)
+	if (bev_ssl->underlying) {
 		return bufferevent_generic_adj_timeouts_(bev);
-	else {
+	} else {
 		int r1=0, r2=0;
-		if (event_pending(&bev->ev_read, EV_READ, NULL))
-			r1 = bufferevent_add_event_(&bev->ev_read, &bev->timeout_read);
-		if (event_pending(&bev->ev_write, EV_WRITE, NULL))
-			r2 = bufferevent_add_event_(&bev->ev_write, &bev->timeout_write);
+		if (event_pending(&bev->ev_read, EV_READ, NULL)) {
+			if (evutil_timerisset(&bev->timeout_read)) {
+				r1 = bufferevent_add_event_(&bev->ev_read, &bev->timeout_read);
+			} else {
+				event_remove_timer(&bev->ev_read);
+			}
+		}
+		if (event_pending(&bev->ev_write, EV_WRITE, NULL)) {
+			if (evutil_timerisset(&bev->timeout_write)) {
+				r2 = bufferevent_add_event_(&bev->ev_write, &bev->timeout_write);
+			} else {
+				event_remove_timer(&bev->ev_write);
+			}
+		}
+
 		return (r1<0 || r2<0) ? -1 : 0;
 	}
 }