bump websocket

This commit is contained in:
Erik 2015-09-28 13:44:16 -04:00
parent c757ede90e
commit 166d59341c

View File

@ -319,9 +319,12 @@ public class WebSocket : NSObject, NSStreamDelegate {
let length = inputStream!.read(buffer, maxLength: BUFFER_MAX) let length = inputStream!.read(buffer, maxLength: BUFFER_MAX)
if length > 0 { if length > 0 {
if !connected { if !connected {
let status = processHTTP(buffer, bufferLen: length) connected = processHTTP(buffer, bufferLen: length)
if !status { if !connected {
doDisconnect(errorWithDetail("Invalid HTTP upgrade", code: 1)) let response = CFHTTPMessageCreateEmpty(kCFAllocatorDefault, false).takeRetainedValue()
CFHTTPMessageAppendBytes(response, buffer, length)
let code = CFHTTPMessageGetResponseStatusCode(response)
doDisconnect(errorWithDetail("Invalid HTTP upgrade", code: UInt16(code)))
} }
} else { } else {
var process = false var process = false
@ -372,7 +375,6 @@ public class WebSocket : NSObject, NSStreamDelegate {
if validateResponse(buffer, bufferLen: totalSize) { if validateResponse(buffer, bufferLen: totalSize) {
dispatch_async(queue,{ [weak self] in dispatch_async(queue,{ [weak self] in
guard let s = self else { return } guard let s = self else { return }
s.connected = true
if let connectBlock = s.onConnect { if let connectBlock = s.onConnect {
connectBlock() connectBlock()
} }