Merge branch 'master' into esp32

2018-02-06 20:24:03 +01:00
parent 0b10299549 642750e232
commit 887683fabb
7 changed files with 163 additions and 12 deletions
--- a/src/WebSocketsServer.h
+++ b/src/WebSocketsServer.h
@@ -44,7 +44,7 @@ public:
 #endif

        WebSocketsServer(uint16_t port, String origin = "", String protocol = "arduino");
-        ~WebSocketsServer(void);
+        virtual ~WebSocketsServer(void);

        void begin(void);