Merge branch 'master' into development

* master:
  Revert "add note about socket.io 2.0 and unicode"
This commit is contained in:
Erik 2017-05-20 16:44:52 -04:00
commit 7cf4d527df
No known key found for this signature in database
GPG Key ID: 4930B7C5FBC1A69D

View File

@ -51,15 +51,12 @@ SocketIOClient* socket = [[SocketIOClient alloc] initWithSocketURL:url config:@{
``` ```
## Features ## Features
- Supports socket.io 1.0+<sup>a</sup> - Supports socket.io 1.0+
- Supports binary - Supports binary
- Supports Polling and WebSockets - Supports Polling and WebSockets
- Supports TLS/SSL - Supports TLS/SSL
- Can be used from Objective-C - Can be used from Objective-C
_<sub>a: For socket.io 2.0+ servers, client versions less than v10.0 must pass .doubleEncodeUTF8(false) as a config,
otherwise unicode will become garbled</sub>_
## Installation ## Installation
Requires Swift 3/Xcode 8.x Requires Swift 3/Xcode 8.x