Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7424803cbb93
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cc619c063b21
Choose a head ref

Commits on Sep 12, 2016

  1. First pass at compatibility work on socket subsystem.

    This is based on specs created by @yorickpeterse for the
    rubysl/rubysl-socket move to a pure-ruby socket lib.
    
    Among the changes thusfar:
    
    * Many improvements to Addrinfo, including leveraging the JDK APIs
      better and having less state. More address types work correctly
      now.
    * Socket now handles more types of sockets, including servers.
    * Improvements to addressing behavior across all socket types.
    * In-progress refactoring of socket classes to be reusable from
      Socket grab-bag.
    
    At the moment there are around 565 specs tagged.
    headius authored and etehtsea committed Sep 12, 2016
    Copy the full SHA
    09d1654 View commit details
  2. Revert lazy socket initialization changes.

    Will be made in the separate PR
    etehtsea committed Sep 12, 2016
    Copy the full SHA
    1c39c2d View commit details
  3. Fix TCPServer#initialize

    etehtsea committed Sep 12, 2016
    Copy the full SHA
    6a79100 View commit details
  4. Fix Addrinfo#inspect_sockaddr

    Also tested using specs from ruby/spec#287
    etehtsea committed Sep 12, 2016
    Copy the full SHA
    0b9c7ab View commit details
  5. Copy the full SHA
    ac1e4f9 View commit details
  6. Fix Addrinfo#ip_address

    etehtsea committed Sep 12, 2016
    Copy the full SHA
    51fe6f3 View commit details
  7. Partially fix Addrinfo#inspect

    Fix regression exposed by jruby/test_addrinfo test
    etehtsea committed Sep 12, 2016
    Copy the full SHA
    16da3b9 View commit details

Commits on Sep 13, 2016

  1. Add Socket.unpack_sockaddr_un fn

    Remove (un)pack_sockaddr_un specs from excludes
    etehtsea committed Sep 13, 2016
    Copy the full SHA
    74cf138 View commit details
  2. Copy the full SHA
    56b5301 View commit details
  3. Copy the full SHA
    4e62621 View commit details
  4. Copy the full SHA
    42c6d3b View commit details
  5. Finally fix Socket.(un)pack_sockaddr_un

    Covered by ruby/spec#290
    etehtsea committed Sep 13, 2016
    Copy the full SHA
    a440003 View commit details
  6. Fix TCPSocket#recv_nonblock

    etehtsea committed Sep 13, 2016
    Copy the full SHA
    bce9285 View commit details
  7. Fix RubyBasicSocket#getsockname

    Bring back fallback for unbinded socket
    etehtsea committed Sep 13, 2016
    Copy the full SHA
    25c28ee View commit details
  8. Copy the full SHA
    0949edb View commit details
  9. Copy the full SHA
    4862d2d View commit details
  10. Add missing AI constants.

    headius authored and etehtsea committed Sep 13, 2016
    Copy the full SHA
    120b70c View commit details
  11. Set up protocol better.

    headius authored and etehtsea committed Sep 13, 2016
    Copy the full SHA
    da40a15 View commit details
  12. Copy the full SHA
    3219afe View commit details
  13. Eliminate "19" versions of these.

    headius authored and etehtsea committed Sep 13, 2016
    Copy the full SHA
    53a70b0 View commit details
  14. Improvements for Addrinfo.getaddrinfo.

    headius authored and etehtsea committed Sep 13, 2016
    Copy the full SHA
    8990eb6 View commit details
  15. Implement Addrinfo#nameinfo.

    headius authored and etehtsea committed Sep 13, 2016
    Copy the full SHA
    590cac8 View commit details
  16. Copy the full SHA
    06178b2 View commit details
  17. Copy the full SHA
    85681bd View commit details
  18. Accept numeric strings for port.

    headius authored and etehtsea committed Sep 13, 2016
    Copy the full SHA
    e50459e View commit details
  19. Copy the full SHA
    b31c953 View commit details

Commits on Sep 14, 2016

  1. Revert abstract/NotAllocatable changes

    Make RubyBasicSocket and RubyIPSocket allocatable to match MRI behaviour
    etehtsea committed Sep 14, 2016
    Copy the full SHA
    7275cef View commit details

Commits on Sep 22, 2016

  1. Copy the full SHA
    cc619c0 View commit details
Showing with 1,038 additions and 631 deletions.
  1. +401 −159 core/src/main/java/org/jruby/ext/socket/Addrinfo.java
  2. +82 −68 core/src/main/java/org/jruby/ext/socket/RubyBasicSocket.java
  3. +82 −76 core/src/main/java/org/jruby/ext/socket/RubyIPSocket.java
  4. +19 −8 core/src/main/java/org/jruby/ext/socket/RubyServerSocket.java
  5. +103 −49 core/src/main/java/org/jruby/ext/socket/RubySocket.java
  6. +21 −12 core/src/main/java/org/jruby/ext/socket/RubyTCPServer.java
  7. +65 −49 core/src/main/java/org/jruby/ext/socket/RubyUDPSocket.java
  8. +18 −1 core/src/main/java/org/jruby/ext/socket/RubyUNIXServer.java
  9. +2 −0 core/src/main/java/org/jruby/ext/socket/RubyUNIXSocket.java
  10. +10 −0 core/src/main/java/org/jruby/ext/socket/SocketType.java
  11. +60 −92 core/src/main/java/org/jruby/ext/socket/SocketUtils.java
  12. +6 −0 core/src/main/java/org/jruby/runtime/Helpers.java
  13. +169 −53 core/src/main/java/org/jruby/util/io/Sockaddr.java
  14. +0 −1 spec/tags/ruby/library/socket/addrinfo/afamily_tags.txt
  15. +0 −1 spec/tags/ruby/library/socket/addrinfo/canonname_tags.txt
  16. +0 −19 spec/tags/ruby/library/socket/addrinfo/initialize_tags.txt
  17. +0 −2 spec/tags/ruby/library/socket/addrinfo/inspect_sockaddr_tags.txt
  18. +0 −2 spec/tags/ruby/library/socket/addrinfo/ip_address_tags.txt
  19. +0 −1 spec/tags/ruby/library/socket/addrinfo/ip_port_tags.txt
  20. +0 −1 spec/tags/ruby/library/socket/addrinfo/ip_tags.txt
  21. +0 −2 spec/tags/ruby/library/socket/addrinfo/ip_unpack_tags.txt
  22. +0 −1 spec/tags/ruby/library/socket/addrinfo/ipv4_loopback_tags.txt
  23. +0 −2 spec/tags/ruby/library/socket/addrinfo/ipv4_multicast_tags.txt
  24. +0 −4 spec/tags/ruby/library/socket/addrinfo/ipv4_private_tags.txt
  25. +0 −1 spec/tags/ruby/library/socket/addrinfo/ipv4_tags.txt
  26. +0 −1 spec/tags/ruby/library/socket/addrinfo/ipv6_loopback_tags.txt
  27. +0 −2 spec/tags/ruby/library/socket/addrinfo/ipv6_multicast_tags.txt
  28. +0 −1 spec/tags/ruby/library/socket/addrinfo/ipv6_tags.txt
  29. +0 −1 spec/tags/ruby/library/socket/addrinfo/pfamily_tags.txt
  30. +0 −1 spec/tags/ruby/library/socket/addrinfo/protocol_tags.txt
  31. +0 −1 spec/tags/ruby/library/socket/addrinfo/socktype_tags.txt
  32. +0 −1 spec/tags/ruby/library/socket/addrinfo/tcp_tags.txt
  33. +0 −1 spec/tags/ruby/library/socket/addrinfo/to_s_tags.txt
  34. +0 −1 spec/tags/ruby/library/socket/addrinfo/to_sockaddr_tags.txt
  35. +0 −1 spec/tags/ruby/library/socket/addrinfo/udp_tags.txt
  36. +0 −3 spec/tags/ruby/library/socket/addrinfo/unix_path_tags.txt
  37. +0 −2 spec/tags/ruby/library/socket/addrinfo/unix_tags.txt
  38. +0 −1 spec/tags/ruby/library/socket/socket/pack_sockaddr_un_tags.txt
  39. +0 −1 spec/tags/ruby/library/socket/socket/sockaddr_un_tags.txt
  40. +0 −3 spec/tags/ruby/library/socket/udpsocket/send_tags.txt
  41. +0 −2 spec/tags/ruby/library/socket/unixsocket/recv_io_tags.txt
  42. +0 −1 spec/tags/ruby/library/socket/unixsocket/send_io_tags.txt
  43. +0 −1 test/mri/excludes/TestSocket.rb
  44. +0 −2 test/mri/excludes/TestSocketAddrinfo.rb
Loading