mirror/rsync
1
0 Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-10-21 05:14:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changes to send_deflated_token() that surrounded the

Browse Source 
call to deflate(..., Z_INSERT_ONLY) -- the underlying bug was
caused by the zlib code not handling Z_INSERT_ONLY in the case
where the server has disabled compression.
This commit is contained in:
Wayne Davison committed 2005-01-02 09:08:59 +00:00
1 parent 0301b334c7
commit 80a25bb880
1 file changed
+10 -16
Download Patch File Download Diff File Expand all files Collapse all files
token.c
+10 -16
View File
@@ -262,22 +262,16 @@ send_deflated_token(int f, int token, struct map_struct *buf, OFF_T offset,
} else if (token != -2) {
/* add the data in the current block to the compressor's
history and hash table */
do {
n = MIN(toklen, CHUNK_SIZE);
tx_strm.next_in = (Bytef *) map_ptr(buf, offset, n);
tx_strm.avail_in = n;
tx_strm.next_out = (Bytef *)obuf;
tx_strm.avail_out = AVAIL_OUT_SIZE(CHUNK_SIZE);
r = deflate(&tx_strm, Z_INSERT_ONLY);
if (r != Z_OK || tx_strm.avail_in != 0) {
rprintf(FERROR,
"deflate on token returned %d (%d bytes left)\n",
r, tx_strm.avail_in);
exit_cleanup(RERR_STREAMIO);
}
toklen -= n;
offset += n;
} while (toklen);
tx_strm.next_in = (Bytef *) map_ptr(buf, offset, toklen);
tx_strm.avail_in = toklen;
tx_strm.next_out = (Bytef *) obuf;
tx_strm.avail_out = AVAIL_OUT_SIZE(CHUNK_SIZE);
r = deflate(&tx_strm, Z_INSERT_ONLY);
if (r != Z_OK || tx_strm.avail_in != 0) {
rprintf(FERROR, "deflate on token returned %d (%d bytes left)\n",
r, tx_strm.avail_in);
exit_cleanup(RERR_STREAMIO);
}
}
}