summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-04-16 05:01:34 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-04-16 05:01:34 +0000
commitbe8d0c6711b0adea0d56c004c9c44e9130ad2a75 (patch)
tree22adf0168a950c28ee7da119b122613386e0df8e
parent31d1468b35484061e5b948654544bcc3c98600fd (diff)
downloadruby-be8d0c6711b0adea0d56c004c9c44e9130ad2a75.tar.gz
* ext/socket/extconf.rb: Merge from 1.8: explicity specify
IPPROTO_TCP as a SOCK_STREAM protocol to use, when it is not the only protocol. KAME, for example, supports other SOCK_STREAM protocols such as SCTP. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@6174 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--ext/socket/extconf.rb1
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b95191f329..d57d563c12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Apr 16 13:48:29 2004 Akinori MUSHA <knu@iDaemons.org>
+
+ * ext/socket/extconf.rb: Merge from 1.8: explicity specify
+ IPPROTO_TCP as a SOCK_STREAM protocol to use, when it is not the
+ only protocol. KAME, for example, supports other SOCK_STREAM
+ protocols such as SCTP.
+
Sun Nov 2 17:53:09 2003 WATANABE Hirofumi <eban@ruby-lang.org>
* cygwin/GNUmakefile: allow "B" type in defined symbols.
diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
index 02b410cafc..2e98cd4d33 100644
--- a/ext/socket/extconf.rb
+++ b/ext/socket/extconf.rb
@@ -207,6 +207,7 @@ main()
for (passive = 0; passive <= 1; passive++) {
memset(&hints, 0, sizeof(hints));
hints.ai_family = AF_UNSPEC;
+ hints.ai_protocol = IPPROTO_TCP;
hints.ai_flags = passive ? AI_PASSIVE : 0;
hints.ai_socktype = SOCK_STREAM;
if ((gaierr = getaddrinfo(NULL, "54321", &hints, &aitop)) != 0) {