archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 17:43:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) r44642: [Backport #9093]

Browse source 
* lib/resolv.rb (Resolv::DNS::Resource::TXT#data): Return concatenated
	  string.
	  Patch by Ryan Brunner.  [ruby-core:58220] [Bug #9093]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@44983 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2014-02-15 15:55:08 +00:00
parent 9187fefa4d
commit 5d5fb5f2b4
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sun Feb 16 00:54:50 2014 Tanaka Akira <akr@fsij.org>
* lib/resolv.rb (Resolv::DNS::Resource::TXT#data): Return concatenated
string.
Patch by Ryan Brunner. [ruby-core:58220] [Bug #9093]
Sun Feb 16 00:50:59 2014 Zachary Scott <e@zzak.io> Sun Feb 16 00:50:59 2014 Zachary Scott <e@zzak.io>
* ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Szuecs [Bug #9243] * ext/openssl/ossl_pkey_dh.c: Fixed typo by Sandor Szuecs [Bug #9243]

4
lib/resolv.rb
View file

@ -1943,10 +1943,10 @@ class Resolv
attr_reader :strings attr_reader :strings
## ##
# Returns the first string from +strings+. # Returns the concatenated string from +strings+.
def data def data
@strings[0] @strings.join("")
end end
def encode_rdata(msg) # :nodoc: def encode_rdata(msg) # :nodoc:

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0" #define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2014-02-16" #define RUBY_RELEASE_DATE "2014-02-16"
#define RUBY_PATCHLEVEL 417 #define RUBY_PATCHLEVEL 418
#define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 2 #define RUBY_RELEASE_MONTH 2