* ext/socket/socket.c (family_arg): accept symbols as well.

  (socktype_arg): ditto.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21257 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 6 insertions, 0 deletions

diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb
index 4c88177c9..130b1f439 100644
--- a/test/socket/test_socket.rb
+++ b/test/socket/test_socket.rb
@@ -109,6 +109,11 @@ class TestSocket < Test::Unit::TestCase
       assert_nothing_raised { Socket.unpack_sockaddr_in(addr) }
       assert_raise(ArgumentError) { Socket.unpack_sockaddr_un(addr) }
     }
+    Socket.open(:AF_INET, :SOCK_STREAM, 0) {|s|
+      addr = s.getsockname
+      assert_nothing_raised { Socket.unpack_sockaddr_in(addr) }
+      assert_raise(ArgumentError) { Socket.unpack_sockaddr_un(addr) }
+    }
   end
 
   def test_getaddrinfo
diff --git a/test/socket/test_udp.rb b/test/socket/test_udp.rb
index 4893a1f3c..9a45a86cb 100644
--- a/test/socket/test_udp.rb
+++ b/test/socket/test_udp.rb
@@ -10,6 +10,7 @@ class TestUDPSocket < Test::Unit::TestCase
     assert_nothing_raised { UDPSocket.open {} }
     assert_nothing_raised { UDPSocket.open(Socket::AF_INET) {} }
     assert_nothing_raised { UDPSocket.open("AF_INET") {} }
+    assert_nothing_raised { UDPSocket.open(:AF_INET) {} }
     if defined? Socket::AF_INET6
       assert_nothing_raised { UDPSocket.open(Socket::AF_INET6) {} }
     end