* 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
iain · Apr 16, 2004 · be8d0c6 · be8d0c6
1 parent 31d1468
commit be8d0c6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git 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
@@ -207,6 +207,7 @@
   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) {