summaryrefslogtreecommitdiffstats
path: root/webkit/appcache/appcache_update_job.cc
diff options
context:
space:
mode:
authormichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-21 21:36:04 +0000
committermichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-21 21:36:04 +0000
commit6e310446bfe008bdda0028a2a589767c9c1219e6 (patch)
tree6d6153817791f346562c54b2892acbfde5b4f4bb /webkit/appcache/appcache_update_job.cc
parent74819e8c28a42d8eab635a6164a45120b1710662 (diff)
downloadchromium_src-6e310446bfe008bdda0028a2a589767c9c1219e6.zip
chromium_src-6e310446bfe008bdda0028a2a589767c9c1219e6.tar.gz
chromium_src-6e310446bfe008bdda0028a2a589767c9c1219e6.tar.bz2
No longer check for a specific mime-type on appcache manifest files. The spec was recently changed in this way.
BUG=103939 TEST=appcache_update_job_unittest.cc Review URL: http://codereview.chromium.org/8566020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111000 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/appcache/appcache_update_job.cc')
-rw-r--r--webkit/appcache/appcache_update_job.cc23
1 files changed, 7 insertions, 16 deletions
diff --git a/webkit/appcache/appcache_update_job.cc b/webkit/appcache/appcache_update_job.cc
index b0c5966..d4a8ab6 100644
--- a/webkit/appcache/appcache_update_job.cc
+++ b/webkit/appcache/appcache_update_job.cc
@@ -438,17 +438,13 @@ void AppCacheUpdateJob::HandleManifestFetchCompleted(
net::URLRequest* request = fetcher->request();
int response_code = -1;
- std::string mime_type;
bool is_valid_response_code = false;
- bool is_valid_mime_type = false;
if (request->status().is_success()) {
response_code = request->GetResponseCode();
is_valid_response_code = (response_code / 100 == 2);
- request->GetMimeType(&mime_type);
- is_valid_mime_type = (mime_type == kManifestMimeType);
}
- if (is_valid_response_code && is_valid_mime_type) {
+ if (is_valid_response_code) {
manifest_data_ = fetcher->manifest_data();
manifest_response_info_.reset(
new net::HttpResponseInfo(request->response_info()));
@@ -462,17 +458,9 @@ void AppCacheUpdateJob::HandleManifestFetchCompleted(
update_type_ == UPGRADE_ATTEMPT) {
service_->storage()->MakeGroupObsolete(group_, this); // async
} else {
- std::string message;
- if (!is_valid_response_code) {
- const char* kFormatString = "Manifest fetch failed (%d) %s";
- message = base::StringPrintf(kFormatString, response_code,
- manifest_url_.spec().c_str());
- } else {
- DCHECK(!is_valid_mime_type);
- const char* kFormatString = "Invalid manifest mime type (%s) %s";
- message = base::StringPrintf(kFormatString, mime_type.c_str(),
- manifest_url_.spec().c_str());
- }
+ const char* kFormatString = "Manifest fetch failed (%d) %s";
+ std::string message = base::StringPrintf(kFormatString, response_code,
+ manifest_url_.spec().c_str());
HandleCacheFailure(message);
}
}
@@ -881,6 +869,9 @@ void AppCacheUpdateJob::BuildUrlFileList(const Manifest& manifest) {
AddUrlToFileList(GURL(*it), AppCacheEntry::EXPLICIT);
}
+ // TODO(michaeln): Add resources from intercept namepsaces too.
+ // http://code.google.com/p/chromium/issues/detail?id=101565
+
const std::vector<FallbackNamespace>& fallbacks =
manifest.fallback_namespaces;
for (std::vector<FallbackNamespace>::const_iterator it = fallbacks.begin();