shyouhei	2010-12-04 15:34:08 +0900 (Sat, 04 Dec 2010)

  New Revision: 30080

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30080

  Log:
    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@r...>

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/re.c
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/re.c
===================================================================
--- ruby_1_8_7/re.c	(revision 30079)
+++ ruby_1_8_7/re.c	(revision 30080)
@@ -1506,6 +1506,7 @@
     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;
 }
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 30079)
+++ ruby_1_8_7/ChangeLog	(revision 30080)
@@ -1,3 +1,8 @@
+Sat Dec  4 11:25:02 2010  NAKAMURA Usaku  <usa@r...>
+
+	* 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@r...>
 
 	* Makefile.in (fake.rb): need to expand the topdir in case of it
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 30079)
+++ ruby_1_8_7/version.h	(revision 30080)
@@ -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[];

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/