Changeset 238785 in webkit

Timestamp:

Dec 1, 2018, 2:04:44 PM (8 years ago)

Author:

ap@apple.com

Message:

Modernize version check for _suppressedAutoAddedHTTPHeaders
​https://bugs.webkit.org/show_bug.cgi?id=192175

Reviewed by Tim Horton.

Source/WebCore/PAL:

• pal/spi/cf/CFNetworkSPI.h: Curiously, it was forward declared twice, for no

apparent reason.

Source/WebKit:

• NetworkProcess/cocoa/NetworkSessionCocoa.mm: (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):

Also removed selector check - we only need to support running on 10.13.0 when building
with 10.13.0 SDK.

Source/WTF:

• wtf/Platform.h:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/Platform.h (modified) (1 diff)
• WebCore/PAL/ChangeLog (modified) (1 diff)
• WebCore/PAL/pal/spi/cf/CFNetworkSPI.h (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2018-12-01  Alexey Proskuryakov  <ap@apple.com>
+
+        Modernize version check for _suppressedAutoAddedHTTPHeaders
+        https://bugs.webkit.org/show_bug.cgi?id=192175
+
+        Reviewed by Tim Horton.
+
+        * wtf/Platform.h:
+
 2018-11-30  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WTF/wtf/Platform.h

@@ -1411 +1411 @@
 #define HAVE_CFNETWORK_WITH_IGNORE_HSTS 1
 #endif
+
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300 && __MAC_OS_X_VERSION_MAX_ALLOWED >= 101302) || PLATFORM(IOS_FAMILY)
+#define HAVE_CFNETWORK_WITH_AUTO_ADDED_HTTP_HEADER_SUPPRESSION_SUPPORT 1
+/* FIXME: Does this work, and is this needed on other iOS family platforms? */
+#if PLATFORM(MAC) || PLATFORM(IOS)
+#define USE_CFNETWORK_AUTO_ADDED_HTTP_HEADER_SUPPRESSION 1
+#endif
+#endif

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2018-12-01  Alexey Proskuryakov  <ap@apple.com>
+
+        Modernize version check for _suppressedAutoAddedHTTPHeaders
+        https://bugs.webkit.org/show_bug.cgi?id=192175
+
+        Reviewed by Tim Horton.
+
+        * pal/spi/cf/CFNetworkSPI.h: Curiously, it was forward declared twice, for no
+        apparent reason.
+
 2018-11-30  Don Olmstead  <don.olmstead@sony.com>
 

trunk/Source/WebCore/PAL/pal/spi/cf/CFNetworkSPI.h

@@ -60 +60 @@
 #if defined(__OBJC__) && PLATFORM(COCOA)
 #import <CFNetwork/CFNSURLConnection.h>
-
-#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MAX_ALLOWED < 101302
-@interface NSURLSessionConfiguration ()
-@property (nullable, copy) NSSet *_suppressedAutoAddedHTTPHeaders;
-@end
-#endif
-
 #endif
 
@@ -187 +180 @@
 @property (nullable, copy) NSString *_CTDataConnectionServiceType;
 #endif
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
+#if HAVE(CFNETWORK_WITH_AUTO_ADDED_HTTP_HEADER_SUPPRESSION_SUPPORT)
 @property (nullable, copy) NSSet *_suppressedAutoAddedHTTPHeaders;
 #endif

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-12-01  Alexey Proskuryakov  <ap@apple.com>
+
+        Modernize version check for _suppressedAutoAddedHTTPHeaders
+        https://bugs.webkit.org/show_bug.cgi?id=192175
+
+        Reviewed by Tim Horton.
+
+        * NetworkProcess/cocoa/NetworkSessionCocoa.mm: (WebKit::NetworkSessionCocoa::NetworkSessionCocoa):
+        Also removed selector check - we only need to support running on 10.13.0 when building
+        with 10.13.0 SDK.
+
 2018-11-30  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm

@@ -660 +660 @@
     NSURLSessionConfiguration *configuration = configurationForSessionID(m_sessionID);
 
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101300) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000)
+#if USE(CFNETWORK_AUTO_ADDED_HTTP_HEADER_SUPPRESSION)
     // Without this, CFNetwork would sometimes add a Content-Type header to our requests (rdar://problem/34748470).
-    if ([configuration respondsToSelector:@selector(_suppressedAutoAddedHTTPHeaders)])
-        configuration._suppressedAutoAddedHTTPHeaders = [NSSet setWithObject:@"Content-Type"];
+    configuration._suppressedAutoAddedHTTPHeaders = [NSSet setWithObject:@"Content-Type"];
 #endif