cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-12 13:58:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	bufferevent_openssl.c
This commit is contained in:
Nick Mathewson 2012-09-22 19:21:21 -04:00
commit f2050e79d5
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bufferevent_openssl.c
View File

@ -565,7 +565,7 @@ decrement_buckets(struct bufferevent_openssl *bev_ssl)
/* Return a bitmask of OP_MADE_PROGRESS (if we read anything); OP_BLOCKED (if /* Return a bitmask of OP_MADE_PROGRESS (if we read anything); OP_BLOCKED (if
we're now blocked); and OP_ERR (if an error occurred). */ we're now blocked); and OP_ERR (if an error occurred). */
static int static int
do_read(struct bufferevent_openssl *bev_ssl, int n_to_read) { do_read(struct bufferevent_openssl *bev_ssl, int n_to_read) {
/* Requires lock */ /* Requires lock */
struct bufferevent *bev = &bev_ssl->bev.bev; struct bufferevent *bev = &bev_ssl->bev.bev;
@ -574,6 +574,9 @@ do_read(struct bufferevent_openssl *bev_ssl, int n_to_read) {
struct evbuffer_iovec space[2]; struct evbuffer_iovec space[2];
int result = 0; 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) if (n_to_read > atmost)
n_to_read = atmost; n_to_read = atmost;
@ -786,6 +789,9 @@ consider_reading(struct bufferevent_openssl *bev_ssl)
if (r & (OP_BLOCKED|OP_ERR)) if (r & (OP_BLOCKED|OP_ERR))
break; break;
if (bev_ssl->bev.read_suspended)
break;
/* Read all pending data. This won't hit the network /* Read all pending data. This won't hit the network
* again, and will (most importantly) put us in a state * again, and will (most importantly) put us in a state
* where we don't need to read anything else until the * where we don't need to read anything else until the