added subprotocol for ssl client also

brtiberio · brtiberio · commit 358d8c769ea2 · 2016-01-24T17:08:22.000Z
diff --git a/src/WebSocketsClient.cpp b/src/WebSocketsClient.cpp
@@ -72,14 +72,14 @@ void WebSocketsClient::begin(String host, uint16_t port, String url, String Prot
 }
 
 #if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
-void WebSocketsClient::beginSSL(const char *host, uint16_t port, const char * url, const char * fingerprint) {
-    begin(host, port, url);
+void WebSocketsClient::beginSSL(const char *host, uint16_t port, const char * url, const char * fingerprint, const char * Protocol) {
+    begin(host, port, url, Protocol);
     _client.isSSL = true;
     _fingerprint = fingerprint;
 }
 
-void WebSocketsClient::beginSSL(String host, uint16_t port, String url, String fingerprint) {
-    beginSSL(host.c_str(), port, url.c_str(), fingerprint.c_str());
+void WebSocketsClient::beginSSL(String host, uint16_t port, String url, String fingerprint, String Protocol) {
+    beginSSL(host.c_str(), port, url.c_str(), fingerprint.c_str(), Protocol.c_str());
 }
 #endif
 
diff --git a/src/WebSocketsClient.h b/src/WebSocketsClient.h
@@ -40,8 +40,8 @@ class WebSocketsClient: private WebSockets {
         void begin(String host, uint16_t port, String url = "/", String Protocol = "arduino");
 
 #if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)
-        void beginSSL(const char *host, uint16_t port, const char * url = "/", const char * = "");
-        void beginSSL(String host, uint16_t port, String url = "/", String fingerprint = "");
+        void beginSSL(const char *host, uint16_t port, const char * url = "/", const char * = "", const char * Protocol = "arduino");
+        void beginSSL(String host, uint16_t port, String url = "/", String fingerprint = "", String Protocol = "arduino");
 #endif
 
         void loop(void);

Original file line number	Diff line number	Diff line change
`@@ -72,14 +72,14 @@ void WebSocketsClient::begin(String host, uint16_t port, String url, String Prot`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`#if (WEBSOCKETS_NETWORK_TYPE == NETWORK_ESP8266)`
`75`		`-void WebSocketsClient::beginSSL(const char host, uint16_t port, const char url, const char * fingerprint) {`
`76`		`- begin(host, port, url);`
	`75`	`+void WebSocketsClient::beginSSL(const char host, uint16_t port, const char url, const char * fingerprint, const char * Protocol) {`
	`76`	`+ begin(host, port, url, Protocol);`
`77`	`77`	`_client.isSSL = true;`
`78`	`78`	`_fingerprint = fingerprint;`
`79`	`79`	`}`
`80`	`80`
`81`		`-void WebSocketsClient::beginSSL(String host, uint16_t port, String url, String fingerprint) {`
`82`		`- beginSSL(host.c_str(), port, url.c_str(), fingerprint.c_str());`
	`81`	`+void WebSocketsClient::beginSSL(String host, uint16_t port, String url, String fingerprint, String Protocol) {`
	`82`	`+ beginSSL(host.c_str(), port, url.c_str(), fingerprint.c_str(), Protocol.c_str());`
`83`	`83`	`}`
`84`	`84`	`#endif`
`85`	`85`