Changeset 252127 in webkit

Timestamp:

Nov 6, 2019 12:28:28 AM (5 years ago)

Author:

youenn@apple.com

Message:

There is no need to clean the content type header of a request if it is null
​https://bugs.webkit.org/show_bug.cgi?id=203853

Reviewed by Geoffrey Garen.

No change of behavior.

• loader/CrossOriginAccessControl.cpp:

(WebCore::cleanHTTPRequestHeadersForAccessControl):
Stop early if content type is null so that we do not log an error that is not a real error.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/CrossOriginAccessControl.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-06  youenn fablet  <youenn@apple.com>
+
+        There is no need to clean the content type header of a request if it is null
+        https://bugs.webkit.org/show_bug.cgi?id=203853
+
+        Reviewed by Geoffrey Garen.
+
+        No change of behavior.
+
+        * loader/CrossOriginAccessControl.cpp:
+        (WebCore::cleanHTTPRequestHeadersForAccessControl):
+        Stop early if content type is null so that we do not log an error that is not a real error.
+
 2019-11-05  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/loader/CrossOriginAccessControl.cpp

@@ -154 +154 @@
 {
     // Remove headers that may have been added by the network layer that cause access control to fail.
-    if (!headersToKeep.contains(HTTPHeadersToKeepFromCleaning::ContentType) && !isCrossOriginSafeRequestHeader(HTTPHeaderName::ContentType, request.httpContentType()))
-        request.clearHTTPContentType();
+    if (!headersToKeep.contains(HTTPHeadersToKeepFromCleaning::ContentType)) {
+        auto contentType = request.httpContentType();
+        if (!contentType.isNull() && !isCrossOriginSafeRequestHeader(HTTPHeaderName::ContentType, contentType))
+            request.clearHTTPContentType();
+    }
     if (!headersToKeep.contains(HTTPHeadersToKeepFromCleaning::Referer))
         request.clearHTTPReferrer();