From 4096089a3f49d4454013fbc11718c12aea241d48 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Fri, 16 Mar 2018 08:48:44 -0700
Subject: [PATCH 1/2] allow to disable http/2 support
---
CHANGES.md | 4 +++-
src/server/srv.rs | 28 +++++++++++++++++++---------
src/server/worker.rs | 3 ++-
src/test.rs | 7 +++++--
tests/test_server.rs | 4 ++--
5 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index cfd23464..c5d8edc9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,8 @@
# Changes
-## 0.4.9 (2018-03-xx)
+## 0.4.9 (2018-03-16)
+
+* Allow to disable http/2 support
* Wake payload reading task when data is available
diff --git a/src/server/srv.rs b/src/server/srv.rs
index 5d181c51..836c6395 100644
--- a/src/server/srv.rs
+++ b/src/server/srv.rs
@@ -41,6 +41,7 @@ pub struct HttpServer<H> where H: IntoHttpHandler + 'static
exit: bool,
shutdown_timeout: u16,
signals: Option<Addr<Syn, signal::ProcessSignals>>,
+ no_http2: bool,
no_signals: bool,
}
@@ -89,6 +90,7 @@ impl<H> HttpServer<H> where H: IntoHttpHandler + 'static
exit: false,
shutdown_timeout: 30,
signals: None,
+ no_http2: false,
no_signals: false,
}
}
@@ -170,6 +172,12 @@ impl<H> HttpServer<H> where H: IntoHttpHandler + 'static
self
}
+ /// Disable `HTTP/2` support
+ pub fn no_http2(mut self) -> Self {
+ self.no_http2 = true;
+ self
+ }
+
/// Get addresses of bound sockets.
pub fn addrs(&self) -> Vec<net::SocketAddr> {
self.sockets.iter().map(|s| s.0).collect()
@@ -396,15 +404,17 @@ impl<H: IntoHttpHandler> HttpServer<H>
Err(io::Error::new(io::ErrorKind::Other, "No socket addresses are bound"))
} else {
// alpn support
- builder.set_alpn_protos(b"\x02h2\x08http/1.1")?;
- builder.set_alpn_select_callback(|_, protos| {
- const H2: &[u8] = b"\x02h2";
- if protos.windows(3).any(|window| window == H2) {
- Ok(b"h2")
- } else {
- Err(AlpnError::NOACK)
- }
- });
+ if !self.no_http2 {
+ builder.set_alpn_protos(b"\x02h2\x08http/1.1")?;
+ builder.set_alpn_select_callback(|_, protos| {
+ const H2: &[u8] = b"\x02h2";
+ if protos.windows(3).any(|window| window == H2) {
+ Ok(b"h2")
+ } else {
+ Err(AlpnError::NOACK)
+ }
+ });
+ }
let (tx, rx) = mpsc::unbounded();
let acceptor = builder.build();
diff --git a/src/server/worker.rs b/src/server/worker.rs
index 02fa7453..a8ca3b2a 100644
--- a/src/server/worker.rs
+++ b/src/server/worker.rs
@@ -204,7 +204,8 @@ impl StreamHandlerType {
} else {
false
};
- Arbiter::handle().spawn(HttpChannel::new(h, io, peer, http2));
+ Arbiter::handle().spawn(
+ HttpChannel::new(h, io, peer, http2));
},
Err(err) =>
trace!("Error during handling tls connection: {}", err),
diff --git a/src/test.rs b/src/test.rs
index 7173f9c3..041ceaab 100644
--- a/src/test.rs
+++ b/src/test.rs
@@ -87,9 +87,12 @@ impl TestServer {
let sys = System::new("actix-test-server");
let tcp = net::TcpListener::bind("127.0.0.1:0").unwrap();
let local_addr = tcp.local_addr().unwrap();
- let tcp = TcpListener::from_listener(tcp, &local_addr, Arbiter::handle()).unwrap();
+ let tcp = TcpListener::from_listener(
+ tcp, &local_addr, Arbiter::handle()).unwrap();
- HttpServer::new(factory).disable_signals().start_incoming(tcp.incoming(), false);
+ HttpServer::new(factory)
+ .disable_signals()
+ .start_incoming(tcp.incoming(), false);
tx.send((Arbiter::system(), local_addr)).unwrap();
let _ = sys.run();
diff --git a/tests/test_server.rs b/tests/test_server.rs
index cf682468..10f71ab2 100644
--- a/tests/test_server.rs
+++ b/tests/test_server.rs
@@ -742,8 +742,8 @@ fn test_h2() {
})
})
});
- let _res = core.run(tcp);
- // assert_eq!(_res.unwrap(), Bytes::from_static(STR.as_ref()));
+ let res = core.run(tcp);
+ assert_eq!(res.unwrap(), Bytes::from_static(STR.as_ref()));
}
#[test]
From 7e8b231f5725c229aa6b99ad667b803b50f4e35b Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Fri, 16 Mar 2018 09:13:36 -0700
Subject: [PATCH 2/2] disable test
---
tests/test_server.rs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tests/test_server.rs b/tests/test_server.rs
index 10f71ab2..9cc09d02 100644
--- a/tests/test_server.rs
+++ b/tests/test_server.rs
@@ -742,8 +742,8 @@ fn test_h2() {
})
})
});
- let res = core.run(tcp);
- assert_eq!(res.unwrap(), Bytes::from_static(STR.as_ref()));
+ let _res = core.run(tcp);
+ // assert_eq!(res.unwrap(), Bytes::from_static(STR.as_ref()));
}
#[test]