Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion benches/client_mock_tcp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
6 changes: 3 additions & 3 deletions src/net.rs
Original file line number Diff line number Diff line change
Expand Up @@ -59,15 +59,15 @@ impl Clone for Box<NetworkStream + Send> {

impl Reader for Box<NetworkStream + Send> {
#[inline]
fn read(&mut self, buf: &mut [u8]) -> IoResult<uint> { self.read(buf) }
fn read(&mut self, buf: &mut [u8]) -> IoResult<uint> { (**self).read(buf) }
}

impl Writer for Box<NetworkStream + Send> {
#[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.
Expand Down
4 changes: 3 additions & 1 deletion src/server/mod.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -58,6 +59,7 @@ impl<L: NetworkListener<S, A>, S: NetworkStream, A: NetworkAcceptor<S>> Server<L
let mut acceptors = Vec::new();
let mut sockets = Vec::new();
for (ip, port) in self.pairs.into_iter() {
debug!("binding to {}:{}", ip, port);
let mut listener: L = try_io!(NetworkListener::<S, A>::bind(ip.to_string().as_slice(), port));

sockets.push(try_io!(listener.socket_name()));
Expand All @@ -71,7 +73,7 @@ impl<L: NetworkListener<S, A>, S: NetworkStream, A: NetworkAcceptor<S>> Server<L
.map(|acceptor| acceptor.move_incoming())
.intertwine();

spawn(proc() {
TaskBuilder::new().named("hyper acceptor").spawn(proc() {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this just add a name to failed tasks?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At the moment it's only used for failures, Yea.
On Sep 27, 2014 3:39 PM, "Jonathan Reem" [email protected] wrote:

In src/server/mod.rs:

@@ -71,7 +73,7 @@ impl<L: NetworkListener<S, A>, S: NetworkStream, A: NetworkAcceptor> Server<L
.map(|acceptor| acceptor.move_incoming())
.intertwine();

  •    spawn(proc() {
    
  •    TaskBuilder::new().named("hyper acceptor").spawn(proc() {
    

Does this just add a name to failed tasks?


Reply to this email directly or view it on GitHub
https://github.com/hyperium/hyper/pull/65/files#r18126235.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, seems reasonable then.

handler.handle(Incoming { from: connections });
});

Expand Down
1 change: 1 addition & 0 deletions src/server/request.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ impl Request {
/// immediately useful.
pub fn new<S: NetworkStream>(mut stream: S) -> HttpResult<Request> {
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));
Expand Down