Skip to content

Commit 786df06

Browse files
committed
Revert "revert permanent redirect to match current logic in rustdoc redirects"
This reverts commit cdedb65.
1 parent 28aed9e commit 786df06

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

src/web/rustdoc.rs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,7 @@ pub fn rustdoc_redirector_handler(req: &mut Request) -> IronResult<Response> {
5454
}
5555
queries.extend(req.url.as_ref().query_pairs());
5656
let url = ctry!(req, parse_url_with_params(&url_str, queries));
57-
let status = if matches!(cache_policy, CachePolicy::ForeverInCdnAndBrowser) {
58-
status::MovedPermanently
59-
} else {
60-
status::Found
61-
};
62-
let mut resp = Response::with((status, Redirect(url)));
57+
let mut resp = Response::with((status::Found, Redirect(url)));
6358
resp.extensions.insert::<CachePolicy>(cache_policy);
6459
Ok(resp)
6560
}
@@ -195,7 +190,7 @@ pub fn rustdoc_redirector_handler(req: &mut Request) -> IronResult<Response> {
195190
};
196191

197192
let cache = if version == "latest" {
198-
CachePolicy::ForeverInCdnAndBrowser
193+
CachePolicy::ForeverInCdn
199194
} else {
200195
CachePolicy::ForeverInCdnAndStaleInBrowser
201196
};
@@ -1772,7 +1767,7 @@ mod test {
17721767
}
17731768

17741769
#[test]
1775-
fn test_redirect_to_latest_301() {
1770+
fn test_redirect_to_latest_302() {
17761771
wrapper(|env| {
17771772
env.fake_release().name("dummy").version("1.0.0").create()?;
17781773
let web = env.frontend();
@@ -1782,10 +1777,10 @@ mod test {
17821777
.unwrap();
17831778
let url = format!("http://{}/dummy", web.server_addr());
17841779
let resp = client.get(url).send()?;
1785-
assert_eq!(resp.status(), StatusCode::MOVED_PERMANENTLY);
1780+
assert_eq!(resp.status(), StatusCode::FOUND);
17861781
assert_eq!(
17871782
resp.headers().get("Cache-Control").unwrap(),
1788-
reqwest::header::HeaderValue::from_str("public, max-age=31104000").unwrap()
1783+
reqwest::header::HeaderValue::from_str("public").unwrap()
17891784
);
17901785
assert!(resp
17911786
.headers()

0 commit comments

Comments
 (0)