| Index: Source/core/loader/CrossOriginPreflightResultCache.cpp
|
| diff --git a/Source/core/loader/CrossOriginPreflightResultCache.cpp b/Source/core/loader/CrossOriginPreflightResultCache.cpp
|
| index d2a119b9aa9e70460a47e7ca89990fd89bc80eea..c0070fb8a9a25cffe14e6a1877646d24e80b790e 100644
|
| --- a/Source/core/loader/CrossOriginPreflightResultCache.cpp
|
| +++ b/Source/core/loader/CrossOriginPreflightResultCache.cpp
|
| @@ -103,8 +103,9 @@ bool CrossOriginPreflightResultCacheItem::parse(const ResourceResponse& response
|
| if (parseAccessControlMaxAge(response.httpHeaderField("Access-Control-Max-Age"), expiryDelta)) {
|
| if (expiryDelta > maxPreflightCacheTimeoutSeconds)
|
| expiryDelta = maxPreflightCacheTimeoutSeconds;
|
| - } else
|
| + } else {
|
| expiryDelta = defaultPreflightCacheTimeoutSeconds;
|
| + }
|
|
|
| m_absoluteExpiryTime = currentTime() + expiryDelta;
|
| return true;
|
| @@ -112,7 +113,7 @@ bool CrossOriginPreflightResultCacheItem::parse(const ResourceResponse& response
|
|
|
| bool CrossOriginPreflightResultCacheItem::allowsCrossOriginMethod(const String& method, String& errorDescription) const
|
| {
|
| - if (m_methods.contains(method) || isOnAccessControlSimpleRequestMethodWhitelist(method))
|
| + if (m_methods.contains(method) || CrossOriginAccessControl::isSimpleMethod(method))
|
| return true;
|
|
|
| errorDescription = "Method " + method + " is not allowed by Access-Control-Allow-Methods.";
|
| @@ -123,7 +124,7 @@ bool CrossOriginPreflightResultCacheItem::allowsCrossOriginHeaders(const HTTPHea
|
| {
|
| HTTPHeaderMap::const_iterator end = requestHeaders.end();
|
| for (HTTPHeaderMap::const_iterator it = requestHeaders.begin(); it != end; ++it) {
|
| - if (!m_headers.contains(it->key) && !isOnAccessControlSimpleRequestHeaderWhitelist(it->key, it->value)) {
|
| + if (!m_headers.contains(it->key) && !CrossOriginAccessControl::isSimpleHeader(it->key, it->value)) {
|
| errorDescription = "Request header field " + it->key.string() + " is not allowed by Access-Control-Allow-Headers.";
|
| return false;
|
| }
|
|
|