berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

better ws handshake error responses

This commit is contained in:
Nikolay Kim 2017-10-29 14:50:26 -07:00
parent af1e0bac08
commit ce34eab832
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ws.rs
View File

@ -116,7 +116,11 @@ impl ResponseType for Message {
pub fn handshake(req: &HttpRequest) -> Result<HttpResponse, HttpResponse> { pub fn handshake(req: &HttpRequest) -> Result<HttpResponse, HttpResponse> {
// WebSocket accepts only GET // WebSocket accepts only GET
if *req.method() != Method::GET { if *req.method() != Method::GET {
return Err(HTTPMethodNotAllowed.response()) return Err(
HTTPMethodNotAllowed
.builder()
.header(header::ALLOW, "GET")
.finish()?)
} }
// Check for "UPGRADE" to websocket header // Check for "UPGRADE" to websocket header
@ -130,7 +134,7 @@ pub fn handshake(req: &HttpRequest) -> Result<HttpResponse, HttpResponse> {
false false
}; };
if !has_hdr { if !has_hdr {
return Err(HTTPMethodNotAllowed.with_reason("No WebSocket UPGRADE header found")) return Err(HTTPBadRequest.with_reason("No WebSocket UPGRADE header found"))
} }
// Upgrade connection // Upgrade connection