actually fixed caching

buildasaurs · Oct 14, 2015 · 4790580 · 4790580
1 parent 0a8d2a4
commit 4790580
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/BuildaUtils/HTTPUtils.swift b/BuildaUtils/HTTPUtils.swift
@@ -12,13 +12,21 @@ public class HTTP {
 
     public var session: NSURLSession
 
-    public init(session: NSURLSession = NSURLSession.sharedSession()) {
+    public init(session: NSURLSession?) {
 
-        //disable all caching
-        session.configuration.requestCachePolicy = .ReloadIgnoringCacheData
-        session.configuration.URLCache = nil
-
-        self.session = session
+        if let session = session {
+            self.session = session
+        } else {
+
+            let configuration = NSURLSessionConfiguration.defaultSessionConfiguration()
+
+            //disable all caching
+            configuration.requestCachePolicy = NSURLRequestCachePolicy.ReloadIgnoringCacheData
+            configuration.URLCache = nil
+
+            let session = NSURLSession(configuration: configuration)
+            self.session = session
+        }
     }
 
     public typealias Completion = (response: NSHTTPURLResponse?, body: AnyObject?, error: NSError?) -> ()

diff --git a/BuildaUtils/Server.swift b/BuildaUtils/Server.swift
@@ -13,6 +13,6 @@ public class HTTPServer : NSObject {
     public let http: HTTP
 
     public init(http: HTTP? = nil) {
-        self.http = http ?? HTTP()
+        self.http = http ?? HTTP(session: nil)
     }
 }