kgiusti commented on a change in pull request #660: DISPATCH-1513 - Fixed
router crash when running http requests over ht…
URL: https://github.com/apache/qpid-dispatch/pull/660#discussion_r366918885
##########
File path: cmake/FindLibWebSockets.cmake
##########
@@ -60,6 +60,20 @@ else()
LIBWEBSOCKETS DEFAULT_MSG LIBWEBSOCKETS_VERSION_STRING
LIBWEBSOCKETS_LIBRARIES LIBWEBSOCKETS_INCLUDE_DIRS)
endif()
+
+if (LIBWEBSOCKETS_FOUND)
+ # This is a fix for DISPATCH-1513. libwebsockets versions 3.2.0 introduces a
new flag called LWS_SERVER_OPTION_ALLOW_HTTP_ON_HTTPS_LISTENER
+ # The new flag allows (as the flag says) HTTP pver HTTPS listeners. Since
this flag is not available before lws 3.2.0 we need
+ # to selectively include the flag in http-libwebsockets.c
+ set(OPTION_ALLOW_HTTP_ON_HTTPS_LISTENER "")
+ set(TEST_OPTION_ALLOW_HTTP_ON_HTTPS_LISTENER "#")
+ set(LWS_VERSION_WITH_SSL_FIX "3.2.0")
+ if (LIBWEBSOCKETS_VERSION_STRING AND (LIBWEBSOCKETS_VERSION_STRING
VERSION_GREATER_EQUAL LWS_VERSION_WITH_SSL_FIX))
+ set(OPTION_ALLOW_HTTP_ON_HTTPS_LISTENER "|
LWS_SERVER_OPTION_ALLOW_HTTP_ON_HTTPS_LISTENER")
Review comment:
Can you instead check the libwebsockets version directly in
http-libwebsockets.c?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
