Merge pull request #1075 from pushkarnk/urlsession-warnings-improvement

Author: swift-ci

Foundation/NSURLProtocol.swift

@@ -159,6 +159,9 @@ open class URLProtocol : NSObject {
 
     private static var _registeredProtocolClasses = [AnyClass]()
     private static var _classesLock = NSLock()
+
+    //TODO: The right way to do this is using URLProtocol.property(forKey:in) and URLProtocol.setProperty(_:forKey:in)
+    var properties: [URLProtocol._PropertyKey: Any] = [:]
     /*! 
         @method initWithRequest:cachedResponse:client:
         @abstract Initializes an NSURLProtocol given request, 

Foundation/NSURLSession/NSURLSessionTask.swift

@@ -543,13 +543,14 @@ extension _ProtocolClient : URLProtocolClient {
             task.state = .completed
             session.taskRegistry.remove(task)
         case .dataCompletionHandler(let completion):
-            let data = Data()
-            guard let client = `protocol`.client else { fatalError() }
-            client.urlProtocol(`protocol`, didLoad: data)
-            return
+            session.delegateQueue.addOperation {
+                completion(`protocol`.properties[URLProtocol._PropertyKey.responseData] as? Data ?? Data(), task.response, nil)
+                task.state = .completed
+                session.taskRegistry.remove(task)
+            }
         case .downloadCompletionHandler(let completion):
             session.delegateQueue.addOperation {
-                completion(task.currentRequest?.url, task.response, nil)
+                completion(`protocol`.properties[URLProtocol._PropertyKey.temporaryFileURL] as? URL, task.response, nil)
                 task.state = .completed
                 session.taskRegistry.remove(task)
             }
@@ -565,18 +566,8 @@ extension _ProtocolClient : URLProtocolClient {
     }
 
     func urlProtocol(_ protocol: URLProtocol, didLoad data: Data) {
-        guard let task = `protocol`.task else { fatalError() }
-        guard let session = task.session as? URLSession else { fatalError() }
-        switch session.behaviour(for: task) {
-        case .dataCompletionHandler(let completion):
-            guard let s = task.session as? URLSession else { fatalError() }
-            s.delegateQueue.addOperation {
-                completion(data, task.response, nil)
-                task.state = .completed
-                s.taskRegistry.remove(task)
-            }
-        default: return
-        }
+        `protocol`.properties[.responseData] = data
+        //TODO: this method needs to be extended to call the urlSession(_:dataTask:didReceive:)
     }
 
     func urlProtocol(_ protocol: URLProtocol, didFailWithError error: Error) {
@@ -615,3 +606,10 @@ extension _ProtocolClient : URLProtocolClient {
         NSUnimplemented()
     }
 }
+
+extension URLProtocol {
+    enum _PropertyKey: String {
+        case responseData
+        case temporaryFileURL
+    }
+}

Foundation/NSURLSession/http/HTTPURLProtocol.swift

@@ -679,10 +679,10 @@ extension _HTTPURLProtocol {
             }
             self.client?.urlProtocol(self, didLoad: data)
             self.internalState = .taskCompleted
-            return
         }
 
-        if case .toFile(_, let fileHandle?) = bodyDataDrain {
+        if case .toFile(let url, let fileHandle?) = bodyDataDrain {
+            self.properties[.temporaryFileURL] = url
             fileHandle.closeFile()
         }
         self.client?.urlProtocolDidFinishLoading(self)