Changeset 624

Show
Ignore:
Timestamp:
10/03/07 23:30:11 (1 year ago)
Author:
plindner
Message:

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>

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/server/ChangeLog

    r623 r624  
    1919        * The memcached-tool script can now display stats.  Patch 
    2020          provided by Dan Christian <dchristian@google.com> 
     21 
     22        * Fix for Unix Domain sockets on FreeBSD 
     23          FreeBSD's sendmsg() requires msg_name in msghdr structure  
     24          to be NULL if not used, setting msg_namelen to 0 isn't enough. 
     25          Patch from Maxim Dounin <mdounin@mdounin.ru> 
    2126 
    22272007-08-21 Paul Lindner <lindner@inuus.com> 

  • trunk/server/memcached.c

    r620 r624  
    219219 
    220220    msg->msg_iov = &c->iov[c->iovused]; 
    221     msg->msg_name = &c->request_addr; 
    222     msg->msg_namelen = c->request_addr_size; 
     221 
     222    if (c->request_addr_size > 0) { 
     223        msg->msg_name = &c->request_addr; 
     224        msg->msg_namelen = c->request_addr_size; 
     225    } 
    223226 
    224227    c->msgbytes = 0;