actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-09-01 17:27:18 +02:00
Code Issues Releases Wiki Activity

rename modules

Browse Source
This commit is contained in:
Nikolay Kim
2017-11-02 12:54:09 -07:00
parent c14e6c9008
commit f010672885
7 changed files with 362 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/server.rs
View File

@@ -16,8 +16,8 @@ use native_tls::TlsAcceptor;
#[cfg(feature="tls")]
use tokio_tls::{TlsStream, TlsAcceptorExt};
use h1;
use task::Task;
use reader::{Reader, ReaderError};
use payload::Payload;
use httpcodes::HTTPNotFound;
use httprequest::HttpRequest;
@@ -150,9 +150,16 @@ impl<H: HttpHandler> HttpServer<TlsStream<TcpStream>, net::SocketAddr, H> {
let acc = acceptor.clone();
ctx.add_stream(tcp.incoming().and_then(move |(stream, addr)| {
println!("SSL");
TlsAcceptorExt::accept_async(acc.as_ref(), stream)
.map(move |t| IoStream(t, addr))
.map_err(|err| io::Error::new(io::ErrorKind::Other, err))
.map(move |t| {
println!("connected {:?} {:?}", t, addr);
IoStream(t, addr)
})
.map_err(|err| {
println!("ERR: {:?}", err);
io::Error::new(io::ErrorKind::Other, err)
})
}));
}
self
@@ -181,7 +188,7 @@ impl<T, A, H> Handler<IoStream<T, A>, io::Error> for HttpServer<T, A, H>
H: HttpHandler + 'static,
{
fn error(&mut self, err: io::Error, _: &mut Context<Self>) {
trace!("Error handling request: {}", err)
println!("Error handling request: {}", err)
}
fn handle(&mut self, msg: IoStream<T, A>, _: &mut Context<Self>)
@@ -191,7 +198,7 @@ impl<T, A, H> Handler<IoStream<T, A>, io::Error> for HttpServer<T, A, H>
HttpChannel{router: Rc::clone(&self.h),
addr: msg.1,
stream: msg.0,
reader: Reader::new(),
reader: h1::Reader::new(),
error: false,
items: VecDeque::new(),
inactive: VecDeque::new(),
@@ -202,7 +209,6 @@ impl<T, A, H> Handler<IoStream<T, A>, io::Error> for HttpServer<T, A, H>
}
}
struct Entry {
task: Task,
req: UnsafeCell<HttpRequest>,
@@ -219,7 +225,7 @@ pub struct HttpChannel<T: 'static, A: 'static, H: 'static> {
#[allow(dead_code)]
addr: A,
stream: T,
reader: Reader,
reader: h1::Reader,
error: bool,
items: VecDeque<Entry>,
inactive: VecDeque<Entry>,
@@ -380,7 +386,7 @@ impl<T, A, H> Future for HttpChannel<T, A, H>
self.error = true;
if self.items.is_empty() {
if let ReaderError::Error(err) = err {
if let h1::ReaderError::Error(err) = err {
self.items.push_back(
Entry {task: Task::reply(err),
req: UnsafeCell::new(HttpRequest::for_error()),