Merge pull request #234 from jean-airoldie/status_code_error

Added StatusCodeError when receiving unexpected status code

Author: vi

src/client/builder.rs

@@ -855,9 +855,7 @@ impl<'u> ClientBuilder<'u> {
 		let status = StatusCode::from_u16(response.subject.0);
 
 		if status != StatusCode::SwitchingProtocols {
-			return Err(WebSocketError::ResponseError(
-				"Status code must be Switching Protocols",
-			));
+			return Err(WebSocketError::StatusCodeError(status));
 		}
 
 		let key = self

src/result.rs

@@ -1,5 +1,6 @@
 //! The result type used within Rust-WebSocket
 
+pub use hyper::status::StatusCode;
 use hyper::Error as HttpError;
 use server::upgrade::HyperIntoWsError;
 use std::convert::From;
@@ -40,6 +41,8 @@ pub enum WebSocketError {
 	ResponseError(&'static str),
 	/// Invalid WebSocket data frame error
 	DataFrameError(&'static str),
+	/// Received unexpected status code
+	StatusCodeError(StatusCode),
 	/// No data available
 	NoDataAvailable,
 	/// An input/output error
@@ -90,6 +93,7 @@ impl Error for WebSocketError {
 			WebSocketError::TlsHandshakeInterruption => "TLS Handshake interrupted",
 			WebSocketError::Utf8Error(_) => "UTF-8 failure",
 			WebSocketError::WebSocketUrlError(_) => "WebSocket URL failure",
+			WebSocketError::StatusCodeError(_) => "Received unexpected status code",
 		}
 	}