diff options
| author | huey@chromium.org <huey@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-11 14:17:10 +0000 |
|---|---|---|
| committer | huey@chromium.org <huey@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-11 14:17:10 +0000 |
| commit | 3988f107e408370fe0c2989f5fb43d80bc06bca9 (patch) | |
| tree | 01b4b96c11c31b748938dd78d79ab618ad730033 /net | |
| parent | 2d44d30a6c3c2dfbabb2a1268852baa5a8c980eb (diff) | |
| download | chromium_src-3988f107e408370fe0c2989f5fb43d80bc06bca9.zip chromium_src-3988f107e408370fe0c2989f5fb43d80bc06bca9.tar.gz chromium_src-3988f107e408370fe0c2989f5fb43d80bc06bca9.tar.bz2 | |
If SDCH is disabled, don't add an SDCH filter
This avoids a crash when SDCH is disabled, but the "Content-Encoding" response header contains "sdch".
BUG=167218
Review URL: https://codereview.chromium.org/138533008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250395 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/filter/filter.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/filter/filter.cc b/net/filter/filter.cc index 93583c1..244abae 100644 --- a/net/filter/filter.cc +++ b/net/filter/filter.cc @@ -369,7 +369,10 @@ Filter* Filter::PrependNewFilter(FilterType type_id, break; case FILTER_TYPE_SDCH: case FILTER_TYPE_SDCH_POSSIBLE: - first_filter.reset(InitSdchFilter(type_id, filter_context, buffer_size)); + if (SdchManager::Global() && SdchManager::sdch_enabled()) { + first_filter.reset( + InitSdchFilter(type_id, filter_context, buffer_size)); + } break; default: break; |