mirror of
https://github.com/warmcat/libwebsockets.git
synced 2025-03-09 00:00:04 +01:00
cmake: Enable WITH_MINIMAL_EXAMPLES by default
Although many of the examples must be run from the example directory as cwd, everyone getting started probably wants to try the examples, cmake knows how to do it, so let's enable it by default.
This commit is contained in:
parent
80e06d2175
commit
53d195022f
44 changed files with 96 additions and 18 deletions
|
@ -175,7 +175,7 @@
|
|||
"platforms": "none,linux-fedora-32/x86_64-amd/gcc"
|
||||
},
|
||||
"default-wolfssl": {
|
||||
"cmake": "-DLWS_WITH_WOLFSSL=1 -DLWS_WOLFSSL_INCLUDE_DIRS=/usr/local/include -DLWS_WOLFSSL_LIBRARIES=/usr/local/lib/libwolfssl.so",
|
||||
"cmake": "-DLWS_WITH_WOLFSSL=1 -DLWS_WOLFSSL_INCLUDE_DIRS=/usr/local/include -DLWS_WOLFSSL_LIBRARIES=/usr/local/lib/libwolfssl.so -DLWS_WITH_MINIMAL_EXAMPLES=0",
|
||||
"platforms": "none,linux-fedora-32/x86_64-amd/gcc"
|
||||
},
|
||||
"default-examples": {
|
||||
|
|
|
@ -270,6 +270,10 @@ if (LWS_PLAT_FREERTOS)
|
|||
set(LWS_WITH_CUSTOM_HEADERS 0)
|
||||
endif()
|
||||
|
||||
if (LWS_WITHOUT_TESTAPPS)
|
||||
set(LWS_WITH_MINIMAL_EXAMPLES 0)
|
||||
endif()
|
||||
|
||||
#if (LWS_WITH_ESP32)
|
||||
# set(LWS_WITH_ZIP_FOPS 1)
|
||||
#endif()
|
||||
|
|
|
@ -287,7 +287,11 @@ option(LWS_WITH_SELFTESTS "Selftests run at context creation" OFF)
|
|||
option(LWS_WITH_GCOV "Build with gcc gcov coverage instrumentation" OFF)
|
||||
option(LWS_WITH_EXPORT_LWSTARGETS "Export libwebsockets CMake targets. Disable if they conflict with an outer cmake project." ON)
|
||||
option(LWS_REPRODUCIBLE "Build libwebsockets reproducible. It removes the build user and hostname from the build" ON)
|
||||
if (ESP_PLATFORM OR LWS_WITH_ESP32 OR LWS_PLAT_BAREMETAL OR LWS_PLAT_FREERTOS)
|
||||
option(LWS_WITH_MINIMAL_EXAMPLES "Also build the normally standalone minimal examples, for QA" OFF)
|
||||
else()
|
||||
option(LWS_WITH_MINIMAL_EXAMPLES "Also build the normally standalone minimal examples, for QA" ON)
|
||||
endif()
|
||||
option(LWS_WITH_LWSAC "lwsac Chunk Allocation api" ON)
|
||||
option(LWS_WITH_CUSTOM_HEADERS "Store and allow querying custom HTTP headers (H1 only)" ON)
|
||||
option(LWS_WITH_DISKCACHE "Hashed cache directory with lazy LRU deletion to size limit (unrelated to lws_cache_ttl)" OFF)
|
||||
|
|
|
@ -227,6 +227,8 @@
|
|||
#cmakedefine LWS_WITH_SYS_METRICS
|
||||
#cmakedefine LWS_WITH_SYS_NTPCLIENT
|
||||
#cmakedefine LWS_WITH_SYS_STATE
|
||||
#cmakedefine LWS_WITHOUT_TEST_SERVER
|
||||
#cmakedefine LWS_WITHOUT_TESTAPPS
|
||||
#cmakedefine LWS_WITH_THREADPOOL
|
||||
#cmakedefine LWS_WITH_TLS
|
||||
#cmakedefine LWS_WITH_TLS_JIT_TRUST
|
||||
|
|
|
@ -198,7 +198,7 @@ lws_plat_init(struct lws_context *context,
|
|||
}
|
||||
|
||||
#endif
|
||||
#if defined(LWS_BUILTIN_PLUGIN_NAMES)
|
||||
#if defined(LWS_BUILTIN_PLUGIN_NAMES) && defined(LWS_WITH_PLUGINS)
|
||||
lws_plugins_handle_builtin(&context->plugin_list,
|
||||
protocol_plugin_cb, context);
|
||||
#endif
|
||||
|
|
|
@ -594,7 +594,7 @@ lws_plat_mbedtls_net_recv(void *ctx, unsigned char *buf, size_t len)
|
|||
return ret;
|
||||
|
||||
en = LWS_ERRNO;
|
||||
if (en == EAGAIN || en == EWOULDBLOCK)
|
||||
if (en == EAGAIN || en == EWOULDBLOCK || en == WSAEWOULDBLOCK)
|
||||
return MBEDTLS_ERR_SSL_WANT_READ;
|
||||
|
||||
ret = WSAGetLastError();
|
||||
|
|
|
@ -394,7 +394,7 @@ endif()
|
|||
|
||||
# Generate self-signed SSL certs for the test-server.
|
||||
|
||||
if (LWS_WITH_SSL AND NOT LWS_WITH_WOLFSSL)
|
||||
if (LWS_WITH_SSL) # AND NOT LWS_WITH_WOLFSSL)
|
||||
message("Searching for OpenSSL executable and dlls")
|
||||
find_package(OpenSSLbins)
|
||||
if (DEFINED OPENSSL_EXECUTABLE)
|
||||
|
|
|
@ -486,7 +486,7 @@ test_cb(struct lejp_ctx *ctx, char reason)
|
|||
for (n = 0; n < ctx->ipos; n++)
|
||||
t += lws_snprintf(i + t, sizeof(i) - (size_t)t - 1ul, "%d, ", ctx->i[n]);
|
||||
|
||||
printf("{ %d, %d, %d, { %s }, \"%s\", \"%s\" },\n", reason, ctx->ipos, ctx->path_match, i, ctx->path, ctx->buf);
|
||||
lwsl_notice("{ %d, %d, %d, { %s }, \"%s\", \"%s\" },\n", reason, ctx->ipos, ctx->path_match, i, ctx->path, ctx->buf);
|
||||
|
||||
if (m < LWS_ARRAY_SIZE(rpkg)) {
|
||||
if (step < rpkg[m].len) {
|
||||
|
|
|
@ -8,12 +8,18 @@ include(LwsCheckRequirements)
|
|||
set(SAMP lws-api-test-lws_cache)
|
||||
set(SRCS main.c)
|
||||
|
||||
add_executable(${SAMP} ${SRCS})
|
||||
add_test(NAME api-test-lws_cache COMMAND lws-api-test-lws_cache)
|
||||
set(requirements 1)
|
||||
require_lws_config(LWS_ROLE_H1 1 requirements)
|
||||
require_lws_config(LWS_WITH_NETWORK 1 requirements)
|
||||
|
||||
if (websockets_shared)
|
||||
target_link_libraries(${SAMP} websockets_shared ${LIBWEBSOCKETS_DEP_LIBS})
|
||||
add_dependencies(${SAMP} websockets_shared)
|
||||
else()
|
||||
target_link_libraries(${SAMP} websockets ${LIBWEBSOCKETS_DEP_LIBS})
|
||||
if (requirements)
|
||||
add_executable(${SAMP} ${SRCS})
|
||||
add_test(NAME api-test-lws_cache COMMAND lws-api-test-lws_cache)
|
||||
|
||||
if (websockets_shared)
|
||||
target_link_libraries(${SAMP} websockets_shared ${LIBWEBSOCKETS_DEP_LIBS})
|
||||
add_dependencies(${SAMP} websockets_shared)
|
||||
else()
|
||||
target_link_libraries(${SAMP} websockets ${LIBWEBSOCKETS_DEP_LIBS})
|
||||
endif()
|
||||
endif()
|
||||
|
|
|
@ -8,6 +8,12 @@ include(LwsCheckRequirements)
|
|||
set(SAMP lws-api-test-lws_tokenize)
|
||||
set(SRCS main.c)
|
||||
|
||||
set(requirements 1)
|
||||
require_lws_config(LWS_ROLE_H1 1 requirements)
|
||||
require_lws_config(LWS_WITH_NETWORK 1 requirements)
|
||||
|
||||
if (requirements)
|
||||
|
||||
add_executable(${SAMP} ${SRCS})
|
||||
add_test(NAME api-test-lws_tokenize COMMAND lws-api-test-lws_tokenize)
|
||||
|
||||
|
@ -17,3 +23,5 @@ set(SRCS main.c)
|
|||
else()
|
||||
target_link_libraries(${SAMP} websockets ${LIBWEBSOCKETS_DEP_LIBS})
|
||||
endif()
|
||||
|
||||
endif()
|
||||
|
|
|
@ -8,6 +8,7 @@ require_lws_config(LWS_WITH_SECURE_STREAMS 1 requirements)
|
|||
require_lws_config(LWS_WITH_TLS 1 requirements)
|
||||
require_lws_config(LWS_WITH_SYS_STATE 1 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY 0 requirements)
|
||||
require_lws_config(USE_WOLFSSL 0 requirements)
|
||||
|
||||
if (requirements)
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ callback_http(struct lws *wsi, enum lws_callback_reasons reason,
|
|||
uint8_t buf[1280];
|
||||
union lws_tls_cert_info_results *ci =
|
||||
(union lws_tls_cert_info_results *)buf;
|
||||
#if defined(LWS_HAVE_CTIME_R)
|
||||
#if defined(LWS_HAVE_CTIME_R) && !defined(LWS_WITH_NO_LOGS)
|
||||
char date[32];
|
||||
#endif
|
||||
|
||||
|
|
|
@ -14,6 +14,10 @@ require_lws_config(LWS_ROLE_H1 1 requirements)
|
|||
require_lws_config(LWS_WITH_CLIENT 1 requirements)
|
||||
require_lws_config(LWS_WITH_TLS 1 requirements)
|
||||
require_lws_config(LWS_WITH_SYS_STATE 1 requirements)
|
||||
# ctest for this requires server
|
||||
require_lws_config(LWS_WITH_SERVER 1 requirements)
|
||||
require_lws_config(LWS_WITHOUT_TEST_SERVER 0 requirements)
|
||||
require_lws_config(LWS_WITHOUT_TESTAPPS 0 requirements)
|
||||
|
||||
require_lws_config(LWS_WITH_MBEDTLS 1 MBEDTLS)
|
||||
|
||||
|
|
|
@ -12,6 +12,10 @@ set(requirements 1)
|
|||
set(MBEDTLS 0)
|
||||
require_lws_config(LWS_ROLE_H1 1 requirements)
|
||||
require_lws_config(LWS_WITH_CLIENT 1 requirements)
|
||||
# ctest for this requires server
|
||||
require_lws_config(LWS_WITH_SERVER 1 requirements)
|
||||
require_lws_config(LWS_WITHOUT_TEST_SERVER 0 requirements)
|
||||
require_lws_config(LWS_WITHOUT_TESTAPPS 0 requirements)
|
||||
|
||||
require_lws_config(LWS_WITH_MBEDTLS 1 MBEDTLS)
|
||||
|
||||
|
|
|
@ -21,6 +21,7 @@ set(requirements 1)
|
|||
require_lws_config(LWS_ROLE_H1 1 requirements)
|
||||
require_lws_config(LWS_WITH_CLIENT 1 requirements)
|
||||
require_lws_config(LWS_WITH_SYS_STATE 1 requirements)
|
||||
require_lws_config(LWS_WITH_TLS 1 requirements)
|
||||
|
||||
require_lws_config(LWS_ROLE_H2 1 has_h2)
|
||||
require_lws_config(LWS_WITH_SYS_FAULT_INJECTION 1 has_fault_injection)
|
||||
|
@ -149,9 +150,11 @@ if (requirements)
|
|||
message("... skipping mbedtls wrong CA test")
|
||||
endif()
|
||||
|
||||
set_tests_properties(${mytests} PROPERTIES
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/minimal-examples-lowlevel/http-client/minimal-http-client
|
||||
TIMEOUT 20)
|
||||
foreach(N IN LISTS mytests)
|
||||
set_tests_properties(${N} PROPERTIES
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/minimal-examples-lowlevel/http-client/minimal-http-client
|
||||
TIMEOUT 20)
|
||||
endforeach()
|
||||
|
||||
if (DEFINED ENV{SAI_OVN})
|
||||
set_tests_properties(${mytests} PROPERTIES
|
||||
|
|
|
@ -15,6 +15,7 @@ require_lws_config(LWS_WITH_SECURE_STREAMS 1 requirements)
|
|||
require_lws_config(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY 0 requirements)
|
||||
require_lws_config(LWS_WITH_ALSA 1 requirements)
|
||||
require_lws_config(LWS_WITH_SYS_STATE 1 requirements)
|
||||
require_lws_config(USE_WOLFSSL 0 requirements)
|
||||
|
||||
if (requirements)
|
||||
add_executable(${SAMP} ${SRCS})
|
||||
|
|
|
@ -13,6 +13,7 @@ require_lws_config(LWS_WITHOUT_CLIENT 0 requirements)
|
|||
require_lws_config(LWS_WITH_SECURE_STREAMS 1 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY 0 requirements)
|
||||
require_lws_config(LWS_WITH_SYS_STATE 1 requirements)
|
||||
require_lws_config(USE_WOLFSSL 0 requirements)
|
||||
|
||||
if (requirements)
|
||||
add_executable(${SAMP} main.c avs.c)
|
||||
|
|
|
@ -346,7 +346,7 @@ int main(int argc, const char **argv)
|
|||
nl.notify_cb = app_system_state_nf;
|
||||
info.register_notifier_list = app_notifier_list;
|
||||
|
||||
puts(default_ss_policy);
|
||||
// puts(default_ss_policy);
|
||||
|
||||
context = lws_create_context(&info);
|
||||
if (!context) {
|
||||
|
|
|
@ -15,6 +15,7 @@ require_lws_config(LWS_WITH_CLIENT 1 requirements)
|
|||
require_lws_config(LWS_WITHOUT_EXTENSIONS 0 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS 1 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY 0 requirements)
|
||||
require_lws_config(USE_WOLFSSL 0 requirements)
|
||||
|
||||
if (requirements)
|
||||
add_executable(${SAMP} ${SRCS})
|
||||
|
|
|
@ -14,6 +14,7 @@ require_lws_config(LWS_WITH_SECURE_STREAMS 1 requirements)
|
|||
require_lws_config(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY 0 requirements)
|
||||
require_lws_config(LWS_WITH_SYS_STATE 1 requirements)
|
||||
require_lws_config(LWS_WITH_GENCRYPTO 1 requirements)
|
||||
require_lws_config(USE_WOLFSSL 0 requirements)
|
||||
|
||||
if (requirements)
|
||||
add_executable(${SAMP} minimal-secure-streams.c)
|
||||
|
|
|
@ -14,6 +14,7 @@ require_lws_config(LWS_WITHOUT_CLIENT 0 requirements)
|
|||
require_lws_config(LWS_WITH_SECURE_STREAMS 1 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS_PROXY_API 1 requirements)
|
||||
require_lws_config(LWS_WITH_SYS_STATE 1 requirements)
|
||||
require_lws_config(USE_WOLFSSL 0 requirements)
|
||||
|
||||
if (requirements)
|
||||
add_executable(${SAMP} ${SRCS})
|
||||
|
|
|
@ -14,6 +14,7 @@ require_lws_config(LWS_WITH_MBEDTLS 0 requirements)
|
|||
require_lws_config(LWS_WITH_SECURE_STREAMS 1 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS_CPP 1 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY 0 requirements)
|
||||
require_lws_config(USE_WOLFSSL 0 requirements)
|
||||
|
||||
if (requirements)
|
||||
add_executable(${SAMP} main.cxx)
|
||||
|
|
|
@ -14,6 +14,7 @@ require_lws_config(LWS_WITH_CLIENT 1 requirements)
|
|||
require_lws_config(LWS_WITH_SECURE_STREAMS 1 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS_PROXY_API 1 requirements)
|
||||
require_lws_config(LWS_ONLY_SSPC 1 requirements)
|
||||
require_lws_config(USE_WOLFSSL 0 requirements)
|
||||
|
||||
if (requirements)
|
||||
add_executable(${SAMP} ${SRCS})
|
||||
|
|
|
@ -14,6 +14,8 @@ require_lws_config(LWS_WITHOUT_CLIENT 0 requirements)
|
|||
require_lws_config(LWS_WITH_SECURE_STREAMS 1 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY 0 requirements)
|
||||
require_lws_config(LWS_WITH_SYS_STATE 1 requirements)
|
||||
require_lws_config(USE_WOLFSSL 0 requirements)
|
||||
require_lws_config(LWS_WITH_TLS 1 requirements)
|
||||
|
||||
if (requirements)
|
||||
add_executable(${SAMP} minimal-secure-streams.c)
|
||||
|
@ -51,7 +53,7 @@ if (requirements)
|
|||
|
||||
set_tests_properties(ss-warmcat-hurl
|
||||
PROPERTIES
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/minimal-examples-lowlevel/secure-streams/minimal-secure-streams
|
||||
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/minimal-examples-lowlevel/secure-streams/minimal-secure-streams-hugeurl
|
||||
TIMEOUT 20)
|
||||
if (DEFINED ENV{SAI_OVN})
|
||||
set_tests_properties(ss-warmcat-hurl PROPERTIES FIXTURES_REQUIRED "res_sspcmin_hurl")
|
||||
|
|
|
@ -13,6 +13,7 @@ require_lws_config(LWS_WITHOUT_CLIENT 0 requirements)
|
|||
require_lws_config(LWS_WITH_SECURE_STREAMS 1 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY 0 requirements)
|
||||
require_lws_config(LWS_WITH_SYS_STATE 1 requirements)
|
||||
require_lws_config(USE_WOLFSSL 0 requirements)
|
||||
|
||||
if (requirements)
|
||||
add_executable(${SAMP} minimal-secure-streams.c)
|
||||
|
|
|
@ -13,6 +13,8 @@ require_lws_config(LWS_WITHOUT_CLIENT 0 requirements)
|
|||
require_lws_config(LWS_WITH_SECURE_STREAMS 1 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY 0 requirements)
|
||||
require_lws_config(LWS_WITH_SYS_STATE 1 requirements)
|
||||
require_lws_config(USE_WOLFSSL 0 requirements)
|
||||
require_lws_config(LWS_WITH_TLS 1 requirements)
|
||||
|
||||
if (requirements)
|
||||
add_executable(${SAMP} minimal-secure-streams.c)
|
||||
|
|
|
@ -13,6 +13,8 @@ require_lws_config(LWS_WITHOUT_CLIENT 0 requirements)
|
|||
require_lws_config(LWS_WITH_SECURE_STREAMS 1 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY 0 requirements)
|
||||
require_lws_config(LWS_WITH_SYS_STATE 1 requirements)
|
||||
require_lws_config(USE_WOLFSSL 0 requirements)
|
||||
require_lws_config(LWS_WITH_TLS 1 requirements)
|
||||
|
||||
if (requirements)
|
||||
add_executable(${SAMP} minimal-secure-streams-post.c)
|
||||
|
|
|
@ -15,6 +15,7 @@ require_lws_config(LWS_WITH_SECURE_STREAMS 1 requirements)
|
|||
require_lws_config(LWS_WITH_SECURE_STREAMS_PROXY_API 1 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY 0 requirements)
|
||||
require_lws_config(LWS_WITH_SYS_STATE 1 requirements)
|
||||
require_lws_config(USE_WOLFSSL 0 requirements)
|
||||
|
||||
if (requirements)
|
||||
add_executable(${SAMP} ${SRCS})
|
||||
|
|
|
@ -14,6 +14,7 @@ require_lws_config(LWS_WITH_SERVER 1 requirements)
|
|||
require_lws_config(LWS_WITH_SYS_SMD 1 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS 1 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY 0 requirements)
|
||||
require_lws_config(USE_WOLFSSL 0 requirements)
|
||||
|
||||
if (requirements)
|
||||
add_executable(${SAMP} ${SRCS})
|
||||
|
|
|
@ -15,6 +15,7 @@ require_lws_config(LWS_WITH_SERVER 1 requirements)
|
|||
require_lws_config(LWS_WITH_SYS_SMD 1 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS 1 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY 0 requirements)
|
||||
require_lws_config(USE_WOLFSSL 0 requirements)
|
||||
|
||||
if (requirements)
|
||||
add_executable(${SAMP} ${SRCS})
|
||||
|
|
|
@ -12,6 +12,7 @@ require_lws_config(LWS_ROLE_H1 1 requirements)
|
|||
require_lws_config(LWS_WITHOUT_CLIENT 0 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS 1 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS_AUTH_SIGV4 1 requirements)
|
||||
require_lws_config(USE_WOLFSSL 0 requirements)
|
||||
|
||||
if (requirements)
|
||||
add_executable(${SAMP} ss-s3-main.c ss-s3-ss.c)
|
||||
|
|
|
@ -12,6 +12,7 @@ require_lws_config(LWS_WITH_SECURE_STREAMS 1 requirements)
|
|||
require_lws_config(LWS_WITH_SYS_SMD 1 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY 0 requirements)
|
||||
require_lws_config(LWS_WITH_SYS_STATE 1 requirements)
|
||||
require_lws_config(USE_WOLFSSL 0 requirements)
|
||||
|
||||
require_lws_config(LWS_WITH_SYS_FAULT_INJECTION 1 has_fault_injection)
|
||||
|
||||
|
|
|
@ -12,6 +12,7 @@ require_lws_config(LWS_ROLE_H1 1 requirements)
|
|||
require_lws_config(LWS_WITHOUT_CLIENT 0 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS 1 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY 1 requirements)
|
||||
require_lws_config(USE_WOLFSSL 0 requirements)
|
||||
|
||||
if (requirements)
|
||||
add_executable(${SAMP} minimal-secure-streams.c)
|
||||
|
|
|
@ -13,6 +13,8 @@ require_lws_config(LWS_WITHOUT_CLIENT 0 requirements)
|
|||
require_lws_config(LWS_WITH_SECURE_STREAMS 1 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY 0 requirements)
|
||||
require_lws_config(LWS_WITH_SYS_STATE 1 requirements)
|
||||
require_lws_config(LWS_WITH_TLS 1 requirements)
|
||||
require_lws_config(USE_WOLFSSL 0 requirements)
|
||||
|
||||
if (NOT WIN32)
|
||||
if (requirements)
|
||||
|
|
|
@ -14,6 +14,8 @@ require_lws_config(LWS_WITHOUT_CLIENT 0 requirements)
|
|||
require_lws_config(LWS_WITH_SECURE_STREAMS 1 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY 0 requirements)
|
||||
require_lws_config(LWS_WITH_SYS_STATE 1 requirements)
|
||||
require_lws_config(USE_WOLFSSL 0 requirements)
|
||||
require_lws_config(LWS_WITH_TLS 1 requirements)
|
||||
|
||||
if (requirements)
|
||||
add_executable(${SAMP} minimal-secure-streams-testsfail.c)
|
||||
|
|
|
@ -13,6 +13,8 @@ require_lws_config(LWS_WITH_SECURE_STREAMS 1 requirements)
|
|||
require_lws_config(LWS_WITH_SYS_SMD 1 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY 0 requirements)
|
||||
require_lws_config(LWS_WITH_SYS_STATE 1 requirements)
|
||||
require_lws_config(LWS_WITH_NO_LOGS 0 requirements)
|
||||
require_lws_config(USE_WOLFSSL 0 requirements)
|
||||
|
||||
if (requirements AND NOT WIN32)
|
||||
# win32 has problems with pthreads.h and timespec struct redef
|
||||
|
|
|
@ -13,6 +13,8 @@ require_lws_config(LWS_WITHOUT_CLIENT 0 requirements)
|
|||
require_lws_config(LWS_WITH_SECURE_STREAMS 1 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY 0 requirements)
|
||||
require_lws_config(LWS_WITH_SYS_STATE 1 requirements)
|
||||
require_lws_config(LWS_WITH_TLS 1 requirements)
|
||||
require_lws_config(USE_WOLFSSL 0 requirements)
|
||||
|
||||
require_lws_config(LWS_WITH_SYS_FAULT_INJECTION 1 has_fault_injection)
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
#include <libwebsockets.h>
|
||||
#include <string.h>
|
||||
#include <signal.h>
|
||||
#include <time.h>
|
||||
#if defined(WIN32)
|
||||
#define HAVE_STRUCT_TIMESPEC
|
||||
#if defined(pid_t)
|
||||
|
|
|
@ -14,6 +14,10 @@ require_pthreads(requirements)
|
|||
require_lws_config(LWS_ROLE_WS 1 requirements)
|
||||
require_lws_config(LWS_WITH_CLIENT 1 requirements)
|
||||
require_lws_config(LWS_WITH_TLS 1 requirements)
|
||||
# ctest for this requires server
|
||||
require_lws_config(LWS_WITH_SERVER 1 requirements)
|
||||
require_lws_config(LWS_WITHOUT_TEST_SERVER 0 requirements)
|
||||
require_lws_config(LWS_WITHOUT_TESTAPPS 0 requirements)
|
||||
|
||||
if (requirements)
|
||||
add_executable(${SAMP} ${SRCS})
|
||||
|
|
|
@ -8,6 +8,7 @@ require_lws_config(LWS_ROLE_WS 1 requirements)
|
|||
require_lws_config(LWS_WITH_CLIENT 1 requirements)
|
||||
require_lws_config(LWS_WITHOUT_EXTENSIONS 0 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS 1 requirements)
|
||||
require_lws_config(LWS_WITH_TLS 1 requirements)
|
||||
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS_PROXY_API 1 has_ss_proxy)
|
||||
|
||||
|
|
|
@ -6,6 +6,7 @@ require_lws_config(LWS_ROLE_H1 1 requirements)
|
|||
require_lws_config(LWS_WITHOUT_CLIENT 0 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS 1 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY 0 requirements)
|
||||
require_lws_config(LWS_WITH_TLS 1 requirements)
|
||||
|
||||
require_lws_config(LWS_WITH_SYS_FAULT_INJECTION 1 has_fault_injection)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS_PROXY_API 1 has_ss_proxy)
|
||||
|
|
|
@ -6,6 +6,7 @@ require_lws_config(LWS_ROLE_H1 1 requirements)
|
|||
require_lws_config(LWS_WITHOUT_CLIENT 0 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS 1 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY 0 requirements)
|
||||
require_lws_config(LWS_WITH_TLS 1 requirements)
|
||||
|
||||
require_lws_config(LWS_WITH_SYS_FAULT_INJECTION 1 has_fault_injection)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS_PROXY_API 1 has_ss_proxy)
|
||||
|
|
|
@ -3,9 +3,11 @@ cmake_minimum_required(VERSION 2.8.12)
|
|||
find_package(libwebsockets CONFIG REQUIRED)
|
||||
|
||||
require_lws_config(LWS_ROLE_H1 1 requirements)
|
||||
require_lws_config(LWS_ROLE_WS 1 requirements)
|
||||
require_lws_config(LWS_WITHOUT_CLIENT 0 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS 1 requirements)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS_STATIC_POLICY_ONLY 0 requirements)
|
||||
require_lws_config(LWS_WITH_TLS 1 requirements)
|
||||
|
||||
require_lws_config(LWS_WITH_SYS_FAULT_INJECTION 1 has_fault_injection)
|
||||
require_lws_config(LWS_WITH_SECURE_STREAMS_PROXY_API 1 has_ss_proxy)
|
||||
|
|
|
@ -108,7 +108,11 @@ file_upload_cb(void *data, const char *name, const char *filename,
|
|||
break;
|
||||
#if !defined(LWS_WITH_ESP32)
|
||||
close((int)(lws_intptr_t)pss->fd);
|
||||
#if defined(__MINGW32__)
|
||||
pss->fd = -1;
|
||||
#else
|
||||
pss->fd = LWS_INVALID_FILE;
|
||||
#endif
|
||||
#endif
|
||||
break;
|
||||
case LWS_UFS_CLOSE:
|
||||
|
|
Loading…
Add table
Reference in a new issue