Skip to content
This repository has been archived by the owner on May 14, 2024. It is now read-only.

1.x and backward support, missing binary but working otherwise #216

Open
wants to merge 27 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
afc682c
v0.5.2
pkyeck Mar 23, 2014
c7e5d27
update changelog to v0.5.2
pkyeck Mar 23, 2014
883b99a
add note about v1.0
pkyeck Jun 18, 2014
7ccd121
add note about v1.0
pkyeck Jun 18, 2014
349584e
Update README.md
pkyeck Jun 18, 2014
1abdd75
[ENH]Support for socket.io 1.0.x
Jun 27, 2014
fc62823
[FIX]Improve design packet + parse message better
Jun 30, 2014
c1abc0d
[PERF]Improve parser for data coming
francoisTemasys Jul 1, 2014
8965fad
Add the missing '='
francoisTemasys Sep 15, 2014
b0096e9
crude hack to get ack callback on with socketio 1.0
francoisp Sep 22, 2014
e781145
fixed packet encoding to keep backward compatibility with 0.9
francoisp Sep 23, 2014
ddd3c9e
updated readme
francoisp Sep 23, 2014
2c39a95
cleaner fix for ack 0.9 and 1.0 cb
francoisp Sep 23, 2014
a0b2252
fix when ack number more than 1 digit
hearther Oct 26, 2014
f359053
Merge pull request #1 from hearther/master
francoisp Oct 28, 2014
81b4c20
if response has not "{" character, code was crashed.
Dec 16, 2014
d4cf185
Merge pull request #2 from Binusz/master
francoisp Dec 19, 2014
1f0bdff
Added payload to ping packet as required by engine.io
pbihler Feb 11, 2015
2af82b3
Merge pull request #5 from pbihler/master
francoisp Feb 11, 2015
22baa68
Update README.md
francoisp Feb 23, 2015
90cbfcf
add podspec, thanks to toblerpwn for sample
francoisp Feb 26, 2015
9d5339a
Small fixes for 64bit
pbihler Feb 11, 2015
405cbdb
Updated SocketRocket submodule commit
pbihler Mar 18, 2015
2f13a44
More fixes to remove warnings when building with 64bit
pbihler Mar 18, 2015
5978de3
Merge branch '64bitFix'
pbihler Mar 18, 2015
65dd00b
Merge pull request #7 from pbihler/64bitFix
francoisp Mar 18, 2015
102b36b
changes suggested by louis49 to support namespace
francoisp Mar 24, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## 0.5.2 (2014-03-23)

- check HTTP status code of NSURLConnection responses during xhr polling transport


## 0.5.1 (2014-03-14)

- add method to pass cookies on handshake
Expand Down
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
**This fork supports some socket.io v1.x features, (no binary support yet). Many thanks to francoisTemasys who did most of the heavy lifting; this is a fork of a fork. v0.9.x compatibility is generally maintained.


---

# Socket.IO / Objective C Library

Interface to communicate between Objective C and [Socket.IO](http://socket.io/)
Expand All @@ -10,8 +15,7 @@

## Requirements

As of version 0.4, this library requires at least OS X 10.7 or iOS 5.0.
Because of this, we were able to remove the external JSON frameworks in v0.5 and only rely on iOS' own `NSJSONSerialization`.
This library requires at least OS X 10.7 or iOS 5.0.


## Usage
Expand Down
6 changes: 6 additions & 0 deletions SocketIO.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#import <Foundation/Foundation.h>

#import "SocketIOTransport.h"
#import "SocketIOPacket.h"

@class SocketIO;
@class SocketIOPacket;
Expand All @@ -41,6 +42,7 @@ typedef enum {
} SocketIOErrorCodes;



@protocol SocketIODelegate <NSObject>
@optional
- (void) socketIODidConnect:(SocketIO *)socket;
Expand All @@ -61,6 +63,8 @@ typedef enum {
NSString *_endpoint;
NSDictionary *_params;

SocketIOVersion _version;

__weak id<SocketIODelegate> _delegate;

NSObject <SocketIOTransport> *_transport;
Expand All @@ -75,7 +79,9 @@ typedef enum {

// heartbeat
NSTimeInterval _heartbeatTimeout;
NSTimeInterval _connectionTimeout;
dispatch_source_t _timeout;
dispatch_source_t _heartbeat;

NSMutableArray *_queue;

Expand Down
Loading