Merge pull request #49 from vi/optional_tls

Make TLS support optional

Author: TheWaWaR

Cargo.toml

@@ -19,7 +19,7 @@ flate2 = "1.0.11"
 filetime = "0.2.7"
 pretty-bytes = "0.2.2"
 url = "2.1.0"
-hyper-native-tls = "0.3.0"
+hyper-native-tls = {version = "0.3.0", optional=true}
 mime_guess = "2.0"
 open = "1"
 # Iron crates
@@ -29,3 +29,7 @@ multipart = { version = "0.16.1", features = ["iron"] }
 htmlescape = "0.3.1"
 percent-encoding = "2.1.0"
 path-dedot = "1"
+
+[features]
+default = ["tls"]
+tls = ["hyper-native-tls"]

src/main.rs

@@ -345,13 +345,28 @@ fn main() {
     }
     let mut server = Iron::new(chain);
     server.threads = threads as usize;
+
+    #[cfg(feature = "tls")]
     let rv = if let Some(cert) = cert {
         use hyper_native_tls::NativeTlsServer;
         let ssl = NativeTlsServer::new(cert, certpass.unwrap_or("")).unwrap();
         server.https(&addr, ssl)
     } else {
         server.http(&addr)
     };
+    #[cfg(not(feature = "tls"))]
+    let rv = if cert.is_some() {
+        printer
+            .println_err(
+                "{}: TLS support is not enabled during compilation of simple-http-server",
+                &[("ERROR", &Some(build_spec(Some(Color::Red), true)))],
+            )
+            .unwrap();
+        std::process::exit(1)
+    } else {
+        server.http(&addr)
+    };
+
     if let Err(e) = rv {
         printer
             .println_err(