Allow having no open handler

yongju-hong · Jan 19, 2020 · 588d234 · 588d234
1 parent 5da9926
commit 588d234
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/App.h b/src/App.h
@@ -232,13 +232,14 @@ struct TemplatedApp {
                             webSocket->init(perMessageDeflate, slidingDeflateWindow, std::move(backpressure))
                             );
 
-                /* Emit open event and start the timeout */
-                if (behavior.open) {
-                    us_socket_timeout(SSL, (us_socket_t *) webSocket, behavior.idleTimeout);
+                /* Arm idleTimeout */
+                us_socket_timeout(SSL, (us_socket_t *) webSocket, behavior.idleTimeout);
 
-                    /* Default construct the UserData right before calling open handler */
-                    new (webSocket->getUserData()) UserData;
+                /* Default construct the UserData right before calling open handler */
+                new (webSocket->getUserData()) UserData;
 
+                /* Emit open event and start the timeout */
+                if (behavior.open) {
                     behavior.open(webSocket, req);
                 }