bug 1102923 - revert stack trace on rst generation r=backout

This commit is contained in:
Patrick McManus 2015-02-05 08:20:54 -05:00
parent 5febeecdfb
commit 570e623b7f
4 changed files with 0 additions and 19 deletions

View File

@ -733,13 +733,6 @@ SpdySession31::GenerateRstStream(uint32_t aStatusCode, uint32_t aID)
aStatusCode = PR_htonl(aStatusCode);
memcpy(packet + 12, &aStatusCode, 4);
// Intentionally crash on debug builds when the debug 1102923 pref is set
// We hope to get useful stack traces to solve bug 1102923 when running
// test_spdy.js
if (gHttpHandler->Debug1102923()) {
MOZ_CRASH("Debug 1102923");
}
LogIO(this, nullptr, "Generate Reset", packet, 16);
FlushOutputQueue();
}

View File

@ -191,7 +191,6 @@ nsHttpHandler::nsHttpHandler()
, mAllowPush(true)
, mEnableAltSvc(true)
, mEnableAltSvcOE(true)
, mDebug1102923(false)
, mSpdySendingChunkSize(ASpdySession::kSendingChunkSize)
, mSpdySendBufferSize(ASpdySession::kTCPSendBufferSize)
, mSpdyPushAllowance(32768)
@ -1305,13 +1304,6 @@ nsHttpHandler::PrefsChanged(nsIPrefBranch *prefs, const char *pref)
mSpdySendBufferSize = (uint32_t) clamped(val, 1500, 0x7fffffff);
}
if (PREF_CHANGED(HTTP_PREF("spdy.debug-1102923"))) {
rv = prefs->GetBoolPref(HTTP_PREF("spdy.debug-1102923"), &cVar);
if (NS_SUCCEEDED(rv)) {
mDebug1102923 = cVar;
}
}
// The maximum amount of time to wait for socket transport to be
// established
if (PREF_CHANGED(HTTP_PREF("connection-timeout"))) {

View File

@ -111,7 +111,6 @@ public:
bool AllowPush() { return mAllowPush; }
bool AllowAltSvc() { return mEnableAltSvc; }
bool AllowAltSvcOE() { return mEnableAltSvcOE; }
bool Debug1102923() { return mDebug1102923; }
uint32_t ConnectTimeout() { return mConnectTimeout; }
uint32_t ParallelSpeculativeConnectLimit() { return mParallelSpeculativeConnectLimit; }
bool CriticalRequestPrioritization() { return mCriticalRequestPrioritization; }
@ -482,7 +481,6 @@ private:
uint32_t mAllowPush : 1;
uint32_t mEnableAltSvc : 1;
uint32_t mEnableAltSvcOE : 1;
uint32_t mDebug1102923 : 1;
// Try to use SPDY features instead of HTTP/1.1 over SSL
SpdyInformation mSpdyInfo;

View File

@ -436,7 +436,6 @@ function resetPrefs() {
prefs.setBoolPref("network.http.spdy.enabled", spdypref);
prefs.setBoolPref("network.http.spdy.enabled.v3-1", spdy3pref);
prefs.setBoolPref("network.http.spdy.allow-push", spdypush);
prefs.setBoolPref("network.http.spdy.debug-1102923", false);
}
function run_test() {
@ -464,7 +463,6 @@ function run_test() {
prefs.setBoolPref("network.http.spdy.enabled", true);
prefs.setBoolPref("network.http.spdy.enabled.v3-1", true);
prefs.setBoolPref("network.http.spdy.allow-push", true);
prefs.setBoolPref("network.http.spdy.debug-1102923", true);
loadGroup = Cc["@mozilla.org/network/load-group;1"].createInstance(Ci.nsILoadGroup);