You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ch...@apache.org on 2018/03/23 15:48:45 UTC
qpid-dispatch git commit: DISPATCH-945: Prevent crash at shutdown
when websocket client connected
Repository: qpid-dispatch
Updated Branches:
refs/heads/master 627616850 -> f790e9975
DISPATCH-945: Prevent crash at shutdown when websocket client connected
Execute qd_http_server_free before the server is shut down so that
lws vhost and context destruction activity is handled properly.
This closes #271
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/f790e997
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/f790e997
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/f790e997
Branch: refs/heads/master
Commit: f790e9975bb9503d8a7acc257586812f63217696
Parents: 6276168
Author: Chuck Rolke <cr...@redhat.com>
Authored: Fri Mar 23 11:42:24 2018 -0400
Committer: Chuck Rolke <cr...@redhat.com>
Committed: Fri Mar 23 11:42:24 2018 -0400
----------------------------------------------------------------------
src/server.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/f790e997/src/server.c
----------------------------------------------------------------------
diff --git a/src/server.c b/src/server.c
index d27260d..a8dc423 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1173,7 +1173,6 @@ qd_server_t *qd_server(qd_dispatch_t *qd, int thread_count, const char *containe
void qd_server_free(qd_server_t *qd_server)
{
if (!qd_server) return;
- qd_http_server_free(qd_server->http);
pn_proactor_free(qd_server->proactor);
qd_connection_t *ctx = DEQ_HEAD(qd_server->conn_list);
while (ctx) {
@@ -1222,6 +1221,7 @@ void qd_server_run(qd_dispatch_t *qd)
}
free(threads);
qd_http_server_stop(qd_server->http); /* Stop HTTP threads immediately */
+ qd_http_server_free(qd_server->http);
qd_log(qd_server->log_source, QD_LOG_NOTICE, "Shut Down");
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org