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

Conflicts:
	bufferevent_openssl.c

diff --cc bufferevent_openssl.c
index 681aecff34fc84858ff66a8977078fc4feaf92e7,922ae06cb0d509a7f250d1cef437c5400cff0977..6e9c99f861c16b8b33999974731c4f0f839e262c
--- 1/bufferevent_openssl.c
--- 2/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;
  
 -      atmost = _bufferevent_get_read_max(&bev_ssl->bev);
+       if (bev_ssl->bev.read_suspended)
+               return 0;
+ 
 +      atmost = bufferevent_get_read_max_(&bev_ssl->bev);
        if (n_to_read > atmost)
                n_to_read = atmost;