Fix for URLSession redirect does not inherit request timeout value[SR-2682]

Author: saiHemak

Foundation/NSURLSession/http/EasyHandle.swift

@@ -240,9 +240,18 @@ 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 getTimetaken() -> Double {
+        let timeTaken = UnsafeMutablePointer<Double>.allocate(capacity: 8)
+        CFURLSession_easy_getinfo_double(rawHandle, CFURLSessionInfoTOTAL_TIME,  UnsafeMutablePointer<Double>(timeTaken))
+        let timeSpent = timeTaken.pointee
+        timeTaken.deallocate(capacity: 8)
+        return timeSpent
+    }
+
 }
 
 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.getTimetaken() / 1000
+        request.timeoutInterval = fromRequest.timeoutInterval - timeSpent
 	return request
     }
 }

TestFoundation/TestNSURLSession.swift

@@ -37,8 +37,9 @@ class TestURLSession : XCTestCase {
             ("test_verifyRequestHeaders", test_verifyRequestHeaders),
             ("test_verifyHttpAdditionalHeaders", test_verifyHttpAdditionalHeaders),
             ("test_timeoutInterval", test_timeoutInterval),
-	    ("test_customProtocol", test_customProtocol),
-	    ("test_httpRedirection", test_httpRedirection),
+            ("test_customProtocol", test_customProtocol),
+            ("test_httpRedirection", test_httpRedirection),
+            ("test_httpRedirectionTimeout", test_httpRedirectionTimeout),
         ]
     }
 
@@ -415,7 +416,7 @@ class TestURLSession : XCTestCase {
         let serverReady = ServerSemaphore()
         globalDispatchQueue.async {
             do {
-                try self.runServer(with: serverReady, startDelay: 3, sendDelay: 5, bodyChunks: 3)
+                try self.runServer(with: serverReady, sendDelay: 5, bodyChunks: 1)
             } catch {
                 XCTAssertTrue(true)
                 return
@@ -485,6 +486,33 @@ class TestURLSession : XCTestCase {
         d.run(with: url)
         waitForExpectations(timeout: 12)
     }
+
+    func test_httpRedirectionTimeout() {
+        let serverReady = ServerSemaphore()
+        globalDispatchQueue.async {
+            do {
+                try self.runServer(with: serverReady, sendDelay: 2, bodyChunks: 1)
+            } catch {
+                XCTAssertTrue(true)
+                return
+            }
+        }
+        serverReady.wait()
+        var req = URLRequest(url: URL(string: "http://127.0.0.1:\(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 {