Merge pull request #1339 from ianpartridge/sr-6405

Author: swift-ci

Foundation/NSURLRequest.swift

@@ -159,6 +159,8 @@ open class NSURLRequest : NSObject, NSSecureCoding, NSCopying, NSMutableCopying
         guard aDecoder.allowsKeyedCoding else {
             preconditionFailure("Unkeyed coding is unsupported.")
         }
+
+        super.init()
 
         if let encodedURL = aDecoder.decodeObject(forKey: "NS.url") as? NSURL {
             self.url = encodedURL._swiftObject
@@ -267,8 +269,28 @@ open class NSURLRequest : NSObject, NSSecureCoding, NSCopying, NSMutableCopying
 
     open internal(set) var timeoutInterval: TimeInterval = 60.0
 
+    internal var _httpMethod: String? = "GET"
+
     /// Returns the HTTP request method of the receiver.
-    open fileprivate(set) var httpMethod: String? = "GET"
+    open fileprivate(set) var httpMethod: String? {
+        get { return _httpMethod }
+        set { _httpMethod = NSURLRequest._normalized(newValue) }
+    }
+
+    private class func _normalized(_ raw: String?) -> String {
+        guard let raw = raw else {
+            return "GET"
+        }
+
+        let nsMethod = NSString(raw)
+
+        for method in ["GET", "HEAD", "POST", "PUT", "DELETE", "CONNECT"] {
+            if nsMethod.caseInsensitiveCompare(method) == .orderedSame {
+                return method
+            }
+        }
+        return raw
+    }
 
     /// A dictionary containing all the HTTP header fields
     /// of the receiver.

TestFoundation/TestNSURLRequest.swift

@@ -29,7 +29,8 @@ class TestNSURLRequest : XCTestCase {
             ("test_mutableCopy_3", test_mutableCopy_3),
             ("test_NSCoding_1", test_NSCoding_1),
             ("test_NSCoding_2", test_NSCoding_2),
-            ("test_NSCoding_3", test_NSCoding_3)
+            ("test_NSCoding_3", test_NSCoding_3),
+            ("test_methodNormalization", test_methodNormalization),
         ]
     }
 
@@ -240,4 +241,46 @@ class TestNSURLRequest : XCTestCase {
         XCTAssertEqual(3, requestB.httpBody!.count)
         XCTAssertEqual(requestB.httpBody, requestA.httpBody)
     }
+
+    func test_methodNormalization() {
+        let expectedNormalizations = [
+            "GET": "GET",
+            "get": "GET",
+            "gEt": "GET",
+            "HEAD": "HEAD",
+            "hEAD": "HEAD",
+            "head": "HEAD",
+            "HEAd": "HEAD",
+            "POST": "POST",
+            "post": "POST",
+            "pOST": "POST",
+            "POSt": "POST",
+            "PUT": "PUT",
+            "put": "PUT",
+            "PUt": "PUT",
+            "DELETE": "DELETE",
+            "delete": "DELETE",
+            "DeleTE": "DELETE",
+            "dELETe": "DELETE",
+            "CONNECT": "CONNECT",
+            "connect": "CONNECT",
+            "Connect": "CONNECT",
+            "cOnNeCt": "CONNECT",
+            "OPTIONS": "OPTIONS",
+            "options": "options",
+            "TRACE": "TRACE",
+            "trace": "trace",
+            "PATCH": "PATCH",
+            "patch": "patch",
+            "foo": "foo",
+            "BAR": "BAR",
+        ]
+
+        let request = NSMutableURLRequest(url: url)
+
+        for n in expectedNormalizations {
+            request.httpMethod = n.key
+            XCTAssertEqual(request.httpMethod, n.value)
+        }
+    }
 }

TestFoundation/TestURLRequest.swift

@@ -27,6 +27,7 @@ class TestURLRequest : XCTestCase {
             ("test_mutableCopy_1", test_mutableCopy_1),
             ("test_mutableCopy_2", test_mutableCopy_2),
             ("test_mutableCopy_3", test_mutableCopy_3),
+            ("test_methodNormalization", test_methodNormalization),
         ]
     }
 
@@ -194,5 +195,47 @@ class TestURLRequest : XCTestCase {
         XCTAssertEqual(originalRequest.url, urlA)
         XCTAssertNil(originalRequest.allHTTPHeaderFields)
     }
+
+    func test_methodNormalization() {
+        let expectedNormalizations = [
+            "GET": "GET",
+            "get": "GET",
+            "gEt": "GET",
+            "HEAD": "HEAD",
+            "hEAD": "HEAD",
+            "head": "HEAD",
+            "HEAd": "HEAD",
+            "POST": "POST",
+            "post": "POST",
+            "pOST": "POST",
+            "POSt": "POST",
+            "PUT": "PUT",
+            "put": "PUT",
+            "PUt": "PUT",
+            "DELETE": "DELETE",
+            "delete": "DELETE",
+            "DeleTE": "DELETE",
+            "dELETe": "DELETE",
+            "CONNECT": "CONNECT",
+            "connect": "CONNECT",
+            "Connect": "CONNECT",
+            "cOnNeCt": "CONNECT",
+            "OPTIONS": "OPTIONS",
+            "options": "options",
+            "TRACE": "TRACE",
+            "trace": "trace",
+            "PATCH": "PATCH",
+            "patch": "patch",
+            "foo": "foo",
+            "BAR": "BAR",
+            ]
+
+        var request = URLRequest(url: url)
+
+        for n in expectedNormalizations {
+            request.httpMethod = n.key
+            XCTAssertEqual(request.httpMethod, n.value)
+        }
+    }
 }