From c032ace244b7356d55e3a4bd1a9edd47f932568a Mon Sep 17 00:00:00 2001
From: Timothy Stonis <tim@Timothys-New-MacBook-Air.local>
Date: Sat, 7 Feb 2015 11:27:15 -0500
Subject: [PATCH 1/2] Add support for a path in the URL

---
 SocketIO.h                   |  1 +
 SocketIO.m                   | 10 +++++-----
 SocketIOTransport.h          |  1 +
 SocketIOTransportWebsocket.m | 12 ++++++------
 SocketIOTransportXHR.m       | 12 ++++++------
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/SocketIO.h b/SocketIO.h
index 67ceb23..01b38d8 100755
--- a/SocketIO.h
+++ b/SocketIO.h
@@ -101,6 +101,7 @@ typedef enum {
 @property (nonatomic, readonly) NSString *sid;
 @property (nonatomic, readonly) NSTimeInterval heartbeatTimeout;
 @property (nonatomic) BOOL useSecure;
+@property (nonatomic) NSString *path;
 @property (nonatomic) NSArray *cookies;
 @property (nonatomic, readonly) BOOL isConnected, isConnecting;
 @property (nonatomic, weak) id<SocketIODelegate> delegate;
diff --git a/SocketIO.m b/SocketIO.m
index a2497f8..25dfa15 100755
--- a/SocketIO.m
+++ b/SocketIO.m
@@ -36,11 +36,11 @@
 #define DEBUGLOG(...)
 #endif
 
-static NSString* kResourceName = @"socket.io";
+static NSString* kResourceName = @"/socket.io";
 static NSString* kTransportPolling = @"polling";
 static NSString* kTransportWebsocket = @"websocket";
-static NSString* kHandshakeURL = @"%@://%@%@/%@/1/?EIO=2&transport=%@&t=%.0f%@";
-static NSString* kForceDisconnectURL = @"%@://%@%@/%@/1/xhr-polling/%@?disconnect";
+static NSString* kHandshakeURL = @"%@://%@%@%@%@/1/?EIO=2&transport=%@&t=%.0f%@";
+static NSString* kForceDisconnectURL = @"%@://%@%@%@%@/1/xhr-polling/%@?disconnect";
 
 float const defaultConnectionTimeout = 10.0f;
 
@@ -137,7 +137,7 @@ - (void) connectToHost:(NSString *)host
         NSString *protocol = _useSecure ? @"https" : @"http";
         NSString *port = _port ? [NSString stringWithFormat:@":%d", _port] : @"";
         NSTimeInterval time = [[NSDate date] timeIntervalSince1970] * 1000;
-        NSString *handshakeUrl = [NSString stringWithFormat:kHandshakeURL, protocol, _host, port, kResourceName,kTransportPolling, time, query];
+        NSString *handshakeUrl = [NSString stringWithFormat:kHandshakeURL, protocol, _host, port, _path, kResourceName,kTransportPolling, time, query];
         //@"%@://%@%@/%@/1/?t=%.0f%@";
         //http://<host><port>/socket.io/1/?t=<time>f<query>
         
@@ -186,7 +186,7 @@ - (void) disconnectForced
 {
     NSString *protocol = [self useSecure] ? @"https" : @"http";
     NSString *port = _port ? [NSString stringWithFormat:@":%d", _port] : @"";
-    NSString *urlString = [NSString stringWithFormat:kForceDisconnectURL, protocol, _host, port, kResourceName, _sid];
+    NSString *urlString = [NSString stringWithFormat:kForceDisconnectURL, protocol, _host, port, _path, kResourceName, _sid];
     NSURL *url = [NSURL URLWithString:urlString];
     DEBUGLOG(@"Force disconnect at: %@", urlString);
     
diff --git a/SocketIOTransport.h b/SocketIOTransport.h
index 241ddfc..25b5988 100644
--- a/SocketIOTransport.h
+++ b/SocketIOTransport.h
@@ -38,6 +38,7 @@ typedef enum SocketIOVersion
 @property (nonatomic, readonly) NSString *sid;
 @property (nonatomic, readonly) NSTimeInterval heartbeatTimeout;
 @property (nonatomic) BOOL useSecure;
+@property (nonatomic) NSString *path;
 
 @end
 
diff --git a/SocketIOTransportWebsocket.m b/SocketIOTransportWebsocket.m
index c88c2b9..90db72e 100644
--- a/SocketIOTransportWebsocket.m
+++ b/SocketIOTransportWebsocket.m
@@ -29,10 +29,10 @@
 #define DEBUGLOG(...)
 #endif
 
-static NSString* kInsecureSocketURL = @"ws://%@/socket.io/1/websocket/%@%@";
-static NSString* kSecureSocketURL = @"wss://%@/socket.io/1/websocket/%@%@";
-static NSString* kInsecureSocketPortURL = @"ws://%@:%d/socket.io/1/websocket/%@%@";
-static NSString* kSecureSocketPortURL = @"wss://%@:%d/socket.io/1/websocket/%@%@";
+static NSString* kInsecureSocketURL = @"ws://%@%@/socket.io/1/websocket/%@%@";
+static NSString* kSecureSocketURL = @"wss://%@%@/socket.io/1/websocket/%@%@";
+static NSString* kInsecureSocketPortURL = @"ws://%@:%d%@/socket.io/1/websocket/%@%@";
+static NSString* kSecureSocketPortURL = @"wss://%@:%d%@/socket.io/1/websocket/%@%@";
 
 @implementation SocketIOTransportWebsocket
 
@@ -68,11 +68,11 @@ - (void) openUsing:(SocketIOVersion)version
     
     if (delegate.port) {
         format = delegate.useSecure ? kSecureSocketPortURL : kInsecureSocketPortURL;
-        urlStr = [NSString stringWithFormat:format, delegate.host, delegate.port, addOnVersion, delegate.sid];
+        urlStr = [NSString stringWithFormat:format, delegate.host, delegate.port, delegate.path, addOnVersion, delegate.sid];
     }
     else {
         format = delegate.useSecure ? kSecureSocketURL : kInsecureSocketURL;
-        urlStr = [NSString stringWithFormat:format, delegate.host,addOnVersion, delegate.sid];
+        urlStr = [NSString stringWithFormat:format, delegate.host, delegate.path, addOnVersion, delegate.sid];
     }
     NSURL *url = [NSURL URLWithString:urlStr];
     
diff --git a/SocketIOTransportXHR.m b/SocketIOTransportXHR.m
index 6e610ff..93e6270 100644
--- a/SocketIOTransportXHR.m
+++ b/SocketIOTransportXHR.m
@@ -29,10 +29,10 @@
 #define DEBUGLOG(...)
 #endif
 
-static NSString* kInsecureXHRURL = @"http://%@/socket.io/1/xhr-polling/%@";
-static NSString* kSecureXHRURL = @"https://%@/socket.io/1/xhr-polling/%@";
-static NSString* kInsecureXHRPortURL = @"http://%@:%d/socket.io/1/xhr-polling/%@";
-static NSString* kSecureXHRPortURL = @"https://%@:%d/socket.io/1/xhr-polling/%@";
+static NSString* kInsecureXHRURL = @"http://%@%@/socket.io/1/xhr-polling/%@";
+static NSString* kSecureXHRURL = @"https://%@%@/socket.io/1/xhr-polling/%@";
+static NSString* kInsecureXHRPortURL = @"http://%@:%d%@/socket.io/1/xhr-polling/%@";
+static NSString* kSecureXHRPortURL = @"https://%@:%d%@/socket.io/1/xhr-polling/%@";
 
 @interface SocketIOTransportXHR (Private)
 - (void) checkAndStartPoll;
@@ -67,11 +67,11 @@ - (void) openUsing:(SocketIOVersion)version
     NSString *format;
     if (delegate.port) {
         format = delegate.useSecure ? kSecureXHRPortURL : kInsecureXHRPortURL;
-        _url = [NSString stringWithFormat:format, delegate.host, delegate.port, delegate.sid];
+        _url = [NSString stringWithFormat:format, delegate.host, delegate.port, delegate.path, delegate.sid];
     }
     else {
         format = delegate.useSecure ? kSecureXHRURL : kInsecureXHRURL;
-        _url = [NSString stringWithFormat:format, delegate.host, delegate.sid];
+        _url = [NSString stringWithFormat:format, delegate.host, delegate.path, delegate.sid];
     }
     DEBUGLOG(@"Opening XHR @ %@", _url);
     [self poll:nil];

From f42e4bcaa84ca7c50477f1e3c844c0a285b16d3a Mon Sep 17 00:00:00 2001
From: Timothy Stonis <tim@Timothys-New-MacBook-Air.local>
Date: Sat, 7 Feb 2015 11:42:23 -0500
Subject: [PATCH 2/2] Add a default path of ""

---
 SocketIO.m | 1 +
 1 file changed, 1 insertion(+)

diff --git a/SocketIO.m b/SocketIO.m
index 25dfa15..dcfa4a4 100755
--- a/SocketIO.m
+++ b/SocketIO.m
@@ -91,6 +91,7 @@ - (id) initWithDelegate:(id<SocketIODelegate>)delegate
         _ackCount = 0;
         _acks = [[NSMutableDictionary alloc] init];
         _returnAllDataFromAck = NO;
+        _path=@"";
     }
     return self;
 }