Mercurial > hg > nginx-vendor-current
comparison src/mail/ngx_mail.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 | 98143f74eb3d |
children | d0f7a625f27c |
comparison
equal
deleted
inserted
replaced
653:8c96af2112c1 | 654:753f505670e0 |
---|---|
306 addr->sockaddr = (struct sockaddr *) &listen->sockaddr; | 306 addr->sockaddr = (struct sockaddr *) &listen->sockaddr; |
307 addr->socklen = listen->socklen; | 307 addr->socklen = listen->socklen; |
308 addr->ctx = listen->ctx; | 308 addr->ctx = listen->ctx; |
309 addr->bind = listen->bind; | 309 addr->bind = listen->bind; |
310 addr->wildcard = listen->wildcard; | 310 addr->wildcard = listen->wildcard; |
311 addr->so_keepalive = listen->so_keepalive; | |
312 #if (NGX_HAVE_KEEPALIVE_TUNABLE) | |
313 addr->tcp_keepidle = listen->tcp_keepidle; | |
314 addr->tcp_keepintvl = listen->tcp_keepintvl; | |
315 addr->tcp_keepcnt = listen->tcp_keepcnt; | |
316 #endif | |
311 #if (NGX_MAIL_SSL) | 317 #if (NGX_MAIL_SSL) |
312 addr->ssl = listen->ssl; | 318 addr->ssl = listen->ssl; |
313 #endif | 319 #endif |
314 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY) | 320 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY) |
315 addr->ipv6only = listen->ipv6only; | 321 addr->ipv6only = listen->ipv6only; |
370 | 376 |
371 /* TODO: error_log directive */ | 377 /* TODO: error_log directive */ |
372 ls->logp = &cf->cycle->new_log; | 378 ls->logp = &cf->cycle->new_log; |
373 ls->log.data = &ls->addr_text; | 379 ls->log.data = &ls->addr_text; |
374 ls->log.handler = ngx_accept_log_error; | 380 ls->log.handler = ngx_accept_log_error; |
381 | |
382 ls->keepalive = addr[i].so_keepalive; | |
383 #if (NGX_HAVE_KEEPALIVE_TUNABLE) | |
384 ls->keepidle = addr[i].tcp_keepidle; | |
385 ls->keepintvl = addr[i].tcp_keepintvl; | |
386 ls->keepcnt = addr[i].tcp_keepcnt; | |
387 #endif | |
375 | 388 |
376 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY) | 389 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY) |
377 ls->ipv6only = addr[i].ipv6only; | 390 ls->ipv6only = addr[i].ipv6only; |
378 #endif | 391 #endif |
379 | 392 |