nagachika	2016-03-24 20:52:00 +0900 (Thu, 24 Mar 2016)

  New Revision: 54247

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54247

  Log:
    merge revision(s) 54139: [Backport #12185]
    
    * ext/socket/option.c (inspect_tcpi_msec): more accurate condition
      for TCPI msec member inspection function.
      [ruby-core:74388] [Bug #12185]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/ext/socket/option.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 54246)
+++ ruby_2_2/version.h	(revision 54247)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #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"
 
Index: ruby_2_2/ext/socket/option.c
===================================================================
--- ruby_2_2/ext/socket/option.c	(revision 54246)
+++ ruby_2_2/ext/socket/option.c	(revision 54247)
@@ -933,7 +933,12 @@ inspect_tcpi_usec(VALUE ret, const char https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/socket/option.c#L933
     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)
 {
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 54246)
+++ ruby_2_2/ChangeLog	(revision 54247)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Thu Mar 24 20:39:58 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@g...>
 
 	* lib/logger.rb: Remove block from Logger.add as it's not needed

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r54139


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/