comparison src/os/unix/ngx_freebsd_sendfile_chain.c @ 644:ad25218fd14b NGINX_1_0_12

nginx 1.0.12 *) Feature: the "TLSv1.1" and "TLSv1.2" parameters of the "ssl_protocols" directive. *) Feature: the "if" SSI command supports captures in regular expressions. *) Bugfix: the "if" SSI command did not work inside the "block" command. *) Bugfix: in AIO error handling on FreeBSD. *) Bugfix: in the OpenSSL library initialization. *) Bugfix: the "worker_cpu_affinity" directive might not work. *) Bugfix: the "limit_conn_log_level" and "limit_req_log_level" directives might not work. *) Bugfix: the "read_ahead" directive might not work combined with "try_files" and "open_file_cache". *) Bugfix: the "proxy_cache_use_stale" directive with "error" parameter did not return answer from cache if there were no live upstreams. *) 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. *) Bugfix: in error handling while connecting to a backend. Thanks to Piotr Sikora. *) Bugfix: in the "epoll" event method. Thanks to Yichun Zhang. *) Bugfix: the $sent_http_cache_control variable might contain a wrong value if the "expires" directive was used. Thanks to Yichun Zhang. *) Bugfix: the "limit_rate" directive did not allow to use full throughput, even if limit value was very high. *) Bugfix: the "sendfile_max_chunk" directive did not work, if the "limit_rate" directive was used. *) Bugfix: nginx could not be built on Solaris; the bug had appeared in 1.0.11. *) Bugfix: in the ngx_http_scgi_module. *) Bugfix: in the ngx_http_mp4_module.
author Igor Sysoev <http://sysoev.ru>
date Mon, 06 Feb 2012 00:00:00 +0400
parents 692f4d4d7f10
children 09a689c5e494
comparison
equal deleted inserted replaced
643:d81e1c257a02 644:ad25218fd14b
1 1
2 /* 2 /*
3 * Copyright (C) Igor Sysoev 3 * Copyright (C) Igor Sysoev
4 * Copyright (C) Nginx, Inc.
4 */ 5 */
5 6
6 7
7 #include <ngx_config.h> 8 #include <ngx_config.h>
8 #include <ngx_core.h> 9 #include <ngx_core.h>
244 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0, 245 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, 0,
245 "tcp_nopush"); 246 "tcp_nopush");
246 } 247 }
247 } 248 }
248 249
249 hdtr.headers = (struct iovec *) header.elts; 250 /*
251 * sendfile() does unneeded work if sf_hdtr's count is 0,
252 * but corresponding pointer is not NULL
253 */
254
255 hdtr.headers = header.nelts ? (struct iovec *) header.elts: NULL;
250 hdtr.hdr_cnt = header.nelts; 256 hdtr.hdr_cnt = header.nelts;
251 hdtr.trailers = (struct iovec *) trailer.elts; 257 hdtr.trailers = trailer.nelts ? (struct iovec *) trailer.elts: NULL;
252 hdtr.trl_cnt = trailer.nelts; 258 hdtr.trl_cnt = trailer.nelts;
253 259
254 /* 260 /*
255 * the "nbytes bug" of the old sendfile() syscall: 261 * the "nbytes bug" of the old sendfile() syscall:
256 * http://www.freebsd.org/cgi/query-pr.cgi?pr=33771 262 * http://www.freebsd.org/cgi/query-pr.cgi?pr=33771