summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-02-25 10:58:02 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-02-25 10:58:02 +0000
commite41ee7cf3347ced6e689c198dbf3c5900009d70f (patch)
tree36ef38a948fb89793748d4f78ba6334efec214fb
parentabe1b00d16837ce5a1fc25167cb91489dac26bb2 (diff)
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_1@53936 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/socket/socket.c26
-rw-r--r--version.h2
3 files changed, 26 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index f407b73801..2216dd43ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 25 19:49:31 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/socket/socket.c (sock_gethostname): support unlimited size
+ hostname.
+
Thu Feb 25 19:28:19 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 05924323ba..13006abdb3 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -1000,14 +1000,28 @@ sock_gethostname(VALUE obj)
#ifndef HOST_NAME_MAX
# define HOST_NAME_MAX 1024
#endif
- char buf[HOST_NAME_MAX+1];
+ long len = HOST_NAME_MAX;
+ 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 7b5705bd44..c1953a672d 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.9"
#define RUBY_RELEASE_DATE "2016-02-25"
-#define RUBY_PATCHLEVEL 454
+#define RUBY_PATCHLEVEL 455
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 2