cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-12 22:10:12 -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-04-30 21:33:56 -04:00
commit b98624ef35
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
bufferevent_openssl.c
View File

@ -618,9 +618,6 @@ do_read(struct bufferevent_openssl *bev_ssl, int n_to_read)
evbuffer_commit_space(input, space, n_used); evbuffer_commit_space(input, space, n_used);
if (bev_ssl->underlying) if (bev_ssl->underlying)
BEV_RESET_GENERIC_READ_TIMEOUT(bev); BEV_RESET_GENERIC_READ_TIMEOUT(bev);
if (evbuffer_get_length(input) >= bev->wm_read.low)
bufferevent_run_readcb_(bev);
} }
return blocked ? 0 : 1; return blocked ? 0 : 1;
@ -760,6 +757,7 @@ consider_reading(struct bufferevent_openssl *bev_ssl)
{ {
int r; int r;
int n_to_read; int n_to_read;
int read_data = 0;
while (bev_ssl->write_blocked_on_read) { while (bev_ssl->write_blocked_on_read) {
r = do_write(bev_ssl, WRITE_FRAME); r = do_write(bev_ssl, WRITE_FRAME);
@ -775,6 +773,8 @@ consider_reading(struct bufferevent_openssl *bev_ssl)
if (do_read(bev_ssl, n_to_read) <= 0) if (do_read(bev_ssl, n_to_read) <= 0)
break; break;
read_data = 1;
/* 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
@ -803,6 +803,15 @@ consider_reading(struct bufferevent_openssl *bev_ssl)
n_to_read = bytes_to_read(bev_ssl); n_to_read = bytes_to_read(bev_ssl);
} }
if (read_data == 1) {
struct bufferevent *bev = &bev_ssl->bev.bev;
struct evbuffer *input = bev->input;
if (evbuffer_get_length(input) >= bev->wm_read.low) {
bufferevent_run_readcb_(bev);
}
}
if (!bev_ssl->underlying) { if (!bev_ssl->underlying) {
/* Should be redundant, but let's avoid busy-looping */ /* Should be redundant, but let's avoid busy-looping */
if (bev_ssl->bev.read_suspended || if (bev_ssl->bev.read_suspended ||
@ -824,6 +833,14 @@ consider_writing(struct bufferevent_openssl *bev_ssl)
r = do_read(bev_ssl, 1024); /* XXXX 1024 is a hack */ r = do_read(bev_ssl, 1024); /* XXXX 1024 is a hack */
if (r <= 0) if (r <= 0)
break; break;
else {
struct bufferevent *bev = &bev_ssl->bev.bev;
struct evbuffer *input = bev->input;
if (evbuffer_get_length(input) >= bev->wm_read.low) {
bufferevent_run_readcb_(bev);
}
}
} }
if (bev_ssl->read_blocked_on_write) if (bev_ssl->read_blocked_on_write)
return; return;