Automated import from //branches/master/...@140426,140426

diff --git a/WebCore/platform/network/ResourceResponseBase.cpp b/WebCore/platform/network/ResourceResponseBase.cpp
index f84e97d..92ece8c 100644 (file)
--- a/WebCore/platform/network/ResourceResponseBase.cpp
+++ b/WebCore/platform/network/ResourceResponseBase.cpp
@@ -239,7 +239,7 @@ void ResourceResponseBase::parseCacheControlDirectives() const
         if ((equalIgnoringCase(directives[i].first, "private") || equalIgnoringCase(directives[i].first, "no-cache")) && !directives[i].second.isEmpty())
             parseCacheControlDirectiveValues(directives[i].second, directiveValues);
         else
-            directiveValues.append(directives[i].second);
+            directiveValues.append(directives[i].first);
         for (size_t i = 0; i < directiveValues.size(); ++i) {
             if (equalIgnoringCase(directiveValues[i], "no-cache"))
                 m_cacheControlContainsNoCache = true;

diff --git a/WebCore/platform/network/ResourceResponseBase.h b/WebCore/platform/network/ResourceResponseBase.h
index abc756e..c06f75b 100644 (file)
--- a/WebCore/platform/network/ResourceResponseBase.h
+++ b/WebCore/platform/network/ResourceResponseBase.h
@@ -88,7 +88,7 @@ public:
     {
         if (!m_haveParsedCacheControl)
             parseCacheControlDirectives();
-        return m_cacheControlContainsMustRevalidate;
+        return m_cacheControlContainsNoCache;
     }
     bool cacheControlContainsMustRevalidate() const
     {