changeset 2667:c1ac00c2bc75

update r2664
author Igor Sysoev <igor@sysoev.ru>
date Sat, 04 Apr 2009 17:22:26 +0000
parents 81556a9b6488
children 2f9c37445ffb
files src/http/ngx_http_upstream.c
diffstat 1 files changed, 11 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -2891,25 +2891,22 @@ ngx_http_upstream_process_accel_expires(
         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--;
-
-        n = ngx_atoi(p, len);
-
-        if (n != NGX_ERROR) {
-            r->cache->valid_sec = n;
-        }
+    }
+
+    p++;
+    len--;
+
+    n = ngx_atoi(p, len);
+
+    if (n != NGX_ERROR) {
+        r->cache->valid_sec = n;
     }
 
     return NGX_OK;