Fix for URLSession redirect does not inherit request timeout value[SR…

Foundation/NSURLSession/http/EasyHandle.swift

@@ -240,9 +240,16 @@ extension _EasyHandle {
         try! CFURLSession_easy_setopt_int64(rawHandle, CFURLSessionOptionINFILESIZE_LARGE, length).asError()
     }
 
-   func set(timeout value: Int) {
+    func set(timeout value: Int) {
        try! CFURLSession_easy_setopt_long(rawHandle, CFURLSessionOptionTIMEOUT, value).asError()
-   }
+    }
+
+    func getTimeoutIntervalSpent() -> Double {
+        var timeSpent = Double()
+        CFURLSession_easy_getinfo_double(rawHandle, CFURLSessionInfoTOTAL_TIME, &timeSpent)
+        return timeSpent / 1000
+    }
+
 }
 
 fileprivate func printLibcurlDebug(handle: CFURLSessionEasyHandle, type: CInt, data: UnsafeMutablePointer<Int8>, size: Int, userInfo: UnsafeMutableRawPointer?) -> CInt {

Foundation/NSURLSession/http/HTTPURLProtocol.swift

@@ -901,6 +901,8 @@ internal extension _HTTPURLProtocol {
         components.path = targetURL.relativeString
         guard let urlString = components.string else { fatalError("Invalid URL") }
         request.url = URL(string: urlString)
+        let timeSpent = easyHandle.getTimeoutIntervalSpent()
+        request.timeoutInterval = fromRequest.timeoutInterval - timeSpent
 	return request
     }
 }

TestFoundation/TestNSURLSession.swift

@@ -39,6 +39,7 @@ class TestURLSession : XCTestCase {
             ("test_timeoutInterval", test_timeoutInterval),
             ("test_customProtocol", test_customProtocol),
             ("test_httpRedirection", test_httpRedirection),
+            ("test_httpRedirectionTimeout", test_httpRedirectionTimeout),
         ]
     }
 
@@ -351,6 +352,23 @@ class TestURLSession : XCTestCase {
         d.run(with: url)
         waitForExpectations(timeout: 12)
     }
+
+    func test_httpRedirectionTimeout() {
+        var req = URLRequest(url: URL(string: "http://127.0.0.1:\(TestURLSession.serverPort)/UnitedStates")!)
+        req.timeoutInterval = 3
+        let config = URLSessionConfiguration.default
+        var expect = expectation(description: "download task with handler")
+        let session = URLSession(configuration: config, delegate: nil, delegateQueue: nil)
+        let task = session.dataTask(with: req) { data, response, error in
+            defer { expect.fulfill() }
+            if let e = error as? URLError {
+                XCTAssertEqual(e.code, .timedOut, "Unexpected error code")
+                return
+            }
+        }
+        task.resume()
+        waitForExpectations(timeout: 12)
+    }
 }
 
 class SessionDelegate: NSObject, URLSessionDelegate {