diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-06-29 02:00:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-29 02:00:00 +0200 |
| commit | eb318d3e04ac6d3bb01b0f2a8311d06ba55c3a2b (patch) | |
| tree | fd201e83d6eb98279834916018c0aec762614f1c /modules/websocket/wsl_server.cpp | |
| parent | b2e7152180de09f38f68d45f1f49954733cfe7de (diff) | |
| parent | 458437edef19bc4ddcb0a5a9b41d337a33471398 (diff) | |
Merge pull request #49966 from Faless/net/4.x_ws_timeout
[Net] Add WebSocketServer handshake_timeout property.
Diffstat (limited to 'modules/websocket/wsl_server.cpp')
| -rw-r--r-- | modules/websocket/wsl_server.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/websocket/wsl_server.cpp b/modules/websocket/wsl_server.cpp index 22bb1b6d1a..ccdb6e9292 100644 --- a/modules/websocket/wsl_server.cpp +++ b/modules/websocket/wsl_server.cpp @@ -95,8 +95,8 @@ bool WSLServer::PendingPeer::_parse_request(const Vector<String> p_protocols) { return true; } -Error WSLServer::PendingPeer::do_handshake(const Vector<String> p_protocols) { - if (OS::get_singleton()->get_ticks_msec() - time > WSL_SERVER_TIMEOUT) { +Error WSLServer::PendingPeer::do_handshake(const Vector<String> p_protocols, uint64_t p_timeout) { + if (OS::get_singleton()->get_ticks_msec() - time > p_timeout) { return ERR_TIMEOUT; } if (use_ssl) { @@ -188,7 +188,7 @@ void WSLServer::poll() { List<Ref<PendingPeer>> remove_peers; for (List<Ref<PendingPeer>>::Element *E = _pending.front(); E; E = E->next()) { Ref<PendingPeer> ppeer = E->get(); - Error err = ppeer->do_handshake(_protocols); + Error err = ppeer->do_handshake(_protocols, handshake_timeout); if (err == ERR_BUSY) { continue; } else if (err != OK) { |