diff --git a/benches/client_mock_tcp.rs b/benches/client_mock_tcp.rs index 78af12a291..baae3d707d 100644 --- a/benches/client_mock_tcp.rs +++ b/benches/client_mock_tcp.rs @@ -32,7 +32,7 @@ impl Clone for MockStream { impl MockStream { fn new() -> MockStream { let head = b"HTTP/1.1 200 OK\r\nServer: Mock\r\n\r\n"; - let mut res = Vec::from_slice(head); + let mut res = head.to_vec(); res.push_all(README); MockStream { read: MemReader::new(res), diff --git a/src/net.rs b/src/net.rs index c9b474d151..d436005aa1 100644 --- a/src/net.rs +++ b/src/net.rs @@ -59,15 +59,15 @@ impl Clone for Box { impl Reader for Box { #[inline] - fn read(&mut self, buf: &mut [u8]) -> IoResult { self.read(buf) } + fn read(&mut self, buf: &mut [u8]) -> IoResult { (**self).read(buf) } } impl Writer for Box { #[inline] - fn write(&mut self, msg: &[u8]) -> IoResult<()> { self.write(msg) } + fn write(&mut self, msg: &[u8]) -> IoResult<()> { (**self).write(msg) } #[inline] - fn flush(&mut self) -> IoResult<()> { self.flush() } + fn flush(&mut self) -> IoResult<()> { (**self).flush() } } /// A `NetworkListener` for `HttpStream`s. diff --git a/src/server/mod.rs b/src/server/mod.rs index 4a3953a85e..206ad5c519 100644 --- a/src/server/mod.rs +++ b/src/server/mod.rs @@ -1,6 +1,7 @@ //! HTTP Server use std::io::{Listener, IoResult, EndOfFile}; use std::io::net::ip::{IpAddr, Port, SocketAddr}; +use std::task::TaskBuilder; use intertwine::{Intertwine, Intertwined}; use macceptor::MoveAcceptor; @@ -58,6 +59,7 @@ impl, S: NetworkStream, A: NetworkAcceptor> Server::bind(ip.to_string().as_slice(), port)); sockets.push(try_io!(listener.socket_name())); @@ -71,7 +73,7 @@ impl, S: NetworkStream, A: NetworkAcceptor> Server(mut stream: S) -> HttpResult { let remote_addr = try_io!(stream.peer_name()); + debug!("remote addr = {}", remote_addr); let mut stream = BufferedReader::new(stream.abstract()); let (method, uri, version) = try!(read_request_line(&mut stream)); let headers = try!(Headers::from_raw(&mut stream));