From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 22 Sep 2012 23:21:21 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/patches-2.0'
X-Git-Tag: release-2.1.2-alpha~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f2050e79d5140af3c364221bd736727da3d27cbe;p=libevent

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

Conflicts:
	bufferevent_openssl.c
---

f2050e79d5140af3c364221bd736727da3d27cbe
diff --cc bufferevent_openssl.c
index 681aecff,922ae06c..6e9c99f8
--- a/bufferevent_openssl.c
+++ b/bufferevent_openssl.c
@@@ -574,7 -571,10 +574,10 @@@ do_read(struct bufferevent_openssl *bev
  	struct evbuffer_iovec space[2];
  	int result = 0;
  
+ 	if (bev_ssl->bev.read_suspended)
+ 		return 0;
+ 
 -	atmost = _bufferevent_get_read_max(&bev_ssl->bev);
 +	atmost = bufferevent_get_read_max_(&bev_ssl->bev);
  	if (n_to_read > atmost)
  		n_to_read = atmost;