Commit2bbeca9

committed

Dedicated error for redirect replies.

1 parent2245bee commit2bbeca9Copy full SHA for 2bbeca9

File tree

+15

-1

lines changed

+15

-1

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`[package]`
`2`	`2`	`name ="websocket"`
`3`		`-version ="0.26.5"`
	`3`	`+version ="0.27.0"`
`4`	`4`	`authors = ["cyderize <admin@cyderize.org>","Michael Eden <themichaeleden@gmail.com>"]`
`5`	`5`	`edition ="2018"`
`6`	`6`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -888,6 +888,12 @@ impl<'u> ClientBuilder<'u> {`
`888`	`888`	`let status =StatusCode::from_u16(response.subject.0);`
`889`	`889`
`890`	`890`	`if status !=StatusCode::SwitchingProtocols{`
	`891`	`+if status.is_redirection(){`
	`892`	`+match response.headers.get::<hyper::header::Location>(){`
	`893`	`+Some(x) =>returnErr(WebSocketOtherError::RedirectError(status, x.to_string())).map_err(towse),`
	`894`	`+None =>(),`
	`895`	`+}`
	`896`	`+}`
`891`	`897`	`returnErr(WebSocketOtherError::StatusCodeError(status)).map_err(towse);`
`892`	`898`	`}`
`893`	`899`

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,8 @@ pub enum WebSocketOtherError {`
`43`	`43`	`ResponseError(&'staticstr),`
`44`	`44`	`/// Received unexpected status code`
`45`	`45`	`StatusCodeError(StatusCode),`
	`46`	`+/// Received 3XX status code with a Location header`
	`47`	`+RedirectError(StatusCode,String),`
`46`	`48`	`/// An HTTP parsing error`
`47`	`49`	`HttpError(HttpError),`
`48`	`50`	`/// A URL parsing error`
`@@ -74,6 +76,12 @@ impl fmt::Display for WebSocketOtherError {`
`74`	`76`	`"WebSocketError: Received unexpected status code ({})",`
`75`	`77`	`e`
`76`	`78`	`),`
	`79`	`+WebSocketOtherError::RedirectError(st, loc) =>write!(`
	`80`	`+fmt,`
	`81`	`+"WebSocketError: Redirected ({}) to {}",`
	`82`	`+st,`
	`83`	`+loc,`
	`84`	`+),`
`77`	`85`	`WebSocketOtherError::HttpError(e) =>write!(fmt,"WebSocket HTTP error: {}", e),`
`78`	`86`	`WebSocketOtherError::UrlError(e) =>write!(fmt,"WebSocket URL parse error: {}", e),`
`79`	`87`	`WebSocketOtherError::IoError(e) =>write!(fmt,"WebSocket I/O error: {}", e),`

Comments

(0)