Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(server): add Response.send to write a sized body #514

Merged
merged 1 commit into from
May 7, 2015
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
5 changes: 1 addition & 4 deletions examples/hello.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,12 @@
extern crate hyper;
extern crate env_logger;

use std::io::Write;
use hyper::server::{Request, Response};

static PHRASE: &'static [u8] = b"Hello World!";

fn hello(_: Request, res: Response) {
let mut res = res.start().unwrap();
res.write_all(PHRASE).unwrap();
res.end().unwrap();
res.send(PHRASE).unwrap();
}

fn main() {
Expand Down
9 changes: 2 additions & 7 deletions examples/server.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@
extern crate hyper;
extern crate env_logger;

use std::io::{Write, copy};
use std::io::copy;

use hyper::{Get, Post};
use hyper::header::ContentLength;
use hyper::server::{Server, Request, Response};
use hyper::uri::RequestUri::AbsolutePath;

Expand All @@ -22,11 +21,7 @@ fn echo(mut req: Request, mut res: Response) {
match req.uri {
AbsolutePath(ref path) => match (&req.method, &path[..]) {
(&Get, "/") | (&Get, "/echo") => {
let out = b"Try POST /echo";

res.headers_mut().set(ContentLength(out.len() as u64));
let mut res = try_return!(res.start());
try_return!(res.write_all(out));
try_return!(res.send(b"Try POST /echo"));
return;
},
(&Post, "/echo") => (), // fall through, fighting mutable borrows
Expand Down
19 changes: 17 additions & 2 deletions src/server/response.rs
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,6 @@ impl<'a, W: Any> Response<'a, W> {

Ok(body_type)
}


}

impl<'a> Response<'a, Fresh> {
Expand All @@ -126,6 +124,23 @@ impl<'a> Response<'a, Fresh> {
}
}

/// Writes the body and ends the response.
///
/// # Example
///
/// ```
/// # use hyper::server::Response;
/// fn handler(res: Response) {
/// res.send(b"Hello World!").unwrap();
/// }
/// ```
pub fn send(mut self, body: &[u8]) -> io::Result<()> {
self.headers.set(header::ContentLength(body.len() as u64));
let mut stream = try!(self.start());
try!(stream.write_all(body));
stream.end()
}

/// Consume this Response<Fresh>, writing the Headers and Status and creating a Response<Streaming>
pub fn start(mut self) -> io::Result<Response<'a, Streaming>> {
let body_type = try!(self.write_head());
Expand Down