talksik/uWebSockets
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix checking if we actively drain backpressure (#1179)

Browse Source 
in WebSocketContext::us_socket_context_on_writable()
This commit is contained in:
ronen37
2021-01-26 12:40:36 +01:00
committed by GitHub
parent 12d8b192a1
commit d7d2c22750
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/WebSocketContext.h
+3 -3
View File
@@ -322,8 +322,8 @@ private:
asyncSocket->write(nullptr, 0); asyncSocket->write(nullptr, 0);
/* Behavior: if we actively drain backpressure, always reset timeout (even if we are in shutdown) */ /* Behavior: if we actively drain backpressure, always reset timeout (even if we are in shutdown) */
/* Also emit drain event if we came here with 0 backpressure */ /* Also reset timeout if we came here with 0 backpressure */
if (!backpressure || backpressure < asyncSocket->getBufferedAmount()) { if (!backpressure || backpressure > asyncSocket->getBufferedAmount()) {
auto *webSocketContextData = (WebSocketContextData<SSL> *) us_socket_context_ext(SSL, us_socket_context(SSL, (us_socket_t *) s)); auto *webSocketContextData = (WebSocketContextData<SSL> *) us_socket_context_ext(SSL, us_socket_context(SSL, (us_socket_t *) s));
asyncSocket->timeout(webSocketContextData->idleTimeout); asyncSocket->timeout(webSocketContextData->idleTimeout);
} }
@@ -336,7 +336,7 @@ private:
asyncSocket->shutdown(); asyncSocket->shutdown();
} }
} else if (!backpressure || backpressure > asyncSocket->getBufferedAmount()) { } else if (!backpressure || backpressure > asyncSocket->getBufferedAmount()) {
/* Only call drain if we actually drained backpressure */ /* Only call drain if we actually drained backpressure or if we came here with 0 backpressure */
auto *webSocketContextData = (WebSocketContextData<SSL> *) us_socket_context_ext(SSL, us_socket_context(SSL, (us_socket_t *) s)); auto *webSocketContextData = (WebSocketContextData<SSL> *) us_socket_context_ext(SSL, us_socket_context(SSL, (us_socket_t *) s));
if (webSocketContextData->drainHandler) { if (webSocketContextData->drainHandler) {
webSocketContextData->drainHandler((WebSocket<SSL, isServer> *) s); webSocketContextData->drainHandler((WebSocket<SSL, isServer> *) s);