From 49c69543516cc5d3a8885fdc3f5ca3af08b9becd Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 25 Dec 2001 15:09:05 +0000
Subject: [PATCH] * stable version 1.6.6 released.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1939 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 12 ++++++++++++
 parse.y   |  1 +
 re.c      |  7 +++++++
 ruby.h    |  2 ++
 version.h |  4 ++--
 5 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1d7bbaca10..a7c1cd9e4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Tue Dec 25 23:28:47 2001  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* stable version 1.6.6 released.
+
+Tue Dec 25 18:32:16 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* re.c (rb_reg_search): initialize taint status of match object.
+
+Fri Dec 21 20:33:34 2001  K.Kosako  <kosako@sofnec.co.jp>
+
+	* parse.y (str_extend): make up "#$;" handling.
+
 Fri Dec 21 16:18:17 2001  Nobuyoshi Nakada  <nobu.nakada@nifty.ne.jp>
 
 	* dln.h, ruby.h, util.h: enable prototypes in C++.
diff --git a/parse.y b/parse.y
index 539ac9ab51..6004eaf5a5 100644
--- a/parse.y
+++ b/parse.y
@@ -3743,6 +3743,7 @@ str_extend(list, term, paren)
 	  case '!': case '@': case ',':
 	  case '.': case '=': case ':':
 	  case '<': case '>': case '\\':
+	  case ';':
 	  refetch:
 	    tokadd(c);
 	    goto fetch_id;
diff --git a/re.c b/re.c
index 2b5c5343b4..4ff48632c0 100644
--- a/re.c
+++ b/re.c
@@ -636,6 +636,13 @@ rb_reg_search(re, str, pos, reverse)
     if (NIL_P(match) || FL_TEST(match, MATCH_BUSY)) {
 	match = match_alloc();
     }
+    else {
+	if (rb_safe_level() >= 3) 
+	    OBJ_TAINT(match);
+	else
+	    FL_UNSET(match, FL_TAINT);
+    }
+
     re_copy_registers(RMATCH(match)->regs, &regs);
     RMATCH(match)->str = rb_str_new4(str);
     rb_backref_set(match);
diff --git a/ruby.h b/ruby.h
index d41e98c652..2998636064 100644
--- a/ruby.h
+++ b/ruby.h
@@ -35,6 +35,7 @@ extern "C" {
 #include <stdio.h>
 
 /* need to include <ctype.h> to use these macros */
+#ifndef ISUPPER
 #undef ISPRINT
 #define ISPRINT(c) isprint((unsigned char)(c))
 #define ISSPACE(c) isspace((unsigned char)(c))
@@ -44,6 +45,7 @@ extern "C" {
 #define ISALPHA(c) isalpha((unsigned char)(c))
 #define ISDIGIT(c) isdigit((unsigned char)(c))
 #define ISXDIGIT(c) isxdigit((unsigned char)(c))
+#endif
 
 #ifndef __STDC__
 # define volatile
diff --git a/version.h b/version.h
index 6a8f12b931..d28bc456f2 100644
--- a/version.h
+++ b/version.h
@@ -1,4 +1,4 @@
 #define RUBY_VERSION "1.6.6"
-#define RUBY_RELEASE_DATE "2001-12-21"
+#define RUBY_RELEASE_DATE "2001-12-25"
 #define RUBY_VERSION_CODE 166
-#define RUBY_RELEASE_CODE 20011221
+#define RUBY_RELEASE_CODE 20011225