summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--thread_sync.c1
-rw-r--r--version.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/thread_sync.c b/thread_sync.c
index 396cceb2ce..8964e24a5f 100644
--- a/thread_sync.c
+++ b/thread_sync.c
@@ -1314,6 +1314,7 @@ condvar_ptr(VALUE self)
/* forked children can't reach into parent thread stacks */
if (cv->fork_gen != fork_gen) {
+ cv->fork_gen = fork_gen;
list_head_init(&cv->waitq);
}
diff --git a/version.h b/version.h
index 8168fe3648..3b9dbd43d2 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.5.5"
#define RUBY_RELEASE_DATE "2019-03-15"
-#define RUBY_PATCHLEVEL 156
+#define RUBY_PATCHLEVEL 157
#define RUBY_RELEASE_YEAR 2019
#define RUBY_RELEASE_MONTH 3