wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset d9026e7165e8 (bug 1082039) for webapp 4 test failures

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2014-10-23 14:52:32 +02:00
parent cdd6a1b48a
commit d126616ab8
4 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
netwerk/protocol/http/nsHttpChannel.cpp
View File

@ -316,7 +316,6 @@ nsHttpChannel::Connect()
// Finalize ConnectionInfo flags before SpeculativeConnect
mConnectionInfo->SetAnonymous((mLoadFlags & LOAD_ANONYMOUS) != 0);
mConnectionInfo->SetPrivate(mPrivateBrowsing);
mConnectionInfo->SetNoSpdy(mCaps & NS_HTTP_DISALLOW_SPDY);
// Consider opening a TCP connection right away
RetrieveSSLOptions();
@ -1247,7 +1246,7 @@ nsHttpChannel::ProcessAltService()
// protocol-id = token ; percent-encoded ALPN protocol identifier
// alt-authority = quoted-string ; containing [ uri-host ] ":" port
if (!gHttpHandler->AllowAltSvc() || (mCaps & NS_HTTP_DISALLOW_SPDY)) {
if (!gHttpHandler->AllowAltSvc()) {
return;
}

5
netwerk/protocol/http/nsHttpConnectionInfo.cpp
View File

@ -112,9 +112,8 @@ nsHttpConnectionInfo::SetOriginServer(const nsACString &host, int32_t port)
// byte 2 is A/. A is for an anonymous channel (no cookies, etc..)
// byte 3 is P/. P is for a private browising channel
// byte 4 is R/. R is for 'relaxed' unauthed TLS for http:// uris
// byte 5 is X/. X is for disallow_spdy flag
mHashKey.AssignLiteral("......");
mHashKey.AssignLiteral(".....");
mHashKey.Append(keyHost);
mHashKey.Append(':');
mHashKey.AppendInt(keyPort);
@ -186,7 +185,6 @@ nsHttpConnectionInfo::Clone() const
clone->SetAnonymous(GetAnonymous());
clone->SetPrivate(GetPrivate());
clone->SetRelaxed(GetRelaxed());
clone->SetNoSpdy(GetNoSpdy());
MOZ_ASSERT(clone->Equals(this));
return clone;
@ -207,7 +205,6 @@ nsHttpConnectionInfo::CloneAsDirectRoute(nsHttpConnectionInfo **outCI)
clone->SetAnonymous(GetAnonymous());
clone->SetPrivate(GetPrivate());
clone->SetRelaxed(GetRelaxed());
clone->SetNoSpdy(GetNoSpdy());
clone.forget(outCI);
}

4
netwerk/protocol/http/nsHttpConnectionInfo.h
View File

@ -96,10 +96,6 @@ public:
{ mHashKey.SetCharAt(relaxed ? 'R' : '.', 4); }
bool GetRelaxed() const { return mHashKey.CharAt(4) == 'R'; }
void SetNoSpdy(bool aNoSpdy)
{ mHashKey.SetCharAt(aNoSpdy ? 'X' : '.', 5); }
bool GetNoSpdy() const { return mHashKey.CharAt(5) == 'X'; }
const nsCString &GetHost() { return mHost; }
const nsCString &GetNPNToken() { return mNPNToken; }

14
netwerk/test/unit/test_http2.js
View File

@ -43,7 +43,6 @@ Http2CheckListener.prototype = {
onStartRequestFired: false,
onDataAvailableFired: false,
isHttp2Connection: false,
shouldBeHttp2 : true,
onStartRequest: function testOnStartRequest(request, ctx) {
this.onStartRequestFired = true;
@ -67,7 +66,7 @@ Http2CheckListener.prototype = {
onStopRequest: function testOnStopRequest(request, ctx, status) {
do_check_true(this.onStartRequestFired);
do_check_true(this.onDataAvailableFired);
do_check_true(this.isHttp2Connection == this.shouldBeHttp2);
do_check_true(this.isHttp2Connection);
run_next_test();
do_test_finished();
@ -203,16 +202,6 @@ function test_http2_basic() {
chan.asyncOpen(listener, null);
}
// make sure we don't use h2 when disallowed
function test_http2_nospdy() {
var chan = makeChan("https://localhost:6944/");
var listener = new Http2CheckListener();
var internalChannel = chan.QueryInterface(Ci.nsIHttpChannelInternal);
internalChannel.allowSpdy = false;
listener.shouldBeHttp2 = false;
chan.asyncOpen(listener, null);
}
// Support for making sure XHR works over SPDY
function checkXhr(xhr) {
if (xhr.readyState != 4) {
@ -400,7 +389,6 @@ function test_http2_altsvc() {
// a stalled stream when a SETTINGS frame arrives
var tests = [ test_http2_post_big
, test_http2_basic
, test_http2_nospdy
, test_http2_push1
, test_http2_push2
, test_http2_push3