allow setting s-maxage for pages too

Author: syphar

src/config.rs

@@ -62,11 +62,13 @@ pub struct Config {
     // generate just that directive. Values are in seconds.
     pub(crate) cache_control_stale_while_revalidate: Option<u32>,
     pub(crate) cache_control_max_age: Option<u32>,
+    pub(crate) cache_control_s_max_age: Option<u32>,
 
     // Cache-Control header, for /latest/ URLs.
     // Same conditions as above apply.
     pub(crate) cache_control_stale_while_revalidate_latest: Option<u32>,
     pub(crate) cache_control_max_age_latest: Option<u32>,
+    pub(crate) cache_control_s_max_age_latest: Option<u32>,
 
     pub(crate) cdn_backend: CdnKind,
 
@@ -151,11 +153,13 @@ impl Config {
                 "CACHE_CONTROL_STALE_WHILE_REVALIDATE",
             )?,
             cache_control_max_age: maybe_env("CACHE_CONTROL_MAX_AGE")?,
+            cache_control_s_max_age: maybe_env("CACHE_CONTROL_S_MAX_AGE")?,
 
             cache_control_stale_while_revalidate_latest: maybe_env(
                 "CACHE_CONTROL_STALE_WHILE_REVALIDATE_LATEST",
             )?,
             cache_control_max_age_latest: maybe_env("CACHE_CONTROL_MAX_AGE_LATEST")?,
+            cache_control_s_max_age_latest: maybe_env("CACHE_CONTROL_S_MAX_AGE_LATEST")?,
 
             cdn_backend: env("DOCSRS_CDN_BACKEND", CdnKind::Dummy)?,
 

src/web/rustdoc.rs

@@ -39,6 +39,7 @@ static DOC_RUST_LANG_ORG_REDIRECTS: Lazy<HashMap<&str, &str>> = Lazy::new(|| {
 
 fn generate_cache_directives_for(
     max_age: Option<u32>,
+    s_max_age: Option<u32>,
     stale_while_revalidate: Option<u32>,
 ) -> Option<CacheControl> {
     let mut directives = vec![];
@@ -54,6 +55,10 @@ fn generate_cache_directives_for(
         directives.push(CacheDirective::MaxAge(seconds));
     }
 
+    if let Some(seconds) = s_max_age {
+        directives.push(CacheDirective::SMaxAge(seconds));
+    }
+
     if !directives.is_empty() {
         Some(CacheControl(directives))
     } else {
@@ -285,11 +290,13 @@ impl RustdocPage {
         let cache_control = if is_latest_url {
             generate_cache_directives_for(
                 Some(config.cache_control_max_age_latest.unwrap_or(0)),
+                config.cache_control_s_max_age_latest,
                 config.cache_control_stale_while_revalidate_latest,
             )
         } else {
             generate_cache_directives_for(
                 config.cache_control_max_age,
+                config.cache_control_s_max_age,
                 config.cache_control_stale_while_revalidate,
             )
         };
@@ -973,7 +980,9 @@ mod test {
         wrapper(|env| {
             env.override_config(|config| {
                 config.cache_control_max_age = Some(666);
+                config.cache_control_s_max_age = Some(777);
                 config.cache_control_max_age_latest = Some(999);
+                config.cache_control_s_max_age_latest = Some(888);
                 config.cache_control_stale_while_revalidate = Some(2222222);
                 config.cache_control_stale_while_revalidate_latest = Some(3333333);
             });
@@ -991,15 +1000,15 @@ mod test {
                 let resp = web.get("/dummy/latest/dummy/").send()?;
                 assert_eq!(
                     resp.headers().get("Cache-Control").unwrap(),
-                    &"stale-while-revalidate=3333333, max-age=999"
+                    &"stale-while-revalidate=3333333, max-age=999, s-maxage=888"
                 );
             }
 
             {
                 let resp = web.get("/dummy/0.1.0/dummy/").send()?;
                 assert_eq!(
                     resp.headers().get("Cache-Control").unwrap(),
-                    &"stale-while-revalidate=2222222, max-age=666"
+                    &"stale-while-revalidate=2222222, max-age=666, s-maxage=777"
                 );
             }
             Ok(())