summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-10 12:15:54 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-10 12:15:54 +0000
commita038fab64970fd76d336aa57a2993f71f631695d (patch)
treebb0cc626ac5a8c0f932b6cb739ffd3af62aa0b24
parent98d3eca7fc092e0237f6cfd06bb5cf58d3796d36 (diff)
* ext/socket/socket.c (sockaddr_obj): fill pfamily.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22211 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/socket/socket.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 11f7f58bb2..4184f916d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb 10 21:14:43 2009 Tanaka Akira <akr@fsij.org>
+
+ * ext/socket/socket.c (sockaddr_obj): fill pfamily.
+
Tue Feb 10 21:09:23 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/option.c (sockopt_s_bool): new method.
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 796cee4c4d..7e33de1411 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -1432,7 +1432,7 @@ sockaddr_obj(struct sockaddr *addr)
len = SA_LEN(addr);
#endif
- return addrinfo_new(addr, len, 0, 0, 0, Qnil, Qnil);
+ return addrinfo_new(addr, len, addr->sa_family, 0, 0, Qnil, Qnil);
}
#endif