nagachika	2019-03-12 21:59:25 +0900 (Tue, 12 Mar 2019)

  New Revision: 67228

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

  Log:
    merge revision(s) 64636,64637: [Backport #15659]
    
    AIX doesn't set OptionLength for boolean options
    
    https://rubyci.org/logs/rubyci.s3.amazonaws.com/aix71_ppc/ruby-trunk/log/20180904T103302Z.fail.html.gz
    https://www.ibm.com/support/knowledgecenter/ja/ssw_aix_72/com.ibm.aix.commtrf2/getsockopt.htm
    
    fix typo

  Modified directories:
    branches/ruby_2_5/
  Modified files:
    branches/ruby_2_5/ext/socket/basicsocket.c
    branches/ruby_2_5/version.h
Index: ruby_2_5/ext/socket/basicsocket.c
===================================================================
--- ruby_2_5/ext/socket/basicsocket.c	(revision 67227)
+++ ruby_2_5/ext/socket/basicsocket.c	(revision 67228)
@@ -314,6 +314,18 @@ bsock_getsockopt(VALUE sock, VALUE lev, https://github.com/ruby/ruby/blob/trunk/ruby_2_5/ext/socket/basicsocket.c#L314
     level = rsock_level_arg(family, lev);
     option = rsock_optname_arg(family, level, optname);
     len = 256;
+#ifdef _AIX
+    switch (option) {
+      case SO_DEBUG:
+      case SO_REUSEADDR:
+      case SO_KEEPALIVE:
+      case SO_DONTROUTE:
+      case SO_BROADCAST:
+      case SO_OOBINLINE:
+        /* AIX doesn' set len for boolean options */
+        len = sizeof(int);
+    }
+#endif
     buf = ALLOCA_N(char,len);
 
     rb_io_check_closed(fptr);
Index: ruby_2_5/version.h
===================================================================
--- ruby_2_5/version.h	(revision 67227)
+++ ruby_2_5/version.h	(revision 67228)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/version.h#L1
 #define RUBY_VERSION "2.5.4"
-#define RUBY_RELEASE_DATE "2019-03-11"
-#define RUBY_PATCHLEVEL 144
+#define RUBY_RELEASE_DATE "2019-03-12"
+#define RUBY_PATCHLEVEL 145
 
 #define RUBY_RELEASE_YEAR 2019
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 11
+#define RUBY_RELEASE_DAY 12
 
 #include "ruby/version.h"
 
Index: ruby_2_5
===================================================================
--- ruby_2_5	(revision 67227)
+++ ruby_2_5	(revision 67228)

Property changes on: ruby_2_5
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r64636-64637

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