diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/socket/option.c | 9 | ||||
| -rw-r--r-- | test/socket/test_sockopt.rb | 6 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 20 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Thu Feb 25 18:59:27 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/socket/option.c (sockopt_bool): relax boolean size to be one + too not only sizeof(int). Winsock getsockopt() returns a single + byte as a boolean socket option. [ruby-core:72730] [Bug #11958] + Thu Feb 25 18:36:26 2016 NAKAMURA Usaku <usa@ruby-lang.org> * process.c (rb_execarg_parent_start1): need to convert the encoding to diff --git a/ext/socket/option.c b/ext/socket/option.c index 28bdc07db6..90bbca553b 100644 --- a/ext/socket/option.c +++ b/ext/socket/option.c @@ -268,11 +268,16 @@ static VALUE sockopt_bool(VALUE self) { int i; + long len; VALUE data = sockopt_data(self); StringValue(data); - if (RSTRING_LEN(data) != sizeof(int)) + len = RSTRING_LEN(data); + if (len == 1) { + return *RSTRING_PTR(data) == 0 ? Qfalse : Qtrue; + } + if (len != sizeof(int)) rb_raise(rb_eTypeError, "size differ. expected as sizeof(int)=%d but %ld", - (int)sizeof(int), (long)RSTRING_LEN(data)); + (int)sizeof(int), (long)len); memcpy((char*)&i, RSTRING_PTR(data), sizeof(int)); return i == 0 ? Qfalse : Qtrue; } diff --git a/test/socket/test_sockopt.rb b/test/socket/test_sockopt.rb index d1f6f29c34..f085a4f0c4 100644 --- a/test/socket/test_sockopt.rb +++ b/test/socket/test_sockopt.rb @@ -23,6 +23,12 @@ class TestSocketOption < Test::Unit::TestCase assert_equal(true, opt.bool) opt = Socket::Option.int(:INET, :SOCKET, :KEEPALIVE, 2) assert_equal(true, opt.bool) + Socket.open(:INET, :STREAM) {|s| + s.setsockopt(Socket::Option.bool(:INET, :SOCKET, :KEEPALIVE, true)) + assert_equal(true, s.getsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE).bool) + s.setsockopt(Socket::Option.bool(:INET, :SOCKET, :KEEPALIVE, false)) + assert_equal(false, s.getsockopt(Socket::SOL_SOCKET, Socket::SO_KEEPALIVE).bool) + } end def test_ipv4_multicast_loop @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.1.9" #define RUBY_RELEASE_DATE "2016-02-25" -#define RUBY_PATCHLEVEL 450 +#define RUBY_PATCHLEVEL 451 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 2 |