comparison src/os/unix/ngx_freebsd_sendfile_chain.c @ 654:753f505670e0 NGINX_1_1_11

nginx 1.1.11 *) Feature: the "so_keepalive" parameter of the "listen" directive. Thanks to Vsevolod Stakhov. *) Feature: the "if_not_empty" parameter of the "fastcgi/scgi/uwsgi_param" directives. *) Feature: the $https variable. *) Feature: the "proxy_redirect" directive supports variables in the first parameter. *) Feature: the "proxy_redirect" directive supports regular expressions. *) Bugfix: the $sent_http_cache_control variable might contain a wrong value if the "expires" directive was used. Thanks to Yichun Zhang. *) Bugfix: the "read_ahead" directive might not work combined with "try_files" and "open_file_cache". *) Bugfix: a segmentation fault might occur in a worker process if small time was used in the "inactive" parameter of the "proxy_cache_path" directive. *) Bugfix: responses from cache might hang.
author Igor Sysoev <http://sysoev.ru>
date Mon, 12 Dec 2011 00:00:00 +0400
parents eb208e0cf44d
children d0f7a625f27c
comparison
equal deleted inserted replaced
653:8c96af2112c1 654:753f505670e0
244 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, 244 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
245 "tcp_nopush"); 245 "tcp_nopush");
246 } 246 }
247 } 247 }
248 248
249 hdtr.headers = (struct iovec *) header.elts; 249 /*
250 * sendfile() does unneeded work if sf_hdtr's count is 0,
251 * but corresponding pointer is not NULL
252 */
253
254 hdtr.headers = header.nelts ? (struct iovec *) header.elts: NULL;
250 hdtr.hdr_cnt = header.nelts; 255 hdtr.hdr_cnt = header.nelts;
251 hdtr.trailers = (struct iovec *) trailer.elts; 256 hdtr.trailers = trailer.nelts ? (struct iovec *) trailer.elts: NULL;
252 hdtr.trl_cnt = trailer.nelts; 257 hdtr.trl_cnt = trailer.nelts;
253 258
254 /* 259 /*
255 * the "nbytes bug" of the old sendfile() syscall: 260 * the "nbytes bug" of the old sendfile() syscall:
256 * http://www.freebsd.org/cgi/query-pr.cgi?pr=33771 261 * http://www.freebsd.org/cgi/query-pr.cgi?pr=33771