0.34.13_cleaup_code

src/cache/policy/response.rs

@@ -127,24 +127,23 @@ pub fn plan(
         Some(v) => httpdate::parse_http_date(v.to_str().ok()?).ok()?,
         None => now,
     };
-    let declared_ttl =
-        if override_public_no_cache {
-            Some(settings.default_ttl_seconds)
-        } else if let Some(value) = control.get("s-maxage").or_else(|| control.get("max-age")) {
-            Some(value.as_ref()?.parse::<u64>().ok()?)
-        } else if let Some(expires) = headers.get("expires") {
-            Some(
-                httpdate::parse_http_date(expires.to_str().ok()?)
-                    .ok()?
-                    .duration_since(date)
-                    .ok()?
-                    .as_secs(),
-            )
-        } else if control.contains_key("public") {
-            Some(settings.default_ttl_seconds)
-        } else {
-            None
-        };
+    let declared_ttl = if override_public_no_cache {
+        Some(settings.default_ttl_seconds)
+    } else if let Some(value) = control.get("s-maxage").or_else(|| control.get("max-age")) {
+        Some(value.as_ref()?.parse::<u64>().ok()?)
+    } else if let Some(expires) = headers.get("expires") {
+        Some(
+            httpdate::parse_http_date(expires.to_str().ok()?)
+                .ok()?
+                .duration_since(date)
+                .ok()?
+                .as_secs(),
+        )
+    } else if control.contains_key("public") {
+        Some(settings.default_ttl_seconds)
+    } else {
+        None
+    };
     let age = match headers.get("age") {
         Some(v) => v.to_str().ok()?.parse::<u64>().ok()?,
         None => 0,