Merge pull request #59 from marain87/master

#58 fix open socket with custom header issue
WrathChaos · Jul 25, 2019 · 1aa33a2 · 1aa33a2
2 parents 52c6852 + 6686c68
commit 1aa33a2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Example/StompClientLib.swift b/Example/StompClientLib.swift
@@ -134,7 +134,9 @@ public class StompClientLib: NSObject, SRWebSocketDelegate {
     private func connect() {
         if socket?.readyState == .OPEN {
             // Support for Spring Boot 2.1.x
-            connectionHeaders = [StompCommands.commandHeaderAcceptVersion:"1.1,1.2"]
+            if (connectionHeaders == nil) {
+                connectionHeaders = [StompCommands.commandHeaderAcceptVersion:"1.1,1.2"]
+            }
             // at the moment only anonymous logins
             self.sendFrame(command: StompCommands.commandConnect, header: connectionHeaders, body: nil)
         } else {

diff --git a/StompClientLib/Classes/StompClientLib.swift b/StompClientLib/Classes/StompClientLib.swift
@@ -134,7 +134,9 @@ public class StompClientLib: NSObject, SRWebSocketDelegate {
     private func connect() {
         if socket?.readyState == .OPEN {
             // Support for Spring Boot 2.1.x
-            connectionHeaders = [StompCommands.commandHeaderAcceptVersion:"1.1,1.2"]
+            if (connectionHeaders == nil) {
+            	connectionHeaders = [StompCommands.commandHeaderAcceptVersion:"1.1,1.2"]
+            }
             // at the moment only anonymous logins
             self.sendFrame(command: StompCommands.commandConnect, header: connectionHeaders, body: nil)
         } else {