enable ssl feature

.travis.yml

@@ -32,12 +32,12 @@ script:
   - |
     if [[ "$TRAVIS_RUST_VERSION" != "stable" ]]; then
     cargo clean
-    cargo test --features="" -- --nocapture
+    cargo test --features="ssl" -- --nocapture
     fi
   - |
     if [[ "$TRAVIS_RUST_VERSION" == "stable" ]]; then
     RUSTFLAGS="--cfg procmacro2_semver_exempt" cargo install -f cargo-tarpaulin
-    cargo tarpaulin --features="" --out Xml --no-count
+    cargo tarpaulin --features="ssl" --out Xml --no-count
     bash <(curl -s https://codecov.io/bash)
     echo "Uploaded code coverage"
     fi
@@ -46,7 +46,7 @@ script:
 after_success:
   - |
     if [[ "$TRAVIS_OS_NAME" == "linux" && "$TRAVIS_PULL_REQUEST" = "false" && "$TRAVIS_BRANCH" == "master" && "$TRAVIS_RUST_VERSION" == "beta" ]]; then
-      cargo doc --features "session" --no-deps &&
+      cargo doc --features "ssl,session" --no-deps &&
       echo "<meta http-equiv=refresh content=0;url=os_balloon/index.html>" > target/doc/index.html &&
       git clone https://github.com/davisp/ghp-import.git &&
       ./ghp-import/ghp_import.py -n -p -f -m "Documentation upload" -r https://"$GH_TOKEN"@github.com/"$TRAVIS_REPO_SLUG.git" target/doc &&

Cargo.toml

@@ -35,6 +35,9 @@ default = ["session", "brotli", "flate2-c"]
 tls = ["native-tls", "tokio-tls"]
 
 # openssl
+ssl = ["openssl", "tokio-openssl", "actix-net/ssl"]
+
+# deprecated, use "ssl"
 alpn = ["openssl", "tokio-openssl", "actix-net/ssl"]
 
 # rustls

src/lib.rs

@@ -64,8 +64,8 @@
 //! ## Package feature
 //!
 //! * `tls` - enables ssl support via `native-tls` crate
-//! * `alpn` - enables ssl support via `openssl` crate, require for `http/2`
-//!    support
+//! * `ssl` - enables ssl support via `openssl` crate, supports `http/2`
+//! * `rust-tls` - enables ssl support via `rustls` crate, supports `http/2`
 //! * `uds` - enables support for making client requests via Unix Domain Sockets.
 //!   Unix only. Not necessary for *serving* requests.
 //! * `session` - enables session support, includes `ring` crate as

src/server/h1.rs

@@ -517,15 +517,14 @@ mod tests {
     use httpmessage::HttpMessage;
     use server::h1decoder::Message;
     use server::settings::{ServerSettings, WorkerSettings};
-    use server::{Connections, KeepAlive, Request};
+    use server::{KeepAlive, Request};
 
-    fn wrk_settings() -> Rc<WorkerSettings<HttpApplication>> {
-        Rc::new(WorkerSettings::<HttpApplication>::new(
+    fn wrk_settings() -> WorkerSettings<HttpApplication> {
+        WorkerSettings::<HttpApplication>::new(
             Vec::new(),
             KeepAlive::Os,
             ServerSettings::default(),
-            Connections::default(),
-        ))
+        )
     }
 
     impl Message {
@@ -644,9 +643,9 @@ mod tests {
     fn test_req_parse1() {
         let buf = Buffer::new("GET /test HTTP/1.1\r\n\r\n");
         let readbuf = BytesMut::new();
-        let settings = Rc::new(wrk_settings());
+        let settings = wrk_settings();
 
-        let mut h1 = Http1::new(Rc::clone(&settings), buf, None, readbuf, false, None);
+        let mut h1 = Http1::new(settings.clone(), buf, None, readbuf, false, None);
         h1.poll_io();
         h1.poll_io();
         assert_eq!(h1.tasks.len(), 1);
@@ -657,9 +656,9 @@ mod tests {
         let buf = Buffer::new("");
         let readbuf =
             BytesMut::from(Vec::<u8>::from(&b"GET /test HTTP/1.1\r\n\r\n"[..]));
-        let settings = Rc::new(wrk_settings());
+        let settings = wrk_settings();
 
-        let mut h1 = Http1::new(Rc::clone(&settings), buf, None, readbuf, true, None);
+        let mut h1 = Http1::new(settings.clone(), buf, None, readbuf, true, None);
         h1.poll_io();
         assert_eq!(h1.tasks.len(), 1);
     }
@@ -668,9 +667,9 @@ mod tests {
     fn test_req_parse_err() {
         let buf = Buffer::new("GET /test HTTP/1\r\n\r\n");
         let readbuf = BytesMut::new();
-        let settings = Rc::new(wrk_settings());
+        let settings = wrk_settings();
 
-        let mut h1 = Http1::new(Rc::clone(&settings), buf, None, readbuf, false, None);
+        let mut h1 = Http1::new(settings.clone(), buf, None, readbuf, false, None);
         h1.poll_io();
         h1.poll_io();
         assert!(h1.flags.contains(Flags::ERROR));