Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Bump JSON-RPC #10151

Merged
merged 2 commits into from
Jan 11, 2019
Merged

Bump JSON-RPC #10151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
87e6bac
Bump JSON-RPC
tomusdrw Jan 8, 2019
70de765
Fix test casing.
tomusdrw Jan 10, 2019
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
51 changes: 32 additions & 19 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion rpc/src/tests/ws.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ mod testing {
);

// then
assert_eq!(response.status, "HTTP/1.1 200 Ok".to_owned());
assert_eq!(response.status, "HTTP/1.1 200 OK".to_owned());
}

#[test]
Expand Down
9 changes: 4 additions & 5 deletions rpc/src/v1/extractors.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,17 +98,16 @@ impl ws::RequestMiddleware for WsExtractor {
fn process(&self, req: &ws::ws::Request) -> ws::MiddlewareAction {
use self::ws::ws::Response;

// Reply with 200 Ok to HEAD requests.
// Reply with 200 OK to HEAD requests.
if req.method() == "HEAD" {
let mut response = Response::new(200, "Ok");
let mut response = Response::new(200, "OK", vec![]);
add_security_headers(&mut response);
return Some(response).into();
}

// Display WS info.
if req.header("sec-websocket-key").is_none() {
let mut response = Response::new(200, "Ok");
response.set_body("WebSocket interface is active. Open WS connection to access RPC.");
let mut response = Response::new(200, "OK", b"WebSocket interface is active. Open WS connection to access RPC.".to_vec());
add_security_headers(&mut response);
return Some(response).into();
}
Expand All @@ -123,7 +122,7 @@ impl ws::RequestMiddleware for WsExtractor {
"Blocked connection from {} using invalid token.",
req.header("origin").and_then(|e| ::std::str::from_utf8(e).ok()).unwrap_or("Unknown Origin")
);
let mut response = Response::new(403, "Forbidden");
let mut response = Response::new(403, "Forbidden", vec![]);
add_security_headers(&mut response);
return Some(response).into();
}
Expand Down