actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-07-01 00:44:26 +02:00
Code Issues Releases Wiki Activity

clippy fixes (#2296)

Browse Source
This commit is contained in:
Rob Ede
2021-07-12 16:55:24 +01:00
committed by GitHub
parent 7ae132cb68
commit 5a14ffeef2
7 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/info.rs
View File

@ -65,10 +65,10 @@ fn first_header_value<'a>(req: &'a RequestHead, name: &'_ HeaderName) -> Option<
/// [rfc7239-63]: https://datatracker.ietf.org/doc/html/rfc7239#section-6.3
#[derive(Debug, Clone, Default)]
pub struct ConnectionInfo {
scheme: String,
host: String,
realip_remote_addr: Option<String>,
scheme: String,
remote_addr: Option<String>,
realip_remote_addr: Option<String>,
}
impl ConnectionInfo {
@ -135,7 +135,7 @@ impl ConnectionInfo {
.or_else(|| first_header_value(req, &*X_FORWARDED_HOST))
.or_else(|| req.headers.get(&header::HOST)?.to_str().ok())
.or_else(|| req.uri.authority().map(Authority::as_str))
.unwrap_or(cfg.host())
.unwrap_or_else(|| cfg.host())
.to_owned();
let realip_remote_addr = realip_remote_addr
@ -145,9 +145,9 @@ impl ConnectionInfo {
let remote_addr = req.peer_addr.map(|addr| addr.to_string());
ConnectionInfo {
remote_addr,
scheme,
host,
scheme,
remote_addr,
realip_remote_addr,
}
}

16
src/server.rs
View File

@ -295,6 +295,7 @@ where
let mut svc = HttpService::build()
.keep_alive(c.keep_alive)
.client_timeout(c.client_timeout)
.client_disconnect(c.client_shutdown)
.local_addr(addr);
if let Some(handler) = on_connect_fn.clone() {
@ -352,7 +353,8 @@ where
let svc = HttpService::build()
.keep_alive(c.keep_alive)
.client_timeout(c.client_timeout)
.client_disconnect(c.client_shutdown);
.client_disconnect(c.client_shutdown)
.local_addr(addr);
let svc = if let Some(handler) = on_connect_fn.clone() {
svc.on_connect_ext(move |io: &_, ext: _| {
@ -523,10 +525,11 @@ where
addr: socket_addr,
});
let addr = format!("actix-web-service-{:?}", lst.local_addr()?);
let addr = lst.local_addr()?;
let name = format!("actix-web-service-{:?}", addr);
let on_connect_fn = self.on_connect_fn.clone();
self.builder = self.builder.listen_uds(addr, lst, move || {
self.builder = self.builder.listen_uds(name, lst, move || {
let c = cfg.lock().unwrap();
let config = AppConfig::new(
false,
@ -537,7 +540,8 @@ where
fn_service(|io: UnixStream| async { Ok((io, Protocol::Http1, None)) }).and_then({
let mut svc = HttpService::build()
.keep_alive(c.keep_alive)
.client_timeout(c.client_timeout);
.client_timeout(c.client_timeout)
.client_disconnect(c.client_shutdown);
if let Some(handler) = on_connect_fn.clone() {
svc = svc
@ -554,8 +558,8 @@ where
Ok(self)
}
#[cfg(unix)]
/// Start listening for incoming unix domain connections.
#[cfg(unix)]
pub fn bind_uds<A>(mut self, addr: A) -> io::Result<Self>
where
A: AsRef<std::path::Path>,
@ -568,6 +572,7 @@ where
let factory = self.factory.clone();
let socket_addr =
net::SocketAddr::new(net::IpAddr::V4(net::Ipv4Addr::new(127, 0, 0, 1)), 8080);
self.sockets.push(Socket {
scheme: "http",
addr: socket_addr,
@ -592,6 +597,7 @@ where
HttpService::build()
.keep_alive(c.keep_alive)
.client_timeout(c.client_timeout)
.client_disconnect(c.client_shutdown)
.finish(map_config(fac, move |_| config.clone())),
)
},