corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1310127 - Part 3: Use MOZ_MUST_USE in netwerk/protocol/http r=mcmanus

Browse Source 
Add assertions.

MozReview-Commit-ID: DPvgKzVr3ip
This commit is contained in:
Wei-Cheng Pan
2017-01-12 17:48:45 +08:00
parent f9654c1dca
commit 9f134bdbf1
21 changed files with 290 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
netwerk/protocol/websocket/WebSocketChannel.cpp
View File

@@ -2814,22 +2814,29 @@ WebSocketChannel::SetupRequest()
rv = mChannel->HTTPUpgrade(NS_LITERAL_CSTRING("websocket"), this);
NS_ENSURE_SUCCESS(rv, rv);
mHttpChannel->SetRequestHeader(
rv = mHttpChannel->SetRequestHeader(
NS_LITERAL_CSTRING("Sec-WebSocket-Version"),
NS_LITERAL_CSTRING(SEC_WEBSOCKET_VERSION), false);
MOZ_ASSERT(NS_SUCCEEDED(rv));
if (!mOrigin.IsEmpty())
mHttpChannel->SetRequestHeader(NS_LITERAL_CSTRING("Origin"), mOrigin,
false);
if (!mOrigin.IsEmpty()) {
rv = mHttpChannel->SetRequestHeader(NS_LITERAL_CSTRING("Origin"), mOrigin,
false);
MOZ_ASSERT(NS_SUCCEEDED(rv));
}
if (!mProtocol.IsEmpty())
mHttpChannel->SetRequestHeader(NS_LITERAL_CSTRING("Sec-WebSocket-Protocol"),
mProtocol, true);
if (!mProtocol.IsEmpty()) {
rv = mHttpChannel->SetRequestHeader(
NS_LITERAL_CSTRING("Sec-WebSocket-Protocol"), mProtocol, true);
MOZ_ASSERT(NS_SUCCEEDED(rv));
}
if (mAllowPMCE)
mHttpChannel->SetRequestHeader(NS_LITERAL_CSTRING("Sec-WebSocket-Extensions"),
NS_LITERAL_CSTRING("permessage-deflate"),
false);
if (mAllowPMCE) {
rv = mHttpChannel->SetRequestHeader(
NS_LITERAL_CSTRING("Sec-WebSocket-Extensions"),
NS_LITERAL_CSTRING("permessage-deflate"), false);
MOZ_ASSERT(NS_SUCCEEDED(rv));
}
uint8_t *secKey;
nsAutoCString secKeyString;
@@ -2842,8 +2849,9 @@ WebSocketChannel::SetupRequest()
return NS_ERROR_OUT_OF_MEMORY;
secKeyString.Assign(b64);
PR_Free(b64);
mHttpChannel->SetRequestHeader(NS_LITERAL_CSTRING("Sec-WebSocket-Key"),
secKeyString, false);
rv = mHttpChannel->SetRequestHeader(NS_LITERAL_CSTRING("Sec-WebSocket-Key"),
secKeyString, false);
MOZ_ASSERT(NS_SUCCEEDED(rv));
LOG(("WebSocketChannel::SetupRequest: client key %s\n", secKeyString.get()));
// prepare the value we expect to see in