[ruby-cvs:61422] usa:r54260 (ruby_2_1): merge revision(s) 49096, 51353, 53168, 53169: [Backport #11834]

usa at ruby-lang.org usa at ruby-lang.org
Fri Mar 25 17:13:19 JST 2016


usa	2016-03-25 17:13:18 +0900 (Fri, 25 Mar 2016)

  New Revision: 54260

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54260

  Log:
    merge revision(s) 49096,51353,53168,53169: [Backport #11834]
    
    test_m17n.rb: split test_scrub
    
    * test/ruby/test_m17n.rb (TestM17N#test_scrub): split into some
      tests.
    * include/ruby/ruby.h: add raw FL macros, which assume always the
      argument object is not a special constant.
    
    * internal.h (STR_EMBED_P, STR_SHARED_P): valid only for T_STRING.
    
    * string.c: deal with taint flags directly across String instances.
    
    * transcode.c (rb_econv_substr_append, econv_primitive_convert):
      the result should be infected by the original string.
    
    * string.c (rb_str_scrub): the result should be infected by the
      original string.

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/include/ruby/ruby.h
    branches/ruby_2_1/internal.h
    branches/ruby_2_1/string.c
    branches/ruby_2_1/test/ruby/test_econv.rb
    branches/ruby_2_1/test/ruby/test_m17n.rb
    branches/ruby_2_1/transcode.c
    branches/ruby_2_1/version.h


More information about the ruby-cvs mailing list