* ext/socket/raddrinfo.c (rsock_unix_sockaddr_len): return

sizeof(sa_familiy_t) if path is empty.  see "Autobind Feature" in
  unix(7) for details.

* ext/socket/lib/socket.rb (unix_socket_abstract_name?): treat an
  empty path as an abstract name.

* test/socket/test_unix.rb: related test.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38994 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shugo 2013-01-31 04:59:31 +00:00
parent 1ff38a5bbf
commit 4ccfb2743f
4 changed files with 46 additions and 4 deletions

View file

@ -542,7 +542,11 @@ class TestSocket_UNIXSocket < Test::Unit::TestCase
s0 = s
UNIXSocket.open(name) {|c|
sock = s.accept
assert_equal(name, c.remote_address.unix_path)
begin
assert_equal(name, c.remote_address.unix_path)
ensure
sock.close
end
}
}
assert(s0.closed?)
@ -565,7 +569,30 @@ class TestSocket_UNIXSocket < Test::Unit::TestCase
s0 = s
Socket.unix(name) {|c|
sock, = s.accept
assert_equal(name, c.remote_address.unix_path)
begin
assert_equal(name, c.remote_address.unix_path)
ensure
sock.close
end
}
}
assert(s0.closed?)
end
def test_autobind
return if /linux/ !~ RUBY_PLATFORM
s0 = nil
Socket.unix_server_socket("") {|s|
name = s.local_address.unix_path
assert_match(/\A\0[0-9a-f]{5}\z/, name)
s0 = s
Socket.unix(name) {|c|
sock, = s.accept
begin
assert_equal(name, c.remote_address.unix_path)
ensure
sock.close
end
}
}
assert(s0.closed?)