Merge pull request #1013 from mamabusi/swift-3.1-branch

Author: swift-ci

Foundation/NSHTTPCookieStorage.swift

@@ -47,7 +47,7 @@ open class HTTPCookieStorage: NSObject {
         allCookies = [:]
         cookieAcceptPolicy = .always
         super.init()
-        cookieFilePath = filePath(path: _CFXDGCreateConfigHomePath()._swiftObject, fileName: "/.cookies." + cookieStorageName)
+        cookieFilePath = filePath(path: _CFXDGCreateDataHomePath()._swiftObject, fileName: "/.cookies." + cookieStorageName)
         loadPersistedCookies()
     }
 
@@ -65,7 +65,7 @@ open class HTTPCookieStorage: NSObject {
         guard !FileManager.default.fileExists(atPath: path) else { return true }
 
         do {
-            try FileManager.default.createDirectory(atPath: path, withIntermediateDirectories: false, attributes: nil)
+            try FileManager.default.createDirectory(atPath: path, withIntermediateDirectories: true, attributes: nil)
             return true
         } catch {
             return false
@@ -77,7 +77,7 @@ open class HTTPCookieStorage: NSObject {
             return path + fileName
         }
         //if we were unable to create the desired directory, create the cookie file in the `pwd`
-        return fileName
+        return FileManager.default.currentDirectoryPath + fileName
     }
 
     open var cookies: [HTTPCookie]? {

TestFoundation/TestNSHTTPCookieStorage.swift

@@ -227,10 +227,10 @@ class TestNSHTTPCookieStorage: XCTestCase {
         storage.setCookie(testCookie)
         XCTAssertEqual(storage.cookies!.count, 3)
         var destPath: String
-        if let xdg_config_home = getenv("XDG_CONFIG_HOME") {
-            destPath = String(utf8String: xdg_config_home)! + "/.cookies.shared"
+        if let xdg_data_home = getenv("XDG_DATA_HOME") {
+            destPath = String(utf8String: xdg_data_home)! + "/.cookies.shared"
         } else {
-            destPath = NSHomeDirectory() + "/.config/.cookies.shared"
+            destPath = NSHomeDirectory() + "/.local/share/.cookies.shared"
         }
         let fm = FileManager.default
         var isDir = false
@@ -243,7 +243,7 @@ class TestNSHTTPCookieStorage: XCTestCase {
         let task = Process()
         task.launchPath = bundlePath.substring(to: pathIndex!) + "/xdgTestHelper/xdgTestHelper"
         var environment = ProcessInfo.processInfo.environment
-        environment["XDG_CONFIG_HOME"] =  NSHomeDirectory() + "/TestXDG"
+        environment["XDG_DATA_HOME"] =  NSHomeDirectory() + "/TestXDG"
         task.environment = environment
         // Launch the task
         task.launch()

TestFoundation/XDGTestHelper.swift

@@ -7,11 +7,11 @@ let simpleCookie = HTTPCookie(properties: [
             .path: "/",
             .domain: "example.com",
             ])!
-let rawValue = getenv("XDG_CONFIG_HOME")        
-let xdg_config_home = String(utf8String: rawValue!)
+let rawValue = getenv("XDG_DATA_HOME")
+let xdg_data_home = String(utf8String: rawValue!)
 storage.setCookie(simpleCookie)
 let fm = FileManager.default
-let destPath = xdg_config_home! + "/.cookies.shared"
+let destPath = xdg_data_home! + "/.cookies.shared"
 var isDir = false
 let exists = fm.fileExists(atPath: destPath, isDirectory: &isDir) 
 if (!exists) {