From ef06648615d6ce6e000e6c737f80c2ba9fa04d3a Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Mon, 21 Jun 2004 15:59:32 +0000 Subject: nginx-0.0.7-2004-06-21-19:59:32 import --- src/os/unix/ngx_process_cycle.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/os/unix/ngx_process_cycle.c') diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c index 818676ae9..fec4210d7 100644 --- a/src/os/unix/ngx_process_cycle.c +++ b/src/os/unix/ngx_process_cycle.c @@ -786,7 +786,7 @@ ngx_int_t ngx_write_channel(ngx_socket_t s, ngx_channel_t *ch, size_t size, cmsg.cm.cmsg_len = sizeof(cmsg); cmsg.cm.cmsg_level = SOL_SOCKET; cmsg.cm.cmsg_type = SCM_RIGHTS; - *(int *) CMSG_DATA(&cmsg) = ch->fd; + *(int *) CMSG_DATA(&cmsg.cm) = ch->fd; } #else @@ -896,7 +896,7 @@ ngx_int_t ngx_read_channel(ngx_socket_t s, ngx_channel_t *ch, size_t size, return NGX_ERROR; } - ch->fd = *(int *) CMSG_DATA(&cmsg); + ch->fd = *(int *) CMSG_DATA(&cmsg.cm); } if (msg.msg_flags & (MSG_TRUNC|MSG_CTRUNC)) { -- cgit v1.2.3