actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-06-25 22:49:21 +02:00
Code Issues Releases Wiki Activity

add docs to recent additions

Browse Source
This commit is contained in:
Rob Ede
2021-01-06 18:52:06 +00:00
parent a03dbe2dcf
commit 51e9e1500b
6 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
actix-http/src/h1/dispatcher.rs
View File

@ -91,7 +91,7 @@ where
U: Service<(Request, Framed<T, Codec>), Response = ()>,
U::Error: fmt::Display,
{
services: Rc<RefCell<HttpFlow<S, X, U>>>,
flow: Rc<RefCell<HttpFlow<S, X, U>>>,
on_connect_data: OnConnectData,
flags: Flags,
peer_addr: Option<net::SocketAddr>,
@ -230,7 +230,7 @@ where
io: Some(io),
codec,
read_buf,
services,
flow: services,
on_connect_data,
flags,
peer_addr,
@ -384,7 +384,7 @@ where
Poll::Ready(Ok(req)) => {
self.as_mut().send_continue();
this = self.as_mut().project();
let fut = this.services.borrow_mut().service.call(req);
let fut = this.flow.borrow_mut().service.call(req);
this.state.set(State::ServiceCall(fut));
continue;
}
@ -474,12 +474,12 @@ where
if req.head().expect() {
// set dispatcher state so the future is pinned.
let mut this = self.as_mut().project();
let task = this.services.borrow_mut().expect.call(req);
let task = this.flow.borrow_mut().expect.call(req);
this.state.set(State::ExpectCall(task));
} else {
// the same as above.
let mut this = self.as_mut().project();
let task = this.services.borrow_mut().service.call(req);
let task = this.flow.borrow_mut().service.call(req);
this.state.set(State::ServiceCall(task));
};
@ -492,7 +492,7 @@ where
Poll::Ready(Ok(req)) => {
self.as_mut().send_continue();
let mut this = self.as_mut().project();
let task = this.services.borrow_mut().service.call(req);
let task = this.flow.borrow_mut().service.call(req);
this.state.set(State::ServiceCall(task));
continue;
}
@ -564,7 +564,7 @@ where
this.on_connect_data.merge_into(&mut req);
if pl == MessageType::Stream
&& this.services.borrow().upgrade.is_some()
&& this.flow.borrow().upgrade.is_some()
{
this.messages.push_back(DispatcherMessage::Upgrade(req));
break;
@ -830,7 +830,7 @@ where
parts.write_buf = mem::take(inner_p.write_buf);
let framed = Framed::from_parts(parts);
let upgrade = inner_p
.services
.flow
.borrow_mut()
.upgrade
.take()

14
actix-http/src/h1/service.rs
View File

@ -367,7 +367,7 @@ where
X: Service<Request>,
U: Service<(Request, Framed<T, Codec>)>,
{
services: Rc<RefCell<HttpFlow<S, X, U>>>,
flow: Rc<RefCell<HttpFlow<S, X, U>>>,
on_connect_ext: Option<Rc<ConnectCallback<T>>>,
cfg: ServiceConfig,
_phantom: PhantomData<B>,
@ -392,7 +392,7 @@ where
on_connect_ext: Option<Rc<ConnectCallback<T>>>,
) -> H1ServiceHandler<T, S, B, X, U> {
H1ServiceHandler {
services: HttpFlow::new(service, expect, upgrade),
flow: HttpFlow::new(service, expect, upgrade),
cfg,
on_connect_ext,
_phantom: PhantomData,
@ -418,8 +418,8 @@ where
type Future = Dispatcher<T, S, B, X, U>;
fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
let mut services = self.services.borrow_mut();
let ready = services
let mut flow = self.flow.borrow_mut();
let ready = flow
.expect
.poll_ready(cx)
.map_err(|e| {
@ -429,7 +429,7 @@ where
})?
.is_ready();
let ready = services
let ready = flow
.service
.poll_ready(cx)
.map_err(|e| {
@ -440,7 +440,7 @@ where
.is_ready()
&& ready;
let ready = if let Some(ref mut upg) = services.upgrade {
let ready = if let Some(ref mut upg) = flow.upgrade {
upg.poll_ready(cx)
.map_err(|e| {
let e = e.into();
@ -467,7 +467,7 @@ where
Dispatcher::new(
io,
self.cfg.clone(),
self.services.clone(),
self.flow.clone(),
on_connect_data,
addr,
)