add extraHeaders option fixes. nuclearace/Socket.IO-Client-Swift#64
This commit is contained in:
parent
531a9784da
commit
a49f8f19cf
@ -110,6 +110,7 @@ Options
|
|||||||
- `log: Bool` If `true` socket will log debug messages. Default is false.
|
- `log: Bool` If `true` socket will log debug messages. Default is false.
|
||||||
- `sessionDelegate: NSURLSessionDelegate` Sets an NSURLSessionDelegate for the underlying engine. Useful if you need to handle self-signed certs. Default is nil.
|
- `sessionDelegate: NSURLSessionDelegate` Sets an NSURLSessionDelegate for the underlying engine. Useful if you need to handle self-signed certs. Default is nil.
|
||||||
- `path: String` - If the server uses a custom path. ex: `"/swift"`. Default is `""`
|
- `path: String` - If the server uses a custom path. ex: `"/swift"`. Default is `""`
|
||||||
|
- `extraHeaders: [String: String]?` - Adds custom headers to the initial request. Default is nil.
|
||||||
|
|
||||||
Methods
|
Methods
|
||||||
-------
|
-------
|
||||||
|
|||||||
@ -37,6 +37,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
|
|||||||
|
|
||||||
private var closed = false
|
private var closed = false
|
||||||
private var _connected = false
|
private var _connected = false
|
||||||
|
private var extraHeaders:[String: String]?
|
||||||
private var fastUpgrade = false
|
private var fastUpgrade = false
|
||||||
private var forcePolling = false
|
private var forcePolling = false
|
||||||
private var forceWebsockets = false
|
private var forceWebsockets = false
|
||||||
@ -109,6 +110,7 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
|
|||||||
cookies = opts?["cookies"] as? [NSHTTPCookie]
|
cookies = opts?["cookies"] as? [NSHTTPCookie]
|
||||||
log = opts?["log"] as? Bool ?? false
|
log = opts?["log"] as? Bool ?? false
|
||||||
socketPath = opts?["path"] as? String ?? ""
|
socketPath = opts?["path"] as? String ?? ""
|
||||||
|
extraHeaders = opts?["extraHeaders"] as? [String: String]
|
||||||
}
|
}
|
||||||
|
|
||||||
deinit {
|
deinit {
|
||||||
@ -194,6 +196,13 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
|
|||||||
private func createWebsocket(andConnect connect:Bool) {
|
private func createWebsocket(andConnect connect:Bool) {
|
||||||
ws = WebSocket(url: NSURL(string: urlWebSocket! + "&sid=\(sid)")!,
|
ws = WebSocket(url: NSURL(string: urlWebSocket! + "&sid=\(sid)")!,
|
||||||
cookies: cookies)
|
cookies: cookies)
|
||||||
|
|
||||||
|
if extraHeaders != nil {
|
||||||
|
for (headerName, value) in extraHeaders! {
|
||||||
|
ws?.headers[headerName] = value
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ws?.queue = handleQueue
|
ws?.queue = handleQueue
|
||||||
ws?.delegate = self
|
ws?.delegate = self
|
||||||
|
|
||||||
@ -229,6 +238,12 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
|
|||||||
req.allHTTPHeaderFields = headers
|
req.allHTTPHeaderFields = headers
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if extraHeaders != nil {
|
||||||
|
for (headerName, value) in extraHeaders! {
|
||||||
|
req.setValue(value, forHTTPHeaderField: headerName)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
doRequest(req)
|
doRequest(req)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -477,6 +492,12 @@ public final class SocketEngine: NSObject, WebSocketDelegate, SocketLogClient {
|
|||||||
reqPolling.allHTTPHeaderFields = headers
|
reqPolling.allHTTPHeaderFields = headers
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if extraHeaders != nil {
|
||||||
|
for (headerName, value) in extraHeaders! {
|
||||||
|
reqPolling.setValue(value, forHTTPHeaderField: headerName)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
doRequest(reqPolling)
|
doRequest(reqPolling)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user