From: Igor Sysoev <igor@sysoev.ru>
Date: Sat, 4 Apr 2009 17:22:26 +0000 (+0000)
Subject: update r2664
X-Git-Tag: release-0.7.48~6
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=054c505050d45983c6c8ab6ebf2b2ccc246e00e0;p=nginx.git

update r2664
---

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;