Repository: qpid-dispatch Updated Branches: refs/heads/master 361a7e9a6 -> b974b884a
DISPATCH-390: Temporarily disable http for first cut proactor work First cut of proactor integration will not support HTTP. Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/0539dc4d Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/0539dc4d Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/0539dc4d Branch: refs/heads/master Commit: 0539dc4d5450353222913a81c251feed1258e5fc Parents: 361a7e9 Author: Alan Conway <[email protected]> Authored: Thu Jan 19 10:28:12 2017 -0500 Committer: Alan Conway <[email protected]> Committed: Thu Apr 27 13:28:24 2017 -0400 ---------------------------------------------------------------------- CMakeLists.txt | 5 ++++- src/server.c | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/0539dc4d/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/CMakeLists.txt b/CMakeLists.txt index 46f651e..a06c67f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -103,8 +103,11 @@ find_library(rt_lib rt) find_package(Proton 0.15 REQUIRED) ## Optional dependencies + include(FindLibWebSockets) -option(USE_LIBWEBSOCKETS "Use libwebsockets for WebSocket support" ${LIBWEBSOCKETS_FOUND}) +# FIXME aconway 2017-01-19: websockets disbled for temporary proactor work. +# option(USE_LIBWEBSOCKETS "Use libwebsockets for WebSocket support" ${LIBWEBSOCKETS_FOUND}) +set(USE_LIBWEBSOCKETS OFF) ## ## Find Valgrind http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/0539dc4d/src/server.c ---------------------------------------------------------------------- diff --git a/src/server.c b/src/server.c index 3875083..848cfcb 100644 --- a/src/server.c +++ b/src/server.c @@ -1564,7 +1564,6 @@ void qd_connection_set_context(qd_connection_t *conn, void *context) void *qd_connection_get_context(qd_connection_t *conn) { - /* FIXME aconway 2017-04-20: needs to be thread safe with respect to deletion */ return conn->user_context; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
