summaryrefslogtreecommitdiffstats
path: root/net/url_request
diff options
context:
space:
mode:
Diffstat (limited to 'net/url_request')
-rw-r--r--net/url_request/url_request_http_job.cc4
-rw-r--r--net/url_request/url_request_http_job.h9
2 files changed, 7 insertions, 6 deletions
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc
index da56c8b..1c8053d 100644
--- a/net/url_request/url_request_http_job.cc
+++ b/net/url_request/url_request_http_job.cc
@@ -61,7 +61,7 @@ URLRequestJob* URLRequestHttpJob::Factory(URLRequest* request,
URLRequestHttpJob::URLRequestHttpJob(URLRequest* request)
: URLRequestJob(request),
- transaction_(NULL),
+ context_(request->context()),
response_info_(NULL),
proxy_auth_state_(net::AUTH_STATE_DONT_NEED_AUTH),
server_auth_state_(net::AUTH_STATE_DONT_NEED_AUTH),
@@ -70,7 +70,7 @@ URLRequestHttpJob::URLRequestHttpJob(URLRequest* request)
ALLOW_THIS_IN_INITIALIZER_LIST(
read_callback_(this, &URLRequestHttpJob::OnReadCompleted)),
read_in_progress_(false),
- context_(request->context()),
+ transaction_(NULL),
sdch_dictionary_advertised_(false),
sdch_test_activated_(false),
sdch_test_control_(false),
diff --git a/net/url_request/url_request_http_job.h b/net/url_request/url_request_http_job.h
index 46078d4..3ebc05c 100644
--- a/net/url_request/url_request_http_job.h
+++ b/net/url_request/url_request_http_job.h
@@ -79,8 +79,11 @@ class URLRequestHttpJob : public URLRequestJob {
void RestartTransactionWithAuth(const std::wstring& username,
const std::wstring& password);
+ // Keep a reference to the url request context to be sure it's not deleted
+ // before us.
+ scoped_refptr<URLRequestContext> context_;
+
net::HttpRequestInfo request_info_;
- scoped_ptr<net::HttpTransaction> transaction_;
const net::HttpResponseInfo* response_info_;
std::vector<std::string> response_cookies_;
@@ -96,9 +99,7 @@ class URLRequestHttpJob : public URLRequestJob {
// An URL for an SDCH dictionary as suggested in a Get-Dictionary HTTP header.
GURL sdch_dictionary_url_;
- // Keep a reference to the url request context to be sure it's not deleted
- // before us.
- scoped_refptr<URLRequestContext> context_;
+ scoped_ptr<net::HttpTransaction> transaction_;
// Indicated if an SDCH dictionary was advertised, and hence an SDCH
// compressed response is expected. We use this to help detect (accidental?)