Changeset 109661 in webkit

Timestamp:

Mar 3, 2012, 10:49:50 AM (13 years ago)

Author:

bbudge@chromium.org

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:

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/AssociatedURLLoader.cpp (modified) (3 diffs)
• tests/AssociatedURLLoaderTest.cpp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-03-03  Bill Budge  <bbudge@chromium.org>
+
+        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  <danakj@chromium.org>
 

trunk/Source/WebKit/chromium/src/AssociatedURLLoader.cpp

@@ -80 +80 @@
 }
 
+// FIXME: Remove this and use WebCore code that does the same thing.
 class HTTPResponseHeaderValidator : public WebHTTPHeaderVisitor {
     WTF_MAKE_NONCOPYABLE(HTTPResponseHeaderValidator);
@@ -98 +99 @@
     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))
@@ -113 +114 @@
         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)

trunk/Source/WebKit/chromium/tests/AssociatedURLLoaderTest.cpp

@@ -242 +242 @@
         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);