diff options
| author | Michael Bruning <michael.bruning@theqtcompany.com> | 2015-12-03 11:16:32 +0100 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@theqtcompany.com> | 2015-12-04 16:32:39 +0000 |
| commit | 32f83d9c2c884dfa516095c07f8590b2c4c99321 (patch) | |
| tree | 0b2e3ab36aa5364717e223e9951d19788445616d /src/core/url_request_context_getter_qt.h | |
| parent | 1847e158e09e24af704b02c8fb30adbf04d3befa (diff) | |
Reuse or clean up HttpNetworkSession when (re-) setting a cache type.
Not reusing or cleaning up the session led to race conditions which in
turn lead to crashes and asserts.
Reuse the session if parameters match, clean up and it recreate otherwise.
Task-number: QTBUG-49397
Change-Id: I4f846a448b50d80a3cf7c4f9bb833fa6d64974d7
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
Diffstat (limited to 'src/core/url_request_context_getter_qt.h')
| -rw-r--r-- | src/core/url_request_context_getter_qt.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/url_request_context_getter_qt.h b/src/core/url_request_context_getter_qt.h index 38cfd7957..dc861f8da 100644 --- a/src/core/url_request_context_getter_qt.h +++ b/src/core/url_request_context_getter_qt.h @@ -45,6 +45,7 @@ #include "base/single_thread_task_runner.h" #include "content/public/browser/content_browser_client.h" #include "content/public/common/url_constants.h" +#include "net/http/http_network_session.h" #include "net/url_request/url_request_context_storage.h" #include "net/url_request/url_request_job_factory_impl.h" #include "net/proxy/dhcp_proxy_script_fetcher_factory.h" @@ -84,6 +85,8 @@ private: void generateHttpCache(); void generateUserAgent(); void generateJobFactory(); + void cancelAllUrlRequests(); + net::HttpNetworkSession::Params generateNetworkSessionParams(); bool m_ignoreCertificateErrors; QAtomicInt m_updateCookieStore; |