From 6461c5836a30cf28212af305671668ef327689bb Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 5 Dec 2012 16:52:06 -0500 Subject: [PATCH] LP#1268619: websocket : mutex cleanup Signed-off-by: Bill Erickson --- src/gateway/osrf_websocket_translator.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/gateway/osrf_websocket_translator.c b/src/gateway/osrf_websocket_translator.c index 4ce4db20..fa548211 100644 --- a/src/gateway/osrf_websocket_translator.c +++ b/src/gateway/osrf_websocket_translator.c @@ -72,7 +72,7 @@ typedef struct _osrfWebsocketTranslator { const WebSocketServer *server; apr_pool_t *main_pool; // standalone per-process pool - apr_pool_t *session_pool; // child of trans->main_pool; per-session + apr_pool_t *session_pool; // child of r->pool; per-session apr_hash_t *session_cache; apr_thread_t *responder_thread; apr_thread_mutex_t *mutex; @@ -565,6 +565,7 @@ void CALLBACK on_disconnect_handler( void CALLBACK on_destroy_handler(WebSocketPlugin *plugin) { if (trans) { apr_thread_exit(trans->responder_thread, APR_SUCCESS); + apr_thread_mutex_destroy(trans->mutex); apr_pool_destroy(trans->main_pool); } -- 2.43.2