From dd3a2aa68acedffb81631cd6e8ca7be4294955e1 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Tue, 26 Dec 2017 14:36:03 -0800
Subject: [PATCH] add HttpServer::server_hostname method

---
 examples/basic.rs |  3 +--
 src/info.rs       |  4 +---
 src/server.rs     | 26 ++++++++++++++++++++------
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/examples/basic.rs b/examples/basic.rs
index 42d29e8ad..9beecbcde 100644
--- a/examples/basic.rs
+++ b/examples/basic.rs
@@ -87,8 +87,7 @@ fn main() {
             .resource("/", |r| r.method(Method::GET).f(|req| {
                 println!("{:?}", req);
 
-                httpcodes::HTTPFound
-                    .build()
+                HttpResponse::Found()
                     .header("LOCATION", "/index.html")
                     .finish()
             })))
diff --git a/src/info.rs b/src/info.rs
index 76cf678ea..92ffa4d6c 100644
--- a/src/info.rs
+++ b/src/info.rs
@@ -8,9 +8,6 @@ const X_FORWARDED_PROTO: &str = "X-FORWARDED-PROTO";
 
 
 /// `HttpRequest` connection information
-///
-/// While it is possible to create `ConnectionInfo` directly,
-/// consider using `HttpRequest::load_connection_info()` which cache result.
 pub struct ConnectionInfo<'a> {
     scheme: &'a str,
     host: &'a str,
@@ -138,6 +135,7 @@ impl<'a> ConnectionInfo<'a> {
     /// - X-Forwarded-Host
     /// - Host
     /// - Uri
+    /// - Server hostname
     pub fn host(&self) -> &str {
         self.host
     }
diff --git a/src/server.rs b/src/server.rs
index d1ce80a6a..e5ee5c50e 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -53,11 +53,13 @@ impl Default for ServerSettings {
 
 impl ServerSettings {
     /// Crate server settings instance
-    fn new(addr: Option<net::SocketAddr>, secure: bool) -> Self {
-        let host = if let Some(ref addr) = addr {
+    fn new(addr: Option<net::SocketAddr>, host: &Option<String>, secure: bool) -> Self {
+        let host = if let Some(ref host) = *host {
+            host.clone()
+        } else if let Some(ref addr) = addr {
             format!("{}", addr)
         } else {
-            "unknown".to_owned()
+            "localhost".to_owned()
         };
         ServerSettings {
             addr: addr,
@@ -97,6 +99,7 @@ pub struct HttpServer<T, A, H, U>
     addr: PhantomData<A>,
     threads: usize,
     backlog: i32,
+    host: Option<String>,
     keep_alive: Option<u64>,
     factory: Arc<Fn() -> U + Send + Sync>,
     workers: Vec<SyncAddress<Worker<H>>>,
@@ -134,6 +137,7 @@ impl<T, A, H, U, V> HttpServer<T, A, H, U>
                     addr: PhantomData,
                     threads: num_cpus::get(),
                     backlog: 2048,
+                    host: None,
                     keep_alive: None,
                     factory: Arc::new(factory),
                     workers: Vec::new(),
@@ -175,6 +179,16 @@ impl<T, A, H, U, V> HttpServer<T, A, H, U>
         self
     }
 
+    /// Set server host name.
+    ///
+    /// Host name is used by application router aa a hostname for url generation.
+    /// Check [ConnectionInfo](./dev/struct.ConnectionInfo.html#method.host) documentation
+    /// for more information.
+    pub fn server_hostname(mut self, val: String) -> Self {
+        self.host = Some(val);
+        self
+    }
+
     /// The socket address to bind
     ///
     /// To mind multiple addresses this method can be call multiple times.
@@ -291,7 +305,7 @@ impl<H: HttpHandler, U, V> HttpServer<TcpStream, net::SocketAddr, H, U>
             panic!("HttpServer::bind() has to be called befor start()");
         } else {
             let addrs: Vec<(net::SocketAddr, Socket)> = self.sockets.drain().collect();
-            let settings = ServerSettings::new(Some(addrs[0].0), false);
+            let settings = ServerSettings::new(Some(addrs[0].0), &self.host, false);
             let workers = self.start_workers(&settings, &StreamHandlerType::Normal);
 
             // start acceptors threads
@@ -395,7 +409,7 @@ impl<T, A, H, U, V> HttpServer<T, A, H, U>
     {
         if !self.sockets.is_empty() {
             let addrs: Vec<(net::SocketAddr, Socket)> = self.sockets.drain().collect();
-            let settings = ServerSettings::new(Some(addrs[0].0), false);
+            let settings = ServerSettings::new(Some(addrs[0].0), &self.host, false);
             let workers = self.start_workers(&settings, &StreamHandlerType::Normal);
 
             // start acceptors threads
@@ -407,7 +421,7 @@ impl<T, A, H, U, V> HttpServer<T, A, H, U>
 
         // set server settings
         let addr: net::SocketAddr = "127.0.0.1:8080".parse().unwrap();
-        let settings = ServerSettings::new(Some(addr), secure);
+        let settings = ServerSettings::new(Some(addr), &self.host, secure);
         let mut apps: Vec<_> = (*self.factory)().into_iter().map(|h| h.into_handler()).collect();
         for app in &mut apps {
             app.server_settings(settings.clone());