diff options
| author | obrien <obrien@FreeBSD.org> | 2008-01-13 05:49:32 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2008-01-13 05:49:32 +0000 |
| commit | def79099e7c2ca2b773aa94d5b80c571dec9460f (patch) | |
| tree | 9a6cba0f4384569a2eee18bf74577d8fd41aa2c7 /contrib/cvs/src/zlib.c | |
| parent | 0526761d4d99d34d2de093998c7ccd3f82695651 (diff) | |
| parent | 55b663837dd12bbe5836969ac2a3f052a9028ea5 (diff) | |
| download | FreeBSD-src-def79099e7c2ca2b773aa94d5b80c571dec9460f.zip FreeBSD-src-def79099e7c2ca2b773aa94d5b80c571dec9460f.tar.gz | |
This commit was generated by cvs2svn to compensate for changes in r175261,
which included commits to RCS files with non-trunk default branches.
Diffstat (limited to 'contrib/cvs/src/zlib.c')
| -rw-r--r-- | contrib/cvs/src/zlib.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/contrib/cvs/src/zlib.c b/contrib/cvs/src/zlib.c index 32c95e5..46ed0e6 100644 --- a/contrib/cvs/src/zlib.c +++ b/contrib/cvs/src/zlib.c @@ -361,18 +361,10 @@ compress_buffer_shutdown_input (buf) struct compress_buffer *cb = (struct compress_buffer *) buf->closure; int zstatus; - /* Pick up any trailing data, such as the checksum. */ - while (1) - { - int status, nread; - char buf[100]; - - status = compress_buffer_input (cb, buf, 0, sizeof buf, &nread); - if (status == -1) - break; - if (status != 0) - return status; - } + /* Don't make any attempt to pick up trailing data since we are shutting + * down. If the client doesn't know we are shutting down, we might not + * see the EOF we are expecting. + */ zstatus = inflateEnd (&cb->zstr); if (zstatus != Z_OK) |
