summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-04-04 17:22:26 +0000
committerIgor Sysoev <igor@sysoev.ru>2009-04-04 17:22:26 +0000
commit054c505050d45983c6c8ab6ebf2b2ccc246e00e0 (patch)
treefb44a0610a5d8af907114862d41e455d0dcfeb6d
parentc8298bf3ee909243ca6fe109e9e54d979c403435 (diff)
downloadnginx-054c505050d45983c6c8ab6ebf2b2ccc246e00e0.tar.gz
nginx-054c505050d45983c6c8ab6ebf2b2ccc246e00e0.tar.bz2
update r2664
-rw-r--r--src/http/ngx_http_upstream.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index cbc53a2f0..4de936aef 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -2891,25 +2891,22 @@ ngx_http_upstream_process_accel_expires(ngx_http_request_t *r,
switch (n) {
case 0:
r->upstream->cacheable = 0;
- break;
-
case NGX_ERROR:
- break;
+ return NGX_OK;
default:
r->cache->valid_sec = ngx_time() + n;
- break;
+ return NGX_OK;
}
+ }
- } else {
- p++;
- len--;
+ p++;
+ len--;
- n = ngx_atoi(p, len);
+ n = ngx_atoi(p, len);
- if (n != NGX_ERROR) {
- r->cache->valid_sec = n;
- }
+ if (n != NGX_ERROR) {
+ r->cache->valid_sec = n;
}
return NGX_OK;