jruby · May 26, 2015 · May 26, 2015 · May 26, 2015
Showing with 5 additions and 4 deletions.

+4 −1 core/src/main/java/org/jruby/ext/socket/RubySocket.java

+1 −1 spec/ruby/library/socket/shared/socketpair.rb

+0 −1 spec/tags/ruby/library/socket/socket/pair_tags.txt

+0 −1 spec/tags/ruby/library/socket/socket/socketpair_tags.txt
diff --git a/core/src/main/java/org/jruby/ext/socket/RubySocket.java b/core/src/main/java/org/jruby/ext/socket/RubySocket.java
@@ -334,8 +334,9 @@ public static IRubyObject ip_address_list(ThreadContext context, IRubyObject sel
     @JRubyMethod(name = {"socketpair", "pair"}, meta = true)
     public static IRubyObject socketpair(ThreadContext context, IRubyObject recv, IRubyObject domain, IRubyObject type, IRubyObject protocol) {
         ProtocolFamily pf = SocketUtils.protocolFamilyFromArg(protocol);
+        if (pf == null ) pf = ProtocolFamily.PF_UNIX;
 
-        if (pf != pf.PF_UNIX) {
+        if (pf != ProtocolFamily.PF_UNIX && pf.ordinal() != 0) {
             throw context.runtime.newErrnoEOPNOTSUPPError("Socket.socketpair only supports streaming UNIX sockets");
         }
 
@@ -345,7 +346,9 @@ public static IRubyObject socketpair(ThreadContext context, IRubyObject recv, IR
     @JRubyMethod(name = {"socketpair", "pair"}, meta = true)
     public static IRubyObject socketpair(ThreadContext context, IRubyObject recv, IRubyObject domain, IRubyObject type) {
         AddressFamily af = SocketUtils.addressFamilyFromArg(domain);
+        if (af == null) af = AddressFamily.AF_UNIX;
         Sock s = SocketUtils.sockFromArg(type);
+        if (s == null) s = Sock.SOCK_STREAM;
 
         if (af != AddressFamily.AF_UNIX || s != Sock.SOCK_STREAM) {
             throw context.runtime.newErrnoEOPNOTSUPPError("Socket.socketpair only supports streaming UNIX sockets");

diff --git a/spec/ruby/library/socket/shared/socketpair.rb b/spec/ruby/library/socket/shared/socketpair.rb
@@ -1,5 +1,5 @@
 describe :socket_socketpair, :shared => true do
-  not_supported_on :jruby, :windows do
+  not_supported_on :windows do
     it "ensures the returned sockets are connected" do
       s1, s2 = Socket.socketpair(Socket::AF_UNIX, 1, 0)
       s1.puts("test")

diff --git a/spec/tags/ruby/library/socket/socket/pair_tags.txt b/spec/tags/ruby/library/socket/socket/pair_tags.txt
diff --git a/spec/tags/ruby/library/socket/socket/socketpair_tags.txt b/spec/tags/ruby/library/socket/socket/socketpair_tags.txt