merge revision(s) 53677: [Backport #11877]

	* ext/socket/socket.c (sock_gethostname): support unlimited size
	  hostname.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@54070 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 28 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 89c615b5be..e1b19bcbdf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar 10 00:04:34 2016  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/socket/socket.c (sock_gethostname): support unlimited size
+	  hostname.
+
 Wed Mar  9 22:59:43 2016  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/xmlrpc/client.rb: Support SSL options in async methods of
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 81028c5afb..7a5eab55cf 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -1031,14 +1031,28 @@ sock_gethostname(VALUE obj)
 #  define RUBY_MAX_HOST_NAME_LEN 1024
 #endif
 
-    char buf[RUBY_MAX_HOST_NAME_LEN+1];
+    long len = RUBY_MAX_HOST_NAME_LEN;
+    VALUE name;
 
     rb_secure(3);
-    if (gethostname(buf, (int)sizeof buf - 1) < 0)
-	rb_sys_fail("gethostname(3)");
-
-    buf[sizeof buf - 1] = '\0';
-    return rb_str_new2(buf);
+    name = rb_str_new(0, len);
+    while (gethostname(RSTRING_PTR(name), len) < 0) {
+	int e = errno;
+	switch (e) {
+	  case ENAMETOOLONG:
+#ifdef __linux__
+	  case EINVAL:
+	    /* glibc before version 2.1 uses EINVAL instead of ENAMETOOLONG */
+#endif
+	    break;
+	  default:
+	    rb_syserr_fail(e, "gethostname(3)");
+	}
+	rb_str_modify_expand(name, len);
+	len += len;
+    }
+    rb_str_resize(name, strlen(RSTRING_PTR(name)));
+    return name;
 }
 #else
 #ifdef HAVE_UNAME
diff --git a/version.h b/version.h
index 4747ac1224..ba11108a20 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.2.5"
-#define RUBY_RELEASE_DATE "2016-03-09"
-#define RUBY_PATCHLEVEL 253
+#define RUBY_RELEASE_DATE "2016-03-10"
+#define RUBY_PATCHLEVEL 254
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 9
+#define RUBY_RELEASE_DAY 10
 
 #include "ruby/version.h"