diff options
author | Michal Klocek <michal.klocek@qt.io> | 2018-11-28 17:19:35 +0100 |
---|---|---|
committer | Michal Klocek <michal.klocek@qt.io> | 2019-02-11 14:56:46 +0000 |
commit | 89ebafdb6c41229f007d423aa785dea6ace07271 (patch) | |
tree | 0d450113c36d97e1222edafd77a07e7eead9d7b6 /src/core/profile_io_data_qt.cpp | |
parent | 998a5a28f4ce348ba985bec4aacbd39aa82b5261 (diff) |
Shutdown ProxyResolutionSerivce
Shut down the ProxyResolutionService before regenerating storage,
it may have pending URLRequests.
Change-Id: If79efc0bc942762dc48a50a12d74593ff1ee3989
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/profile_io_data_qt.cpp')
-rw-r--r-- | src/core/profile_io_data_qt.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/profile_io_data_qt.cpp b/src/core/profile_io_data_qt.cpp index 36f92e14f..63585b2c3 100644 --- a/src/core/profile_io_data_qt.cpp +++ b/src/core/profile_io_data_qt.cpp @@ -171,6 +171,8 @@ ProfileIODataQt::~ProfileIODataQt() { if (content::BrowserThread::IsThreadInitialized(content::BrowserThread::IO)) DCHECK_CURRENTLY_ON(content::BrowserThread::IO); + if (m_urlRequestContext && m_urlRequestContext->proxy_resolution_service()) + m_urlRequestContext->proxy_resolution_service()->OnShutdown(); m_resourceContext.reset(); if (m_cookieDelegate) m_cookieDelegate->setCookieMonster(0); // this will let CookieMonsterDelegateQt be deleted @@ -263,6 +265,7 @@ void ProfileIODataQt::generateStorage() // We must stop all requests before deleting their backends. if (m_storage) { + m_urlRequestContext->proxy_resolution_service()->OnShutdown(); m_cookieDelegate->setCookieMonster(nullptr); m_storage->set_cookie_store(nullptr); cancelAllUrlRequests(); |