Title: [109661] trunk/Source/WebKit/chromium
- Revision
- 109661
- Author
- [email protected]
- Date
- 2012-03-03 10:49:50 -0800 (Sat, 03 Mar 2012)
Log Message
Fixes AssociatedURLLoader support for Access-Control-Expose-Headers field in response.
https://bugs.webkit.org/show_bug.cgi?id=80198
Reviewed by Adam Barth.
* src/AssociatedURLLoader.cpp:
* tests/AssociatedURLLoaderTest.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (109660 => 109661)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-03-03 12:34:40 UTC (rev 109660)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-03-03 18:49:50 UTC (rev 109661)
@@ -1,3 +1,13 @@
+2012-03-03 Bill Budge <[email protected]>
+
+ Fixes AssociatedURLLoader support for Access-Control-Expose-Headers field in response.
+ https://bugs.webkit.org/show_bug.cgi?id=80198
+
+ Reviewed by Adam Barth.
+
+ * src/AssociatedURLLoader.cpp:
+ * tests/AssociatedURLLoaderTest.cpp:
+
2012-03-02 Dana Jansens <[email protected]>
[Chromium] Allow plugins to set opaque() on their platform layer
Modified: trunk/Source/WebKit/chromium/src/AssociatedURLLoader.cpp (109660 => 109661)
--- trunk/Source/WebKit/chromium/src/AssociatedURLLoader.cpp 2012-03-03 12:34:40 UTC (rev 109660)
+++ trunk/Source/WebKit/chromium/src/AssociatedURLLoader.cpp 2012-03-03 18:49:50 UTC (rev 109661)
@@ -79,6 +79,7 @@
m_isSafe = m_isSafe && isValidHTTPToken(name) && XMLHttpRequest::isAllowedHTTPHeader(name) && isValidHTTPHeaderValue(value);
}
+// FIXME: Remove this and use WebCore code that does the same thing.
class HTTPResponseHeaderValidator : public WebHTTPHeaderVisitor {
WTF_MAKE_NONCOPYABLE(HTTPResponseHeaderValidator);
public:
@@ -97,7 +98,7 @@
{
String headerName(name);
if (m_usingAccessControl) {
- if (equalIgnoringCase(headerName, "access-control-expose-header"))
+ if (equalIgnoringCase(headerName, "access-control-expose-headers"))
parseAccessControlExposeHeadersAllowList(value, m_exposedHeaders);
else if (!isOnAccessControlResponseHeaderWhitelist(headerName))
m_blockedHeaders.add(name);
@@ -112,7 +113,7 @@
m_exposedHeaders.remove("set-cookie");
m_exposedHeaders.remove("set-cookie2");
// Block Access-Control-Expose-Header itself. It could be exposed later.
- m_blockedHeaders.add("access-control-expose-header");
+ m_blockedHeaders.add("access-control-expose-headers");
HTTPHeaderSet::const_iterator end = m_exposedHeaders.end();
for (HTTPHeaderSet::const_iterator it = m_exposedHeaders.begin(); it != end; ++it)
m_blockedHeaders.remove(*it);
Modified: trunk/Source/WebKit/chromium/tests/AssociatedURLLoaderTest.cpp (109660 => 109661)
--- trunk/Source/WebKit/chromium/tests/AssociatedURLLoaderTest.cpp 2012-03-03 12:34:40 UTC (rev 109660)
+++ trunk/Source/WebKit/chromium/tests/AssociatedURLLoaderTest.cpp 2012-03-03 18:49:50 UTC (rev 109661)
@@ -241,7 +241,7 @@
m_expectedResponse.setMIMEType("text/html");
m_expectedResponse.addHTTPHeaderField("Access-Control-Allow-Origin", "*");
if (exposed)
- m_expectedResponse.addHTTPHeaderField("access-control-expose-header", headerNameString);
+ m_expectedResponse.addHTTPHeaderField("access-control-expose-headers", headerNameString);
m_expectedResponse.addHTTPHeaderField(headerNameString, "foo");
webkit_support::RegisterMockedURL(url, m_expectedResponse, m_frameFilePath);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
