diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | memcached.c | 7 |
2 files changed, 10 insertions, 2 deletions
@@ -19,6 +19,11 @@ * The memcached-tool script can now display stats. Patch provided by Dan Christian <dchristian@google.com> + * Fix for Unix Domain sockets on FreeBSD + FreeBSD's sendmsg() requires msg_name in msghdr structure + to be NULL if not used, setting msg_namelen to 0 isn't enough. + Patch from Maxim Dounin <mdounin@mdounin.ru> + 2007-08-21 Paul Lindner <lindner@inuus.com> * Incorporate incrememnt patch from Evan Miller <emiller@imvu.com> to define increment overflow diff --git a/memcached.c b/memcached.c index 42969aa..d8e717d 100644 --- a/memcached.c +++ b/memcached.c @@ -218,8 +218,11 @@ static int add_msghdr(conn *c) memset(msg, 0, sizeof(struct msghdr)); msg->msg_iov = &c->iov[c->iovused]; - msg->msg_name = &c->request_addr; - msg->msg_namelen = c->request_addr_size; + + if (c->request_addr_size > 0) { + msg->msg_name = &c->request_addr; + msg->msg_namelen = c->request_addr_size; + } c->msgbytes = 0; c->msgused++; |