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

This commit is contained in:
Nick Mathewson 2011-07-04 11:37:52 -04:00
commit c116d960b7

View File

@ -171,8 +171,8 @@ bio_bufferevent_write(BIO *b, const char *in, int inlen)
/* Copy only as much data onto the output buffer as can fit under the
* high-water mark. */
if (bufev->wm_write.high && bufev->wm_write.high >= (outlen+inlen)) {
if (bufev->wm_write.high >= outlen) {
if (bufev->wm_write.high && bufev->wm_write.high <= (outlen+inlen)) {
if (bufev->wm_write.high <= outlen) {
/* If no data can fit, we'll need to retry later. */
BIO_set_retry_write(b);
return -1;