Fix compression bug where incompressible files weren't transmitted correctly.

[rsync/rsync.git] / token.c

diff --git a/token.c b/token.c
index 87bba58..9d3bccd 100644 (file)
--- a/token.c
+++ b/token.c
@@ -116,7 +116,7 @@ send_deflated_token(int f, int token,
            tx_strm.zalloc = z_alloc;
            tx_strm.zfree = z_free;
            if (deflateInit2(&tx_strm, Z_DEFAULT_COMPRESSION, 8,
-                            -15, 8, Z_DEFAULT_STRATEGY, -4) != Z_OK) {
+                            -15, 8, Z_DEFAULT_STRATEGY) != Z_OK) {
                fprintf(FERROR, "compression init failed\n");
                exit_cleanup(1);
            }
@@ -293,14 +293,17 @@ recv_deflated_token(int f, char **data)
            rx_strm.avail_out = CHUNK_SIZE;
            r = inflate(&rx_strm, Z_NO_FLUSH);
            n = CHUNK_SIZE - rx_strm.avail_out;
-           if (r != Z_OK || n == 0) {
+           if (r != Z_OK) {
                fprintf(FERROR, "inflate returned %d (%d bytes)\n", r, n);
                exit_cleanup(1);
            }
            if (rx_strm.avail_out != 0)
                recv_state = r_inflated;
-           *data = dbuf;
-           return n;
+           if (n != 0) {
+               *data = dbuf;
+               return n;
+           }
+           break;
 
        case r_running:
            ++rx_token;