cached rustlangredirector

Author: syphar

src/config.rs

@@ -38,7 +38,6 @@ pub struct Config {
     // Time between 'git gc --auto' calls in seconds
     pub(crate) registry_gc_interval: u64,
 
-<<<<<<< HEAD
     // random crate search generates a number of random IDs to
     // efficiently find a random crate with > 100 GH stars.
     // The amount depends on the ratio of crates with >100 stars
@@ -47,10 +46,8 @@ pub struct Config {
     // `500` for a ratio of 7249 over 54k crates.
     // For unit-tests the number has to be higher.
     pub(crate) random_crate_search_view_size: u32,
-=======
     // CDN / caching settings
     pub(crate) cache_rustdoc_redirects: u32,
->>>>>>> 53d35de (Set CDN caching headers for rustdoc redirects)
 
     // Build params
     pub(crate) build_attempts: u16,

src/web/rustdoc.rs

@@ -12,7 +12,6 @@ use crate::{
 use iron::url::percent_encoding::percent_decode;
 use iron::{
     headers::{CacheControl, CacheDirective, Expires, HttpDate},
-    modifiers::Redirect,
     status, Handler, IronResult, Request, Response, Url,
 };
 use lol_html::errors::RewritingError;
@@ -37,8 +36,12 @@ impl RustLangRedirector {
 }
 
 impl iron::Handler for RustLangRedirector {
-    fn handle(&self, _req: &mut Request) -> IronResult<Response> {
-        Ok(Response::with((status::Found, Redirect(self.url.clone()))))
+    fn handle(&self, req: &mut Request) -> IronResult<Response> {
+        let config = extension!(req, Config);
+        Ok(super::cached_redirect(
+            self.url.clone(),
+            config.cache_rustdoc_redirects,
+        ))
     }
 }