ruby-changes:70676
From: NAKAMURA <ko1@a...>
Date: Fri, 31 Dec 2021 19:49:07 +0900 (JST)
Subject: [ruby-changes:70676] 1034b6e7ba (ruby_2_7): merge revision(s) 0c5f8c62766afe4605172800063e63fe36996658: [Backport #10961]
https://git.ruby-lang.org/ruby.git/commit/?id=1034b6e7ba From 1034b6e7ba9442320e16c260d634d4c64d5e62bf Mon Sep 17 00:00:00 2001 From: NAKAMURA Usaku <usa@r...> Date: Fri, 31 Dec 2021 19:48:36 +0900 Subject: merge revision(s) 0c5f8c62766afe4605172800063e63fe36996658: [Backport #10961] [ruby/zlib] Resume zstream if available [Bug #10961] --- ext/zlib/zlib.c | 6 ++++++ 1 file changed, 6 insertions(+) --- ext/zlib/zlib.c | 6 ++++++ version.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ext/zlib/zlib.c b/ext/zlib/zlib.c index 5c8aab24af6..3b8e097da9b 100644 --- a/ext/zlib/zlib.c +++ b/ext/zlib/zlib.c @@ -1066,6 +1066,12 @@ loop: https://github.com/ruby/ruby/blob/trunk/ext/zlib/zlib.c#L1066 RB_NOGVL_UBF_ASYNC_SAFE); #endif + /* retry if no exception is thrown */ + if (err == Z_OK && args.interrupt) { + args.interrupt = 0; + goto loop; + } + if (flush != Z_FINISH && err == Z_BUF_ERROR && z->stream.avail_out > 0) { z->flags |= ZSTREAM_FLAG_IN_STREAM; diff --git a/version.h b/version.h index dc3d5271075..960bec511d2 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L2 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 208 +#define RUBY_PATCHLEVEL 209 #define RUBY_RELEASE_YEAR 2021 #define RUBY_RELEASE_MONTH 12 -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/