From cc7d96e3d5a71b8ff38e532ac8d7fb15dcf6af66 Mon Sep 17 00:00:00 2001 From: Erik Date: Mon, 25 Jan 2016 10:46:03 -0500 Subject: [PATCH] remove trailing / from urls --- Source/SocketIOClient.swift | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/Source/SocketIOClient.swift b/Source/SocketIOClient.swift index fac7f77..21b619d 100644 --- a/Source/SocketIOClient.swift +++ b/Source/SocketIOClient.swift @@ -62,11 +62,17 @@ public final class SocketIOClient: NSObject, SocketEngineClient, SocketParsable public init(socketURL: String, options: Set = []) { self.options = options - if socketURL["https://"].matches().count != 0 { + if socketURL.hasPrefix("https://") { self.options.insertIgnore(.Secure(true)) } + + var cleanedURL = socketURL["https?://"] <~ "" + + if cleanedURL.hasSuffix("/") { + cleanedURL = String(cleanedURL.characters.dropLast()) + } - self.socketURL = socketURL["https?://"] <~ "" + self.socketURL = cleanedURL for option in options { switch option {