refactor(header): Host header internals made private
This allows us to improve the performance. For now, a Cow is used internally, so clients can set the host to a static value and no longer need copies. Later, we can change it to also possibly have a MemSlice. BREAKING CHANGE: The fields of the `Host` header are no longer available. Use the getter methods instead.
This commit is contained in:
@@ -1,27 +1,22 @@
|
||||
use header::{Header, Raw};
|
||||
use std::borrow::Cow;
|
||||
use std::fmt;
|
||||
use std::str::FromStr;
|
||||
|
||||
use header::{Header, Raw};
|
||||
use header::parsing::from_one_raw_str;
|
||||
use url::idna::domain_to_unicode;
|
||||
|
||||
/// The `Host` header.
|
||||
///
|
||||
/// HTTP/1.1 requires that all requests include a `Host` header, and so hyper
|
||||
/// client requests add one automatically.
|
||||
///
|
||||
/// Currently is just a String, but it should probably become a better type,
|
||||
/// like `url::Host` or something.
|
||||
///
|
||||
/// # Examples
|
||||
/// ```
|
||||
/// use hyper::header::{Headers, Host};
|
||||
///
|
||||
/// let mut headers = Headers::new();
|
||||
/// headers.set(
|
||||
/// Host{
|
||||
/// hostname: "hyper.rs".to_owned(),
|
||||
/// port: None,
|
||||
/// }
|
||||
/// Host::new("hyper.rs", None)
|
||||
/// );
|
||||
/// ```
|
||||
/// ```
|
||||
@@ -29,18 +24,36 @@ use url::idna::domain_to_unicode;
|
||||
///
|
||||
/// let mut headers = Headers::new();
|
||||
/// headers.set(
|
||||
/// Host{
|
||||
/// hostname: "hyper.rs".to_owned(),
|
||||
/// port: Some(8080),
|
||||
/// }
|
||||
/// Host::new("hyper.rs", 8080)
|
||||
/// );
|
||||
/// ```
|
||||
#[derive(Clone, PartialEq, Debug)]
|
||||
pub struct Host {
|
||||
/// The hostname, such a example.domain.
|
||||
pub hostname: String,
|
||||
/// An optional port number.
|
||||
pub port: Option<u16>
|
||||
hostname: Cow<'static, str>,
|
||||
port: Option<u16>
|
||||
}
|
||||
|
||||
impl Host {
|
||||
/// Create a `Host` header, providing the hostname and optional port.
|
||||
pub fn new<H, P>(hostname: H, port: P) -> Host
|
||||
where H: Into<Cow<'static, str>>,
|
||||
P: Into<Option<u16>>
|
||||
{
|
||||
Host {
|
||||
hostname: hostname.into(),
|
||||
port: port.into(),
|
||||
}
|
||||
}
|
||||
|
||||
/// Get the hostname, such as example.domain.
|
||||
pub fn hostname(&self) -> &str {
|
||||
self.hostname.as_ref()
|
||||
}
|
||||
|
||||
/// Get the optional port number.
|
||||
pub fn port(&self) -> Option<u16> {
|
||||
self.port
|
||||
}
|
||||
}
|
||||
|
||||
impl Header for Host {
|
||||
@@ -75,27 +88,14 @@ impl FromStr for Host {
|
||||
let port = idx.and_then(
|
||||
|idx| s[idx + 1..].parse().ok()
|
||||
);
|
||||
let hostname_encoded = match port {
|
||||
let hostname = match port {
|
||||
None => s,
|
||||
Some(_) => &s[..idx.unwrap()]
|
||||
};
|
||||
|
||||
let hostname = if hostname_encoded.starts_with("[") {
|
||||
if !hostname_encoded.ends_with("]") {
|
||||
return Err(::Error::Header)
|
||||
}
|
||||
hostname_encoded.to_owned()
|
||||
} else {
|
||||
let (hostname, res) = domain_to_unicode(hostname_encoded);
|
||||
if res.is_err() {
|
||||
return Err(::Error::Header)
|
||||
}
|
||||
hostname
|
||||
};
|
||||
|
||||
Ok(Host {
|
||||
hostname: hostname,
|
||||
port: port
|
||||
hostname: hostname.to_owned().into(),
|
||||
port: port,
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -109,35 +109,20 @@ mod tests {
|
||||
#[test]
|
||||
fn test_host() {
|
||||
let host = Header::parse_header(&vec![b"foo.com".to_vec()].into());
|
||||
assert_eq!(host.ok(), Some(Host {
|
||||
hostname: "foo.com".to_owned(),
|
||||
port: None
|
||||
}));
|
||||
assert_eq!(host.ok(), Some(Host::new("foo.com", None)));
|
||||
|
||||
|
||||
let host = Header::parse_header(&vec![b"foo.com:8080".to_vec()].into());
|
||||
assert_eq!(host.ok(), Some(Host {
|
||||
hostname: "foo.com".to_owned(),
|
||||
port: Some(8080)
|
||||
}));
|
||||
assert_eq!(host.ok(), Some(Host::new("foo.com", 8080)));
|
||||
|
||||
let host = Header::parse_header(&vec![b"foo.com".to_vec()].into());
|
||||
assert_eq!(host.ok(), Some(Host {
|
||||
hostname: "foo.com".to_owned(),
|
||||
port: None
|
||||
}));
|
||||
assert_eq!(host.ok(), Some(Host::new("foo.com", None)));
|
||||
|
||||
let host = Header::parse_header(&vec![b"[::1]:8080".to_vec()].into());
|
||||
assert_eq!(host.ok(), Some(Host {
|
||||
hostname: "[::1]".to_owned(),
|
||||
port: Some(8080)
|
||||
}));
|
||||
assert_eq!(host.ok(), Some(Host::new("[::1]", 8080)));
|
||||
|
||||
let host = Header::parse_header(&vec![b"[::1]".to_vec()].into());
|
||||
assert_eq!(host.ok(), Some(Host {
|
||||
hostname: "[::1]".to_owned(),
|
||||
port: None
|
||||
}));
|
||||
assert_eq!(host.ok(), Some(Host::new("[::1]", None)));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -43,10 +43,7 @@ impl Origin {
|
||||
pub fn new<S: Into<String>, H: Into<String>>(scheme: S, hostname: H, port: Option<u16>) -> Origin{
|
||||
Origin {
|
||||
scheme: scheme.into(),
|
||||
host: Host {
|
||||
hostname: hostname.into(),
|
||||
port: port
|
||||
}
|
||||
host: Host::new(hostname.into(), port),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user