Merge branch 'master' into master

2017-02-07 16:05:20 -05:00
parent 7810d0d0b3 26fc61f7a2
commit 60e3d1080e
9 changed files with 94 additions and 11 deletions
--- a/src/WebSocketsClient.h
+++ b/src/WebSocketsClient.h
@@ -68,6 +68,9 @@ class WebSocketsClient: private WebSockets {
        bool sendBIN(uint8_t * payload, size_t length, bool headerToPayload = false);
        bool sendBIN(const uint8_t * payload, size_t length);

+        bool sendPing(uint8_t * payload = NULL, size_t length = 0);
+        bool sendPing(String & payload);
+
        void disconnect(void);

        void setAuthorization(const char * user, const char * password);