diff options
| author | jar@google.com <jar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-23 02:17:00 +0000 |
|---|---|---|
| committer | jar@google.com <jar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-23 02:17:00 +0000 |
| commit | fe21987ec9897434345d1b52d9073ae20c748778 (patch) | |
| tree | 421b48c7054939d1aa29b7dfc22180ca88e73b32 | |
| parent | 702925415896ab799e7ec55c98806c8bf76eaeab (diff) | |
| download | chromium_src-fe21987ec9897434345d1b52d9073ae20c748778.zip chromium_src-fe21987ec9897434345d1b52d9073ae20c748778.tar.gz chromium_src-fe21987ec9897434345d1b52d9073ae20c748778.tar.bz2 | |
Fix tree bustage
tbr=evanm
Review URL: http://codereview.chromium.org/4203
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2471 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | net/url_request/url_request_http_job.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/url_request/url_request_http_job.cc b/net/url_request/url_request_http_job.cc index 094acd8..fe1332d 100644 --- a/net/url_request/url_request_http_job.cc +++ b/net/url_request/url_request_http_job.cc @@ -422,7 +422,8 @@ void URLRequestHttpJob::NotifyHeadersComplete() { } // Get list of SDCH dictionary requests, and schedule them to be loaded. - if (SdchManager::Global()->IsInSupportedDomain(request_->url())) { + if (SdchManager::Global() && + SdchManager::Global()->IsInSupportedDomain(request_->url())) { static const std::string name = "Get-Dictionary"; std::string url_text; void* iter = NULL; @@ -501,7 +502,8 @@ void URLRequestHttpJob::AddExtraHeaders() { context->accept_charset() + "\r\n"; } - if (!SdchManager::Global()->IsInSupportedDomain(request_->url())) { + if (!SdchManager::Global() || + !SdchManager::Global()->IsInSupportedDomain(request_->url())) { // Tell the server what compression formats we support (other than SDCH). request_info_.extra_headers += "Accept-Encoding: gzip,deflate,bzip2\r\n"; return; |