merge revision(s) 29933:


	* re.c (rb_reg_regcomp): should succeed the taint status from the
	  origin. [ruby-core:33338]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29933 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Signed-off-by: URABE, Shyouhei <shyouhei@ruby-lang.org>



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@30080 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 10 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index e830a2d2a1..10a71ebc82 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Dec  4 11:25:02 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* re.c (rb_reg_regcomp): should succeed the taint status from the
+	  origin. [ruby-core:33338]
+
 Thu Dec  2 21:13:42 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
 	* Makefile.in (fake.rb): need to expand the topdir in case of it
diff --git a/re.c b/re.c
index f2ac99f9ff..4e909ebded 100644
--- a/re.c
+++ b/re.c
@@ -1506,6 +1506,7 @@ rb_reg_regcomp(str)
     case_cache = ruby_ignorecase;
     kcode_cache = reg_kcode;
     reg_cache = rb_reg_new(RSTRING(str)->ptr, RSTRING(str)->len, ruby_ignorecase);
+    OBJ_INFECT(reg_cache, str);
     RB_GC_GUARD(save_str);
     return reg_cache;
 }
diff --git a/version.h b/version.h
index 21e1232ec4..ccf97b50da 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2010-12-02"
+#define RUBY_RELEASE_DATE "2010-12-04"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20101202
-#define RUBY_PATCHLEVEL 327
+#define RUBY_RELEASE_CODE 20101204
+#define RUBY_PATCHLEVEL 328
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 12
-#define RUBY_RELEASE_DAY 2
+#define RUBY_RELEASE_DAY 4
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];