Skip to content
  • nagachika's avatar
    b93a2d9d
    merge revision(s)... · b93a2d9d
    nagachika authored
    
    merge revision(s) 391abc54,e86c1f6f,f6539202: [Backport #12052]
    
    	Scan the coderange in the given encoding
    
    	---
    	 ext/-test-/string/enc_str_buf_cat.c       | 14 ++++++++++++++
    	 string.c                                  | 32 ++++++++++++++++++++++---------
    	 test/-ext-/string/test_enc_str_buf_cat.rb |  9 +++++++++
    	 3 files changed, 46 insertions(+), 9 deletions(-)
    
    	Work around issue transcoding issue with non-ASCII compatible
    	 encodings and xml escaping
    
    	When using a non-ASCII compatible source and destination encoding
    	and xml escaping (the :xml option to String#encode), the resulting
    	string was broken, as it used the correct non-ASCII compatible
    	encoding, but contained data that was ASCII-compatible instead of
    	compatible with the string's encoding.
    
    	Work around this issue by detecting the case where both the
    	source and destination encoding are non-ASCII compatible, and
    	transcoding the source string from the non-ASCII compatible
    	encoding to UTF-8. The xml escaping code will correctly handle
    	the UTF-8 source string and the return the correctly encoded
    	and escaped value.
    
    	Fixes [Bug #12052]
    
    Co-authored-by: default avatarNobuyoshi Nakada <nobu@ruby-lang.org>
    	---
    	 test/ruby/test_transcode.rb | 19 +++++++++++++++++++
    	 transcode.c                 |  6 ++++++
    	 2 files changed, 25 insertions(+)
    
    	=?UTF-8?q?-=20add=20regression=20tests=20for=20U+6E7F=20(?=
    	 =?UTF-8?q?=E6=B9=BF)=20in=20ISO-2022-JP?=
    	MIME-Version: 1.0
    	Content-Type: text/plain; charset=UTF-8
    	Content-Transfer-Encoding: 8bit
    
    	  In ISO-2022-JP, the bytes use to code are the same as those for "<>".
    	  This adds regression tests to make sure that these bytes, when representing
    	  湿, are NOT escaped with encode("ISO-2022-JP, xml: :text) or similar.
    	  These are additional regression tests for #12052.
    	---
    	 test/ruby/test_transcode.rb | 3 +++
    	 1 file changed, 3 insertions(+)
    b93a2d9d
    merge revision(s)...
    nagachika authored
    
    merge revision(s) 391abc54,e86c1f6f,f6539202: [Backport #12052]
    
    	Scan the coderange in the given encoding
    
    	---
    	 ext/-test-/string/enc_str_buf_cat.c       | 14 ++++++++++++++
    	 string.c                                  | 32 ++++++++++++++++++++++---------
    	 test/-ext-/string/test_enc_str_buf_cat.rb |  9 +++++++++
    	 3 files changed, 46 insertions(+), 9 deletions(-)
    
    	Work around issue transcoding issue with non-ASCII compatible
    	 encodings and xml escaping
    
    	When using a non-ASCII compatible source and destination encoding
    	and xml escaping (the :xml option to String#encode), the resulting
    	string was broken, as it used the correct non-ASCII compatible
    	encoding, but contained data that was ASCII-compatible instead of
    	compatible with the string's encoding.
    
    	Work around this issue by detecting the case where both the
    	source and destination encoding are non-ASCII compatible, and
    	transcoding the source string from the non-ASCII compatible
    	encoding to UTF-8. The xml escaping code will correctly handle
    	the UTF-8 source string and the return the correctly encoded
    	and escaped value.
    
    	Fixes [Bug #12052]
    
    Co-authored-by: default avatarNobuyoshi Nakada <nobu@ruby-lang.org>
    	---
    	 test/ruby/test_transcode.rb | 19 +++++++++++++++++++
    	 transcode.c                 |  6 ++++++
    	 2 files changed, 25 insertions(+)
    
    	=?UTF-8?q?-=20add=20regression=20tests=20for=20U+6E7F=20(?=
    	 =?UTF-8?q?=E6=B9=BF)=20in=20ISO-2022-JP?=
    	MIME-Version: 1.0
    	Content-Type: text/plain; charset=UTF-8
    	Content-Transfer-Encoding: 8bit
    
    	  In ISO-2022-JP, the bytes use to code are the same as those for "<>".
    	  This adds regression tests to make sure that these bytes, when representing
    	  湿, are NOT escaped with encode("ISO-2022-JP, xml: :text) or similar.
    	  These are additional regression tests for #12052.
    	---
    	 test/ruby/test_transcode.rb | 3 +++
    	 1 file changed, 3 insertions(+)
Loading