wberube
/
iptoasn-webservice
mirror of https://github.com/jedisct1/iptoasn-webservice
1
0
Fork 0
Code Issues Releases Wiki Activity

Format

This commit is contained in:
Frank Denis 2018-02-18 21:28:09 +01:00
parent 5f8505d80d
commit 81db1ff07b
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/webservice.rs
View File

@ -53,9 +53,10 @@ impl WebService {
SubLevel::Plain, SubLevel::Plain,
vec![(Attr::Charset, Value::Utf8)], vec![(Attr::Charset, Value::Utf8)],
), ),
Header(CacheControl( Header(CacheControl(vec![
vec![CacheDirective::Public, CacheDirective::MaxAge(TTL)], CacheDirective::Public,
)), CacheDirective::MaxAge(TTL),
])),
"See https://iptoasn.com", "See https://iptoasn.com",
))) )))
} }
@ -91,9 +92,13 @@ impl WebService {
SubLevel::Json, SubLevel::Json,
vec![(Attr::Charset, Value::Utf8)], vec![(Attr::Charset, Value::Utf8)],
); );
Ok(Response::with( Ok(Response::with((
(status::Ok, mime_json, cache_header, vary_header, json), status::Ok,
)) mime_json,
cache_header,
vary_header,
json,
)))
} }
fn output_html( fn output_html(
@ -154,13 +159,16 @@ impl WebService {
} }
} }
} }
} }.into_string()
.into_string()
.unwrap(); .unwrap();
let html = format!("<!DOCTYPE html>\n<html>{}</html>", html); let html = format!("<!DOCTYPE html>\n<html>{}</html>", html);
Ok(Response::with( Ok(Response::with((
(status::Ok, mime_html, cache_header, vary_header, html), status::Ok,
)) mime_html,
cache_header,
vary_header,
html,
)))
} }
fn output( fn output(
@ -181,9 +189,10 @@ impl WebService {
SubLevel::Plain, SubLevel::Plain,
vec![(Attr::Charset, Value::Utf8)], vec![(Attr::Charset, Value::Utf8)],
); );
let cache_header = Header(CacheControl( let cache_header = Header(CacheControl(vec![
vec![CacheDirective::Public, CacheDirective::MaxAge(TTL)], CacheDirective::Public,
)); CacheDirective::MaxAge(TTL),
]));
let vary_header = Header(Vary::Items(vec![ let vary_header = Header(Vary::Items(vec![
UniCase::from_str("accept-encoding").unwrap(), UniCase::from_str("accept-encoding").unwrap(),
UniCase::from_str("accept").unwrap(), UniCase::from_str("accept").unwrap(),