diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ext/socket/option.c | 7 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 15 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Thu Mar 24 20:39:58 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/socket/option.c (inspect_tcpi_msec): more accurate condition + for TCPI msec member inspection function. + [ruby-core:74388] [Bug #12185] + Thu Mar 10 00:22:25 2016 Naotoshi Seo <sonots@gmail.com> * lib/logger.rb: Remove block from Logger.add as it's not needed diff --git a/ext/socket/option.c b/ext/socket/option.c index 7eb21c73a4..c6f5717a44 100644 --- a/ext/socket/option.c +++ b/ext/socket/option.c @@ -933,7 +933,12 @@ inspect_tcpi_usec(VALUE ret, const char *prefix, uint32_t t) rb_str_catf(ret, "%s%u.%06us", prefix, t / 1000000, t % 1000000); } -#if defined(__linux__) || defined(__sun) +#if !defined __FreeBSD__ && ( \ + defined HAVE_STRUCT_TCP_INFO_TCPI_LAST_DATA_SENT || \ + defined HAVE_STRUCT_TCP_INFO_TCPI_LAST_DATA_RECV || \ + defined HAVE_STRUCT_TCP_INFO_TCPI_LAST_ACK_SENT || \ + defined HAVE_STRUCT_TCP_INFO_TCPI_LAST_ACK_RECV || \ + 0) static void inspect_tcpi_msec(VALUE ret, const char *prefix, uint32_t t) { @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.2.5" -#define RUBY_RELEASE_DATE "2016-03-10" -#define RUBY_PATCHLEVEL 256 +#define RUBY_RELEASE_DATE "2016-03-24" +#define RUBY_PATCHLEVEL 257 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 10 +#define RUBY_RELEASE_DAY 24 #include "ruby/version.h" |