diff --git a/ChangeLog b/ChangeLog index be7090ca42..54f60a91c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Oct 31 15:09:28 2001 Yukihiro Matsumoto + + * eval.c (POP_VARS): should not set DVAR_DONT_RECYCLE if _old + ruby_vars is already force_recycled. + Wed Oct 31 02:44:06 2001 Wakou Aoyama * lib/cgi.rb: CGI::Cookie::parse(): Ignore duplicate keys caused by diff --git a/config.sub b/config.sub index 0387ee530f..a2d8b0d596 100644 --- a/config.sub +++ b/config.sub @@ -117,7 +117,7 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | storm-chaos* | os2-emx*) + nto-qnx* | linux-gnu* | linux-libc1 | storm-chaos* | os2-emx*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; diff --git a/eval.c b/eval.c index a006f3444d..aa56085e9a 100644 --- a/eval.c +++ b/eval.c @@ -593,7 +593,8 @@ struct RVarmap *ruby_dyna_vars; #define POP_VARS() \ if (_old && (ruby_scope->flag & SCOPE_DONT_RECYCLE)) \ - FL_SET(_old, DVAR_DONT_RECYCLE); \ + if (RBASIC(_old)->flags) /* unless it's already recycled */ \ + FL_SET(_old, DVAR_DONT_RECYCLE); \ ruby_dyna_vars = _old; \ } diff --git a/version.h b/version.h index e5240810b1..7501e0b68f 100644 --- a/version.h +++ b/version.h @@ -1,4 +1,4 @@ #define RUBY_VERSION "1.6.5" -#define RUBY_RELEASE_DATE "2001-10-30" +#define RUBY_RELEASE_DATE "2001-10-31" #define RUBY_VERSION_CODE 165 -#define RUBY_RELEASE_CODE 20011030 +#define RUBY_RELEASE_CODE 20011031