Fix server incoming client iterator. (#106)

This should also fix the autobahn tests for the server

Fixes #104

Author: Michael Eden

examples/autobahn-server.rs

@@ -8,7 +8,8 @@ use websocket::message::Type;
 fn main() {
 	let server = Server::bind("127.0.0.1:9002").unwrap();
 
-	for connection in server {
+	for connection in server.filter_map(Result::ok) {
+
 		thread::spawn(move || {
 			let client = connection.accept().unwrap();
 

examples/hyper.rs

@@ -30,7 +30,7 @@ fn main() {
 	// Start listening for WebSocket connections
 	let ws_server = Server::bind("127.0.0.1:2794").unwrap();
 
-	for connection in ws_server {
+	for connection in ws_server.filter_map(Result::ok) {
 		// Spawn a new thread for each connection.
 		thread::spawn(move || {
 			if !connection.protocols().contains(&"rust-websocket".to_string()) {

examples/server.rs

@@ -7,7 +7,7 @@ use websocket::message::Type;
 fn main() {
 	let server = Server::bind("127.0.0.1:2794").unwrap();
 
-	for request in server {
+	for request in server.filter_map(Result::ok) {
 		// Spawn a new thread for each connection.
 		thread::spawn(move || {
 			if !request.protocols().contains(&"rust-websocket".to_string()) {

src/server/mod.rs

@@ -65,7 +65,7 @@ impl OptionalSslAcceptor for SslAcceptor {}
 ///
 ///let server = Server::bind("127.0.0.1:1234").unwrap();
 ///
-///for connection in server {
+///for connection in server.filter_map(Result::ok) {
 ///    // Spawn a new thread for each connection.
 ///    thread::spawn(move || {
 ///		   let mut client = connection.accept().unwrap();
@@ -109,7 +109,7 @@ impl OptionalSslAcceptor for SslAcceptor {}
 ///
 ///let server = Server::bind_secure("127.0.0.1:1234", acceptor).unwrap();
 ///
-///for connection in server {
+///for connection in server.filter_map(Result::ok) {
 ///    // Spawn a new thread for each connection.
 ///    thread::spawn(move || {
 ///		   let mut client = connection.accept().unwrap();
@@ -220,10 +220,10 @@ impl Server<SslAcceptor> {
 
 #[cfg(feature="ssl")]
 impl Iterator for Server<SslAcceptor> {
-	type Item = WsUpgrade<SslStream<TcpStream>>;
+	type Item = AcceptResult<SslStream<TcpStream>>;
 
 	fn next(&mut self) -> Option<<Self as Iterator>::Item> {
-		self.accept().ok()
+		Some(self.accept())
 	}
 }
 
@@ -265,9 +265,9 @@ impl Server<NoSslAcceptor> {
 }
 
 impl Iterator for Server<NoSslAcceptor> {
-	type Item = WsUpgrade<TcpStream>;
+	type Item = AcceptResult<TcpStream>;
 
 	fn next(&mut self) -> Option<<Self as Iterator>::Item> {
-		self.accept().ok()
+		Some(self.accept())
 	}
 }

src/server/upgrade/mod.rs

@@ -31,6 +31,7 @@ pub mod from_hyper;
 ///
 /// This struct represents bytes that have already been read in from the stream.
 /// A slice of valid data in this buffer can be obtained by: `&buf[pos..cap]`.
+#[derive(Debug)]
 pub struct Buffer {
 	/// the contents of the buffered stream data
 	pub buf: Vec<u8>,
@@ -415,7 +416,7 @@ fn validate(
 	fn check_connection_header(headers: &Vec<ConnectionOption>) -> bool {
 		for header in headers {
 			if let &ConnectionOption::ConnectionHeader(ref h) = header {
-				if h as &str == "upgrade" {
+				if UniCase(h as &str) == UniCase("upgrade") {
 					return true;
 				}
 			}