diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/zlib/zlib.c | 8 |
2 files changed, 11 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Tue Jul 3 14:50:16 2012 Eric Hodel <drbrain@segment7.net> + + * ext/zlib/zlib.c (zstream_run_func): Don't exit run loop for buffer + error. [Feature #6615] + * ext/zlib/zlib.c: Fix style to match existing functions. + Tue Jul 3 12:05:51 2012 NAKAMURA Usaku <usa@ruby-lang.org> * ext/dl/cfunc.c (rb_dlcfunc_call): also needed the workaround for VC8 diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index ef718a4a86..73f3f7c5f0 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -917,7 +917,8 @@ zstream_end(struct zstream *z) } static VALUE -zstream_run_func(void *ptr) { +zstream_run_func(void *ptr) +{ struct zstream_run_args *args = (struct zstream_run_args *)ptr; int err, flush = args->flush; struct zstream *z = args->z; @@ -934,7 +935,7 @@ zstream_run_func(void *ptr) { break; } - if (err != Z_OK) + if (err != Z_OK && err != Z_BUF_ERROR) break; if (z->stream.avail_out > 0) { @@ -955,7 +956,8 @@ zstream_run_func(void *ptr) { * There is no safe way to interrupt z->run->func(). */ static void -zstream_unblock_func(void *ptr) { +zstream_unblock_func(void *ptr) +{ struct zstream_run_args *args = (struct zstream_run_args *)ptr; args->interrupt = 1; |