Mercurial > hg > nginx-vendor-current
comparison src/http/ngx_http_upstream.c @ 668:9fbf3ad94cbf NGINX_1_1_18
nginx 1.1.18
*) Change: keepalive connections are no longer disabled for Safari by
default.
*) Feature: the $connection_requests variable.
*) Feature: $tcpinfo_rtt, $tcpinfo_rttvar, $tcpinfo_snd_cwnd and
$tcpinfo_rcv_space variables.
*) Feature: the "worker_cpu_affinity" directive now works on FreeBSD.
*) Feature: the "xslt_param" and "xslt_string_param" directives.
Thanks to Samuel Behan.
*) Bugfix: in configure tests.
Thanks to Piotr Sikora.
*) Bugfix: in the ngx_http_xslt_filter_module.
*) Bugfix: nginx could not be built on Debian GNU/Hurd.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Wed, 28 Mar 2012 00:00:00 +0400 |
parents | f5b859b2f097 |
children | ad45b044f1e5 |
comparison
equal
deleted
inserted
replaced
667:e0eabdb2bad1 | 668:9fbf3ad94cbf |
---|---|
3310 n = ngx_atoi(p, len); | 3310 n = ngx_atoi(p, len); |
3311 | 3311 |
3312 switch (n) { | 3312 switch (n) { |
3313 case 0: | 3313 case 0: |
3314 u->cacheable = 0; | 3314 u->cacheable = 0; |
3315 /* fall through */ | |
3316 | |
3315 case NGX_ERROR: | 3317 case NGX_ERROR: |
3316 return NGX_OK; | 3318 return NGX_OK; |
3317 | 3319 |
3318 default: | 3320 default: |
3319 r->cache->valid_sec = ngx_time() + n; | 3321 r->cache->valid_sec = ngx_time() + n; |
4458 return NGX_CONF_OK; | 4460 return NGX_CONF_OK; |
4459 | 4461 |
4460 case NGX_DECLINED: | 4462 case NGX_DECLINED: |
4461 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | 4463 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
4462 "invalid address \"%V\"", &value[1]); | 4464 "invalid address \"%V\"", &value[1]); |
4465 /* fall through */ | |
4466 | |
4463 default: | 4467 default: |
4464 return NGX_CONF_ERROR; | 4468 return NGX_CONF_ERROR; |
4465 } | 4469 } |
4466 } | 4470 } |
4467 | 4471 |