mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/socket/unixsocket.c (rsock_init_unixsock): Open a socket
after path length check. This fixes a fd leak by TestSocket_UNIXSocket#test_too_long_path. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46218 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
b73eaef7a8
commit
eb9f446ebf
5 changed files with 143 additions and 99 deletions
|
@ -45,36 +45,35 @@ class TestSocket_TCPSocket < Test::Unit::TestCase
|
|||
end
|
||||
|
||||
def test_recvfrom
|
||||
svr = TCPServer.new("localhost", 0)
|
||||
th = Thread.new {
|
||||
c = svr.accept
|
||||
c.write "foo"
|
||||
c.close
|
||||
TCPServer.open("localhost", 0) {|svr|
|
||||
th = Thread.new {
|
||||
c = svr.accept
|
||||
c.write "foo"
|
||||
c.close
|
||||
}
|
||||
addr = svr.addr
|
||||
TCPSocket.open(addr[3], addr[1]) {|sock|
|
||||
assert_equal(["foo", nil], sock.recvfrom(0x10000))
|
||||
}
|
||||
th.join
|
||||
}
|
||||
addr = svr.addr
|
||||
sock = TCPSocket.open(addr[3], addr[1])
|
||||
assert_equal(["foo", nil], sock.recvfrom(0x10000))
|
||||
ensure
|
||||
th.kill if th
|
||||
th.join if th
|
||||
end
|
||||
|
||||
def test_encoding
|
||||
svr = TCPServer.new("localhost", 0)
|
||||
th = Thread.new {
|
||||
c = svr.accept
|
||||
c.write "foo\r\n"
|
||||
c.close
|
||||
TCPServer.open("localhost", 0) {|svr|
|
||||
th = Thread.new {
|
||||
c = svr.accept
|
||||
c.write "foo\r\n"
|
||||
c.close
|
||||
}
|
||||
addr = svr.addr
|
||||
TCPSocket.open(addr[3], addr[1]) {|sock|
|
||||
assert_equal(true, sock.binmode?)
|
||||
s = sock.gets
|
||||
assert_equal("foo\r\n", s)
|
||||
assert_equal(Encoding.find("ASCII-8BIT"), s.encoding)
|
||||
}
|
||||
th.join
|
||||
}
|
||||
addr = svr.addr
|
||||
sock = TCPSocket.open(addr[3], addr[1])
|
||||
assert_equal(true, sock.binmode?)
|
||||
s = sock.gets
|
||||
assert_equal("foo\r\n", s)
|
||||
assert_equal(Encoding.find("ASCII-8BIT"), s.encoding)
|
||||
ensure
|
||||
th.kill if th
|
||||
th.join if th
|
||||
sock.close if sock
|
||||
end
|
||||
end if defined?(TCPSocket)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue