Merge remote-tracking branch 'public/bug11787'

This commit is contained in:
Nick Mathewson 2014-08-20 13:34:02 -04:00
commit fb762f6db0
2 changed files with 6 additions and 1 deletions

5
changes/bug11787 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (directory bandwidth performance):
- Don't flush the zlib buffer aggressively when compressing
directory information for clients. This should save about 7% of
the bandwidth currently used for compressed descriptors and
microdescriptors. Fixes bug 11787; bugfix on 0.1.1.23.

View File

@ -472,7 +472,7 @@ tor_zlib_process(tor_zlib_state_t *state,
state->stream.avail_out = (unsigned int)*out_len; state->stream.avail_out = (unsigned int)*out_len;
if (state->compress) { if (state->compress) {
err = deflate(&state->stream, finish ? Z_FINISH : Z_SYNC_FLUSH); err = deflate(&state->stream, finish ? Z_FINISH : Z_NO_FLUSH);
} else { } else {
err = inflate(&state->stream, finish ? Z_FINISH : Z_SYNC_FLUSH); err = inflate(&state->stream, finish ? Z_FINISH : Z_SYNC_FLUSH);
} }