comparison src/os/unix/ngx_channel.c @ 366:babd3d9efb62 NGINX_0_6_27

nginx 0.6.27 *) Change: now by default the rtsig method is not built on Linux 2.6.18+. *) Change: now a request method is not changed while redirection to a named location via an "error_page" directive. *) Feature: the "resolver" and "resolver_timeout" directives in SMTP proxy. *) Feature: the "post_action" directive supports named locations. *) Bugfix: a segmentation fault occurred in worker process, if a request was redirected from proxy, FastCGI, or memcached location to static named locations. *) Bugfix: browsers did not repeat SSL handshake if there is no valid client certificate in first handshake. Thanks to Alexander V. Inyukhin. *) Bugfix: if response code 495-497 was redirected via an "error_page" directive without code change, then nginx tried to allocate too many memory. *) Bugfix: memory leak in long-lived non buffered connections. *) Bugfix: memory leak in resolver. *) Bugfix: a segmentation fault occurred in worker process, if a request was redirected from proxy, FastCGI, or memcached location to static named locations. *) Bugfix: in the $proxy_host and $proxy_port variables caching. Thanks to Sergey Bochenkov. *) Bugfix: a "proxy_pass" directive with variables used incorrectly the same port as in another "proxy_pass" directive with the same host name and without variables. Thanks to Sergey Bochenkov. *) Bugfix: an alert "sendmsg() failed (9: Bad file descriptor)" on some 64-bit platforms while reconfiguration. *) Bugfix: a segmentation fault occurred in worker process, if empty stub block was used second time in SSI. *) Bugfix: in copying URI part contained escaped symbols into arguments.
author Igor Sysoev <http://sysoev.ru>
date Wed, 12 Mar 2008 00:00:00 +0300
parents df17fbafec8f
children 2da4537168f8
comparison
equal deleted inserted replaced
365:9b0140fa1132 366:babd3d9efb62
31 31
32 } else { 32 } else {
33 msg.msg_control = (caddr_t) &cmsg; 33 msg.msg_control = (caddr_t) &cmsg;
34 msg.msg_controllen = sizeof(cmsg); 34 msg.msg_controllen = sizeof(cmsg);
35 35
36 cmsg.cm.cmsg_len = sizeof(cmsg); 36 cmsg.cm.cmsg_len = CMSG_LEN(sizeof(int));
37 cmsg.cm.cmsg_level = SOL_SOCKET; 37 cmsg.cm.cmsg_level = SOL_SOCKET;
38 cmsg.cm.cmsg_type = SCM_RIGHTS; 38 cmsg.cm.cmsg_type = SCM_RIGHTS;
39 *(int *) CMSG_DATA(&cmsg.cm) = ch->fd; 39 *(int *) CMSG_DATA(&cmsg.cm) = ch->fd;
40 } 40 }
41 41
136 136
137 #if (NGX_HAVE_MSGHDR_MSG_CONTROL) 137 #if (NGX_HAVE_MSGHDR_MSG_CONTROL)
138 138
139 if (ch->command == NGX_CMD_OPEN_CHANNEL) { 139 if (ch->command == NGX_CMD_OPEN_CHANNEL) {
140 140
141 if (cmsg.cm.cmsg_len < (socklen_t) sizeof(cmsg)) { 141 if (cmsg.cm.cmsg_len < (socklen_t) CMSG_LEN(sizeof(int))) {
142 ngx_log_error(NGX_LOG_ALERT, log, 0, 142 ngx_log_error(NGX_LOG_ALERT, log, 0,
143 "recvmsg() returned too small ancillary data"); 143 "recvmsg() returned too small ancillary data");
144 return NGX_ERROR; 144 return NGX_ERROR;
145 } 145 }
146 146