1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

merge revision(s) 58552: [Backport #13531]

rss: Accept empty text element as valid element

	Parser has been accepted it but XML serializer wasn't accepted.

	Reported by stefano frabetti. Thanks!!!

	[ruby-core:80965] [Bug #13531]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@59236 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2017-06-30 12:48:27 +00:00
parent 127c8a219f
commit 30519c0b6a
4 changed files with 33 additions and 2 deletions

View file

@ -1,3 +1,10 @@
Fri Jun 30 21:46:50 2017 Kouhei Sutou <kou@cozmixng.org>
* lib/rss/rss.rb: Accept empty text element as valid element
Parser has been accepted it but XML serializer wasn't accepted.
Reported by stefano frabetti. Thanks!!!
[Bug #13531]
Fri Jun 30 21:40:42 2017 Kazuki Yamaguchi <k@rhe.jp>
* ext/openssl/ossl_x509store.c: clear error queue after calling

View file

@ -963,7 +963,7 @@ EOC
children = child
children.any? {|c| c.have_required_elements?}
else
!child.to_s.empty?
not child.nil?
end
else
true

View file

@ -109,6 +109,30 @@ module RSS
'[ruby-core:70667] [Bug #11509]')
end
def test_20_empty_text
title = "Blog entries"
link = "http://blog.example.com/"
description = ""
rss = RSS::Maker.make("2.0") do |maker|
maker.channel.title = title
maker.channel.link = link
maker.channel.description = description
end
parsed_rss = RSS::Parser.parse(rss.to_s)
assert_equal({
title: title,
link: link,
description: description,
},
{
title: parsed_rss.channel.title,
link: parsed_rss.channel.link,
description: parsed_rss.channel.description,
},
"[ruby-core:80965] [Bug #13531]")
end
private
def setup_xml_declaration_info
@version = "1.0"

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.3.5"
#define RUBY_RELEASE_DATE "2017-06-30"
#define RUBY_PATCHLEVEL 332
#define RUBY_PATCHLEVEL 333
#define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 6