cheykrym/socket.io-client-swift
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development'

Browse Source 
* development:
  Revert "double encoding should be getting fixed, make the default false"
This commit is contained in:
Erik 2017-03-30 18:53:11 -04:00
commit 23050890e9
No known key found for this signature in database
GPG Key ID: 4930B7C5FBC1A69D
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SocketIO-MacTests/SocketEngineTest.swift
View File

@ -82,10 +82,8 @@ class SocketEngineTest: XCTestCase {
XCTAssertEqual(data[0] as? String, "lïne one\nlīne \rtwo", "Failed string test") XCTAssertEqual(data[0] as? String, "lïne one\nlīne \rtwo", "Failed string test")
expect.fulfill() expect.fulfill()
} }
engine = SocketEngine(client: client, url: URL(string: "http://localhost")!, config: [.doubleEncodeUTF8(true)])
engine.parsePollingMessage("41:42[\"stringTest\",\"lïne one\\nlīne \\rtwo\"]") engine.parsePollingMessage("41:42[\"stringTest\",\"lïne one\\nlīne \\rtwo\"]")
waitForExpectations(timeout: 3, handler: nil) waitForExpectations(timeout: 3, handler: nil)
} }

2
Source/SocketEngine.swift
View File

@ -42,7 +42,7 @@ public final class SocketEngine : NSObject, URLSessionDelegate, SocketEnginePoll
public private(set) var closed = false public private(set) var closed = false
public private(set) var connected = false public private(set) var connected = false
public private(set) var cookies: [HTTPCookie]? public private(set) var cookies: [HTTPCookie]?
public private(set) var doubleEncodeUTF8 = false public private(set) var doubleEncodeUTF8 = true
public private(set) var extraHeaders: [String: String]? public private(set) var extraHeaders: [String: String]?
public private(set) var fastUpgrade = false public private(set) var fastUpgrade = false
public private(set) var forcePolling = false public private(set) var forcePolling = false