diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-08-20 13:34:02 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-08-20 13:34:02 -0400 |
| commit | fb762f6db0a363349afd83e5316daf613e27e450 (patch) | |
| tree | d0d0b1d78be331b3677eeca6e0e0c36b435fac8d /src/common | |
| parent | c57e8da4ea9cccc168bb946040350434088cb7cb (diff) | |
| parent | c3f04f3daa27ce61da10e9bcf12cf05b376f73ed (diff) | |
| download | tor-fb762f6db0a363349afd83e5316daf613e27e450.tar.gz tor-fb762f6db0a363349afd83e5316daf613e27e450.zip | |
Merge remote-tracking branch 'public/bug11787'
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/torgzip.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/torgzip.c b/src/common/torgzip.c index 15451ee30d..239cab9cac 100644 --- a/src/common/torgzip.c +++ b/src/common/torgzip.c @@ -472,7 +472,7 @@ tor_zlib_process(tor_zlib_state_t *state, state->stream.avail_out = (unsigned int)*out_len; if (state->compress) { - err = deflate(&state->stream, finish ? Z_FINISH : Z_SYNC_FLUSH); + err = deflate(&state->stream, finish ? Z_FINISH : Z_NO_FLUSH); } else { err = inflate(&state->stream, finish ? Z_FINISH : Z_SYNC_FLUSH); } |