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

merge revision(s) 44312,44318: [Backport #9273]

Browse source 
* lib/resolv.rb (Resolv::Hosts#lazy_initialize): should not
	  consider encodings in hosts file.  [ruby-core:59239] [Bug #9273]

	* lib/resolv.rb (Resolv::Config.parse_resolv_conf): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45075 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2014-02-21 09:08:45 +00:00
parent 862b86f2e4
commit 14a3402357
5 changed files with 33 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Fri Feb 21 17:42:42 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/resolv.rb (Resolv::Hosts#lazy_initialize): should not
consider encodings in hosts file. [ruby-core:59239] [Bug #9273]
* lib/resolv.rb (Resolv::Config.parse_resolv_conf): ditto.
Fri Feb 21 16:47:20 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (get_encoding): respect BOM on pseudo encodings.

4
lib/resolv.rb
View file

@ -187,7 +187,7 @@ class Resolv
unless @initialized
@name2addr = {}
@addr2name = {}
open(@filename) {|f|
open(@filename, 'rb') {|f|
f.each {|line|
line.sub!(/#.*/, '')
addr, hostname, *aliases = line.split(/\s+/)
@ -920,7 +920,7 @@ class Resolv
nameserver = []
search = nil
ndots = 1
open(filename) {|f|
open(filename, 'rb') {|f|
f.each {|line|
line.sub!(/[#;].*/, '')
keyword, *args = line.split(/\s+/)

12
test/resolv/test_addr.rb
View file

@ -13,4 +13,16 @@ class TestResolvAddr < Test::Unit::TestCase
end
}
end
def test_invalid_byte_comment
bug9273 = '[ruby-core:59239] [Bug #9273]'
Tempfile.open('resolv_test_addr_') do |tmpfile|
tmpfile.print("\xff\x00\x40")
tmpfile.close
hosts = Resolv::Hosts.new(tmpfile.path)
assert_nothing_raised(ArgumentError, bug9273) do
hosts.each_address("") {break}
end
end
end
end

11
test/resolv/test_dns.rb
View file

@ -1,6 +1,7 @@
require 'test/unit'
require 'resolv'
require 'socket'
require 'tempfile'
class TestResolvDNS < Test::Unit::TestCase
def setup
@ -150,4 +151,14 @@ class TestResolvDNS < Test::Unit::TestCase
}
end
def test_invalid_byte_comment
bug9273 = '[ruby-core:59239] [Bug #9273]'
Tempfile.open('resolv_test_dns_') do |tmpfile|
tmpfile.print("\xff\x00\x40")
tmpfile.close
assert_nothing_raised(ArgumentError, bug9273) do
Resolv::DNS::Config.parse_resolv_conf(tmpfile.path)
end
end
end
end

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.1"
#define RUBY_RELEASE_DATE "2014-02-21"
#define RUBY_PATCHLEVEL 41
#define RUBY_PATCHLEVEL 42
#define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 2