forked/hyper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(headers): add Expires header

Browse Source
This commit is contained in:
Sean McArthur
2014-11-30 15:47:02 -08:00
parent b1761ad4e1
commit e255f88dd2
4 changed files with 83 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/header/common/date.rs
View File

@@ -1,8 +1,8 @@
use header::{Header, HeaderFormat};
use std::fmt::{mod, Show};
use super::util::from_one_raw_str;
use std::str::FromStr;
use time::{Tm, strptime};
use time::Tm;
use header::{Header, HeaderFormat};
use super::util::{from_one_raw_str, tm_from_str};
// Egh, replace as soon as something better than time::Tm exists.
/// The `Date` header field.
@@ -21,17 +21,10 @@ impl Header for Date {
}
}
impl HeaderFormat for Date {
fn fmt_header(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
self.fmt(fmt)
}
}
impl fmt::Show for Date {
fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
let Date(ref tm) = *self;
// bummer that tm.strftime allocates a string. It would nice if it
// returned a Show instead, since I don't need the String here
let tm = **self;
match tm.tm_utcoff {
0 => tm.rfc822().fmt(fmt),
_ => tm.to_utc().rfc822().fmt(fmt)
@@ -40,34 +33,8 @@ impl fmt::Show for Date {
}
impl FromStr for Date {
// Prior to 1995, there were three different formats commonly used by
// servers to communicate timestamps. For compatibility with old
// implementations, all three are defined here. The preferred format is
// a fixed-length and single-zone subset of the date and time
// specification used by the Internet Message Format [RFC5322].
//
// HTTP-date = IMF-fixdate / obs-date
//
// An example of the preferred format is
//
// Sun, 06 Nov 1994 08:49:37 GMT ; IMF-fixdate
//
// Examples of the two obsolete formats are
//
// Sunday, 06-Nov-94 08:49:37 GMT ; obsolete RFC 850 format
// Sun Nov 6 08:49:37 1994 ; ANSI C's asctime() format
//
// A recipient that parses a timestamp value in an HTTP header field
// MUST accept all three HTTP-date formats. When a sender generates a
// header field that contains one or more timestamps defined as
// HTTP-date, the sender MUST generate those timestamps in the
// IMF-fixdate format.
fn from_str(s: &str) -> Option<Date> {
strptime(s, "%a, %d %b %Y %T %Z").or_else(|_| {
strptime(s, "%A, %d-%b-%y %T %Z")
}).or_else(|_| {
strptime(s, "%c")
}).ok().map(|tm| Date(tm))
tm_from_str(s).map(Date)
}
}