зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1159747 - delete h2 static compression table in such a way to avoid crashes after network changes. r=mcmanus
This commit is contained in:
Родитель
95802bd4a7
Коммит
1ea1d4d587
|
@ -225,6 +225,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsFtpProtocolHandler, Init)
|
||||||
#ifdef NECKO_PROTOCOL_http
|
#ifdef NECKO_PROTOCOL_http
|
||||||
// http/https
|
// http/https
|
||||||
#include "nsHttpHandler.h"
|
#include "nsHttpHandler.h"
|
||||||
|
#include "Http2Compression.h"
|
||||||
#undef LOG
|
#undef LOG
|
||||||
#undef LOG_ENABLED
|
#undef LOG_ENABLED
|
||||||
#include "nsHttpAuthManager.h"
|
#include "nsHttpAuthManager.h"
|
||||||
|
@ -655,6 +656,10 @@ static void nsNetShutdown()
|
||||||
mozilla::net::WebSocketChannel::Shutdown();
|
mozilla::net::WebSocketChannel::Shutdown();
|
||||||
#endif // NECKO_PROTOCOL_websocket
|
#endif // NECKO_PROTOCOL_websocket
|
||||||
|
|
||||||
|
#ifdef NECKO_PROTOCOL_http
|
||||||
|
mozilla::net::Http2CompressionCleanup();
|
||||||
|
#endif // NECKO_PROTOCOL_http
|
||||||
|
|
||||||
delete gNetSniffers;
|
delete gNetSniffers;
|
||||||
gNetSniffers = nullptr;
|
gNetSniffers = nullptr;
|
||||||
delete gDataSniffers;
|
delete gDataSniffers;
|
||||||
|
|
|
@ -228,6 +228,10 @@ Http2BaseCompressor::MakeRoom(uint32_t amount, const char *direction)
|
||||||
void
|
void
|
||||||
Http2BaseCompressor::DumpState()
|
Http2BaseCompressor::DumpState()
|
||||||
{
|
{
|
||||||
|
if (!LOG_ENABLED()) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
LOG(("Header Table"));
|
LOG(("Header Table"));
|
||||||
uint32_t i;
|
uint32_t i;
|
||||||
uint32_t length = mHeaderTable.Length();
|
uint32_t length = mHeaderTable.Length();
|
||||||
|
|
|
@ -30,7 +30,6 @@
|
||||||
#include "nsITransport.h"
|
#include "nsITransport.h"
|
||||||
#include "nsISocketTransportService.h"
|
#include "nsISocketTransportService.h"
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include "Http2Compression.h"
|
|
||||||
#include "mozilla/ChaosMode.h"
|
#include "mozilla/ChaosMode.h"
|
||||||
#include "mozilla/unused.h"
|
#include "mozilla/unused.h"
|
||||||
|
|
||||||
|
@ -177,7 +176,6 @@ nsHttpConnectionMgr::Shutdown()
|
||||||
// wait for shutdown event to complete
|
// wait for shutdown event to complete
|
||||||
while (!shutdown)
|
while (!shutdown)
|
||||||
NS_ProcessNextEvent(NS_GetCurrentThread());
|
NS_ProcessNextEvent(NS_GetCurrentThread());
|
||||||
Http2CompressionCleanup();
|
|
||||||
|
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче