client: add libuv support to lws_client_reset
[platform/upstream/libwebsockets.git] / CMakeLists.txt
index 8971759..f625c57 100644 (file)
@@ -9,12 +9,12 @@ project(libwebsockets C)
 set(PACKAGE "libwebsockets")
 set(CPACK_PACKAGE_NAME "${PACKAGE}")
 set(CPACK_PACKAGE_VERSION_MAJOR "2")
-set(CPACK_PACKAGE_VERSION_MINOR "1")
+set(CPACK_PACKAGE_VERSION_MINOR "2")
 set(CPACK_PACKAGE_VERSION_PATCH "0")
 set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 set(CPACK_PACKAGE_VENDOR "andy@warmcat.com")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${PACKAGE} ${PACKAGE_VERSION}")
-set(SOVERSION "9")
+set(SOVERSION "10")
 if(NOT CPACK_GENERATOR)
     if(UNIX)
         set(CPACK_GENERATOR "TGZ")
@@ -75,6 +75,7 @@ option(LWS_USE_WOLFSSL "Use wolfSSL replacement for OpenSSL. When setting this,
 option(LWS_WITH_ZLIB "Include zlib support (required for extensions)" ON)
 option(LWS_WITH_LIBEV "Compile with support for libev" OFF)
 option(LWS_WITH_LIBUV "Compile with support for libuv" OFF)
+option(LWS_WITH_LIBEVENT "Compile with support for libevent" OFF)
 option(LWS_USE_BUNDLED_ZLIB "Use bundled zlib version (Windows only)" ${LWS_USE_BUNDLED_ZLIB_DEFAULT})
 option(LWS_SSL_CLIENT_USE_OS_CA_CERTS "SSL support should make use of the OS-installed CA root certs" ON)
 option(LWS_WITHOUT_BUILTIN_GETIFADDRS "Don't use the BSD getifaddrs implementation from libwebsockets if it is missing (this will result in a compilation error) ... The default is to assume that your libc provides it. On some systems such as uclibc it doesn't exist." OFF)
@@ -97,7 +98,7 @@ option(LWS_UNIX_SOCK "Compile with support for UNIX domain socket" OFF)
 option(LWS_WITH_HTTP2 "Compile with support for http2" OFF)
 option(LWS_SSL_SERVER_WITH_ECDH_CERT "Include SSL server use ECDH certificate" OFF)
 option(LWS_WITH_CGI "Include CGI (spawn process with network-connected stdin/out/err) APIs" OFF)
-option(LWS_WITH_HTTP_PROXY "Support for rewriting HTTP proxying" OFF)
+option(LWS_WITH_HTTP_PROXY "Support for rewriting HTTP proxying (requires libhubbub)" OFF)
 option(LWS_WITH_LWSWS "Libwebsockets Webserver" OFF)
 option(LWS_WITH_PLUGINS "Support plugins for protocols and extensions" OFF)
 option(LWS_WITH_ACCESS_LOG "Support generating Apache-compatible access logs" OFF)
@@ -114,6 +115,10 @@ option(LWS_WITH_NO_LOGS "Disable all logging from being compiled in" OFF)
 option(LWS_STATIC_PIC "Build the static version of the library with position-independent code" OFF)
 option(LWS_WITH_RANGES "Support http ranges (RFC7233)" ON)
 option(LWS_FALLBACK_GETHOSTBYNAME "Also try to do dns resolution using gethostbyname if getaddrinfo fails" OFF)
+option(LWS_WITH_ZIP_FOPS "Support serving pre-zipped files" ON)
+option(LWS_AVOID_SIGPIPE_IGN "Android 7+ seems to need this" OFF)
+option(LWS_WITH_STATS "Keep statistics of lws internal operations" OFF)
+option(LWS_WITH_SOCKS5 "Allow use of SOCKS5 proxy on client connections" OFF)
 
 if (LWS_WITH_LWSWS)
  message(STATUS "LWS_WITH_LWSWS --> Enabling LWS_WITH_PLUGINS and LWS_WITH_LIBUV")
@@ -159,13 +164,13 @@ if (LWS_WITH_ESP8266)
  set(LWS_HAVE_MALLOC 1)
  set(LWS_HAVE_REALLOC 1)
  set(LWS_HAVE_GETIFADDRS 1)
+ set(LWS_WITH_ZIP_FOPS 0)
 endif()
 
 if (LWS_WITH_ESP32)
  set(LWS_WITH_SHARED OFF)
- set(LWS_WITH_SSL OFF)
- set(LWS_WITH_ZLIB OFF)
- # set(LWS_WITHOUT_CLIENT ON)
+ set(LWS_WITH_SSL ON)
+  # set(LWS_WITHOUT_CLIENT ON)
  set(LWS_WITHOUT_TESTAPPS ON)
  set(LWS_WITHOUT_EXTENSIONS ON)
  set(LWS_WITH_PLUGINS OFF)
@@ -175,6 +180,7 @@ if (LWS_WITH_ESP32)
  set(LWS_HAVE_MALLOC 1)
  set(LWS_HAVE_REALLOC 1)
  set(LWS_HAVE_GETIFADDRS 1)
+ set(LWS_WITH_ZIP_FOPS 1)
 endif()
 
 
@@ -235,6 +241,8 @@ set(LWS_LIBUV_LIBRARIES CACHE PATH "Path to the libuv library")
 set(LWS_LIBUV_INCLUDE_DIRS CACHE PATH "Path to the libuv include directory")
 set(LWS_SQLITE3_LIBRARIES CACHE PATH "Path to the sqlite3 library")
 set(LWS_SQLITE3_INCLUDE_DIRS CACHE PATH "Path to the sqlite3 include directory")
+set(LWS_LIBEVENT_INCLUDE_DIRS CACHE PATH "Path to the libevent include directory")
+set(LWS_LIBEVENT_LIBRARIES CACHE PATH "Path to the libevent library")
 
 
 if (NOT LWS_WITH_SSL)
@@ -244,7 +252,9 @@ endif()
 if (LWS_WITH_SSL AND NOT LWS_USE_WOLFSSL)
        if ("${LWS_OPENSSL_LIBRARIES}" STREQUAL "" OR "${LWS_OPENSSL_INCLUDE_DIRS}" STREQUAL "")
        else()
-               set(OPENSSL_LIBRARIES ${LWS_OPENSSL_LIBRARIES})
+               if (NOT LWS_WITH_ESP32)
+                       set(OPENSSL_LIBRARIES ${LWS_OPENSSL_LIBRARIES})
+               endif()
                set(OPENSSL_INCLUDE_DIRS ${LWS_OPENSSL_INCLUDE_DIRS})
                set(OPENSSL_FOUND 1)
        endif()
@@ -270,19 +280,6 @@ if (LWS_WITH_SSL AND LWS_USE_WOLFSSL)
        endif()
 endif()
 
-if (LWS_WITH_SSL AND LWS_USE_MBEDTLS)
-       if ("${LWS_MBEDTLS_LIBRARIES}" STREQUAL "" OR "${LWS_MBEDTLS_INCLUDE_DIRS}" STREQUAL "")
-               if (NOT MBEDTLS_FOUND)
-                       message(FATAL_ERROR "You must set LWS_MBEDTLS_LIBRARIES and LWS_MBEDTLS_INCLUDE_DIRS when LWS_USE_MBEDTLS is turned on.")
-               endif()
-       else()
-               set(MBEDTLS_LIBRARIES ${LWS_MBEDTLS_LIBRARIES})
-               set(MBEDTLS_INCLUDE_DIRS ${LWS_MBEDTLS_INCLUDE_DIRS})
-               set(MBEDTLS_FOUND 1)
-       endif()
-       set(USE_MBEDTLS 1)
-endif()
-
 if (LWS_WITH_ZLIB AND NOT LWS_USE_BUNDLED_ZLIB)
        if ("${LWS_ZLIB_LIBRARIES}" STREQUAL "" OR "${LWS_ZLIB_INCLUDE_DIRS}" STREQUAL "")
        else()
@@ -310,6 +307,15 @@ if (LWS_WITH_LIBUV)
        endif()
 endif()
 
+if (LWS_WITH_LIBEVENT)
+       if ("${LWS_LIBEVENT_LIBRARIES}" STREQUAL "" OR "${LWS_LIBEVENT_INCLUDE_DIRS}" STREQUAL "")
+       else()
+               set(LIBEVENT_LIBRARIES ${LWS_LIBEVENT_LIBRARIES})
+               set(LIBEVENT_INCLUDE_DIRS ${LWS_LIBEVENT_INCLUDE_DIRS})
+               set(LIBEVENT_FOUND 1)
+       endif()
+endif()
+
 if (LWS_WITH_SQLITE3)
        if ("${LWS_SQLITE3_LIBRARIES}" STREQUAL "" OR "${LWS_SQLITE3_INCLUDE_DIRS}" STREQUAL "")
        else()
@@ -320,19 +326,14 @@ if (LWS_WITH_SQLITE3)
 endif()
 
 
-# FIXME: This must be runtime-only option.
 # The base dir where the test-apps look for the SSL certs.
 set(LWS_OPENSSL_CLIENT_CERTS ../share CACHE PATH "Server SSL certificate directory")
 if (WIN32)
        set(LWS_OPENSSL_CLIENT_CERTS . CACHE PATH "Client SSL certificate directory")
 
-       if (LWS_IPV6)
-               set(LWS_IPV6 OFF)
-               message(WARNING "IPv6 does not currently work on Windows!")
-       endif()
-        if (LWS_UNIX_SOCK)
+       if (LWS_UNIX_SOCK)
                set(LWS_UNIX_SOCK OFF)
-                message(WARNING "Windows does not support UNIX domain sockets")
+               message(WARNING "Windows does not support UNIX domain sockets")
        endif()
 else()
        set(LWS_OPENSSL_CLIENT_CERTS /etc/pki/tls/certs/ CACHE PATH "Client SSL certificate directory")
@@ -374,6 +375,10 @@ if (LWS_WITH_LIBUV)
        set(LWS_USE_LIBUV 1)
 endif()
 
+if (LWS_WITH_LIBEVENT)
+       set(LWS_USE_LIBEVENT 1)
+endif()
+
 if (LWS_IPV6)
        set(LWS_USE_IPV6 1)
 endif()
@@ -387,7 +392,7 @@ if (LWS_WITH_HTTP2)
 endif()
 
 if ("${LWS_MAX_SMP}" STREQUAL "")
-       set(LWS_MAX_SMP 32)
+       set(LWS_MAX_SMP 1)
 endif()
 
 
@@ -465,6 +470,9 @@ CHECK_FUNCTION_EXISTS(snprintf LWS_HAVE_SNPRINTF)
 CHECK_FUNCTION_EXISTS(_snprintf LWS_HAVE__SNPRINTF)
 CHECK_FUNCTION_EXISTS(_vsnprintf LWS_HAVE__VSNPRINTF)
 CHECK_FUNCTION_EXISTS(getloadavg LWS_HAVE_GETLOADAVG)
+CHECK_FUNCTION_EXISTS(atoll LWS_HAVE_ATOLL)
+CHECK_FUNCTION_EXISTS(_atoi64 LWS_HAVE__ATOI64)
+CHECK_FUNCTION_EXISTS(_stat32i64 LWS_HAVE__STAT32I64)
 
 if (NOT LWS_HAVE_GETIFADDRS)
        if (LWS_WITHOUT_BUILTIN_GETIFADDRS)
@@ -490,6 +498,9 @@ CHECK_INCLUDE_FILE(sys/stat.h LWS_HAVE_SYS_STAT_H)
 CHECK_INCLUDE_FILE(sys/types.h LWS_HAVE_SYS_TYPES_H)
 CHECK_INCLUDE_FILE(unistd.h LWS_HAVE_UNISTD_H)
 CHECK_INCLUDE_FILE(vfork.h LWS_HAVE_VFORK_H)
+CHECK_INCLUDE_FILE(sys/capability.h LWS_HAVE_SYS_CAPABILITY_H)
+
+CHECK_LIBRARY_EXISTS(cap cap_set_flag "" LWS_HAVE_LIBCAP) 
 
 if (LWS_WITH_LIBUV)
 CHECK_INCLUDE_FILE(uv-version.h LWS_HAVE_UV_VERSION_H)
@@ -605,7 +616,8 @@ else()
                else()
                        if (LWS_WITH_ESP32)
                                list(APPEND SOURCES
-                                       lib/lws-plat-esp32.c)
+                                       lib/lws-plat-esp32.c
+                                       lib/romfs.c)
                        else()
                                list(APPEND SOURCES
                                        lib/lws-plat-unix.c)
@@ -643,6 +655,11 @@ if (LWS_WITH_LIBUV)
                lib/libuv.c)
 endif()
 
+if (LWS_WITH_LIBEVENT)
+       list(APPEND SOURCES
+               lib/libevent.c)
+endif()
+
 if (LWS_WITH_LEJP)
        list(APPEND SOURCES
                lib/lejp.c)
@@ -665,6 +682,15 @@ if (LWS_WITH_RANGES)
                lib/ranges.c)
 endif()
 
+if (LWS_WITH_ZIP_FOPS)
+       if (LWS_WITH_ZLIB)
+               list(APPEND SOURCES
+                       lib/fops-zip.c)
+       else()
+               message(FATAL_ERROR "Pre-zipped file support (LWS_WITH_ZIP_FOPS) requires ZLIB (LWS_WITH_ZLIB)")
+       endif()
+endif()
+
 # Add helper files for Windows.
 if (WIN32)
        set(WIN32_HELPERS_PATH win32port/win32helpers)
@@ -709,7 +735,7 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR (CMAKE_C_COMPILER_ID
 endif ()
 
 if ((CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) AND NOT LWS_WITHOUT_TESTAPPS)
-    if (UNIX)
+       if (UNIX AND LWS_MAX_SMP GREATER 1)
        # jeez clang understands -pthread but dies if he sees it at link time!
        # http://stackoverflow.com/questions/2391194/what-is-gs-pthread-equiv-in-clang
        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -pthread" )
@@ -747,6 +773,17 @@ if (LWS_WITH_STATIC)
                        PROPERTIES
                        OUTPUT_NAME websockets_static)
        endif()
+       add_custom_command(
+                     TARGET websockets
+                     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/lib/libwebsockets.h
+                                                        ${CMAKE_CURRENT_BINARY_DIR}/include/libwebsockets.h
+       )
+       add_custom_command(
+                     TARGET websockets
+                     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/lws_config.h
+                                                        ${CMAKE_CURRENT_BINARY_DIR}/include/lws_config.h
+       )
+
 endif()
 
 if (LWS_WITH_SHARED)
@@ -774,6 +811,19 @@ if (LWS_WITH_SHARED)
        if (APPLE)
                set_property(TARGET websockets_shared PROPERTY MACOSX_RPATH YES)
        endif()
+
+       add_custom_command(
+                     TARGET websockets_shared
+                     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/lib/libwebsockets.h
+                                                        ${CMAKE_CURRENT_BINARY_DIR}/include/libwebsockets.h
+       )
+       add_custom_command(
+                     TARGET websockets_shared
+                     COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/lws_config.h
+                                                        ${CMAKE_CURRENT_BINARY_DIR}/include/lws_config.h
+       )
+
+
 endif()
 
 # Set the so version of the lib.
@@ -869,15 +919,21 @@ if (LWS_WITH_SSL)
        if (NOT chose_ssl)
                if (NOT OPENSSL_FOUND AND NOT LWS_USE_BORINGSSL)
                        # TODO: Add support for STATIC also.
+               if (NOT LWS_WITH_ESP32)
                        find_package(OpenSSL REQUIRED)
+               endif()
                        set(OPENSSL_INCLUDE_DIRS "${OPENSSL_INCLUDE_DIR}")
                endif()
 
                message("OpenSSL include dir: ${OPENSSL_INCLUDE_DIRS}")
-               message("OpenSSL libraries: ${OPENSSL_LIBRARIES}")
+               if (NOT LWS_WITH_ESP32)
+                       message("OpenSSL libraries: ${OPENSSL_LIBRARIES}")
+               endif()
 
                include_directories("${OPENSSL_INCLUDE_DIRS}")
-               list(APPEND LIB_LIST ${OPENSSL_LIBRARIES})
+               if (NOT LWS_WITH_ESP32)
+                       list(APPEND LIB_LIST ${OPENSSL_LIBRARIES})
+               endif()
 
        # older (0.98) Openssl lacks this
        set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIRS})
@@ -918,6 +974,20 @@ if (LWS_WITH_LIBUV)
        list(APPEND LIB_LIST ${LIBUV_LIBRARIES})
 endif()
 
+if (LWS_WITH_LIBEVENT)
+       if (NOT LIBEVENT_FOUND)
+               find_path(LIBEVENT_INCLUDE_DIRS NAMES event2/event.h)
+               find_library(LIBEVENT_LIBRARIES NAMES event)
+               if(LIBEVENT_INCLUDE_DIRS AND LIBEVENT_LIBRARIES)
+                       set(LIBEVENT_FOUND 1)
+               endif()
+       endif()
+       message("libevent include dir: ${LIBEVENT_INCLUDE_DIRS}")
+       message("libevent libraries: ${LIBEVENT_LIBRARIES}")
+       include_directories("${LIBEVENT_INCLUDE_DIRS}")
+       list(APPEND LIB_LIST ${LIBEVENT_LIBRARIES})
+endif(LWS_WITH_LIBEVENT)
+
 if (LWS_WITH_SQLITE3)
        if (NOT SQLITE3_FOUND)
                find_path(SQLITE3_INCLUDE_DIRS NAMES sqlite3.h)
@@ -952,6 +1022,12 @@ if (UNIX)
        list(APPEND LIB_LIST m)
 endif()
 
+if (LWS_HAVE_LIBCAP)
+       list(APPEND LIB_LIST cap )
+endif()
+
+
+
 # Setup the linking for all libs.
 foreach (lib ${LWS_LIBRARIES})
        target_link_libraries(${lib} ${LIB_LIST})
@@ -960,7 +1036,14 @@ endforeach()
 set (temp ${CMAKE_REQUIRED_LIBRARIES})
 set(CMAKE_REQUIRED_LIBRARIES ${LIB_LIST})
 CHECK_FUNCTION_EXISTS(SSL_CTX_set1_param LWS_HAVE_SSL_CTX_set1_param)
+CHECK_FUNCTION_EXISTS(SSL_set_info_callback LWS_HAVE_SSL_SET_INFO_CALLBACK)
 CHECK_FUNCTION_EXISTS(X509_VERIFY_PARAM_set1_host LWS_HAVE_X509_VERIFY_PARAM_set1_host)
+if (LWS_WITH_ESP32)
+       set(LWS_HAVE_TLS_CLIENT_METHOD 1)
+else()
+CHECK_FUNCTION_EXISTS(TLS_client_method LWS_HAVE_TLS_CLIENT_METHOD)
+CHECK_FUNCTION_EXISTS(TLSv1_2_client_method LWS_HAVE_TLSV1_2_CLIENT_METHOD)
+endif()
 set(CMAKE_REQUIRED_LIBRARIES ${temp})
 # Generate the lws_config.h that includes all the public compilation settings.
 configure_file(
@@ -972,6 +1055,94 @@ configure_file(
        "${PROJECT_SOURCE_DIR}/lws_config_private.h.in"
        "${PROJECT_BINARY_DIR}/lws_config_private.h")
 
+# Generate self-signed SSL certs for the test-server.
+
+if (LWS_WITH_SSL AND NOT LWS_USE_WOLFSSL)
+       message("Searching for OpenSSL executable and dlls")
+       find_package(OpenSSLbins)
+       message("OpenSSL executable: ${OPENSSL_EXECUTABLE}")
+       if (OPENSSL_EXECUTABLE MATCHES "^$")
+               set(OPENSSL_EXECUTABLE openssl)
+       endif()
+       if (NOT OPENSSL_EXECUTABLE)
+               set(OPENSSL_EXECUTABLE openssl)
+       endif()
+
+endif()
+
+set(GENCERTS 0)
+
+if (LWS_WITH_SSL AND OPENSSL_EXECUTABLE AND NOT LWS_WITHOUT_TEST_SERVER)
+       set(GENCERTS 1)
+endif()
+if (LWS_WITH_ESP32)
+       set(GENCERTS 1)
+endif()
+message(" GENCERTS = ${GENCERTS}")
+if (GENCERTS)
+       message("Generating SSL Certificates for the test-server...")
+
+       set(TEST_SERVER_SSL_KEY "${PROJECT_BINARY_DIR}/libwebsockets-test-server.key.pem")
+       set(TEST_SERVER_SSL_CERT "${PROJECT_BINARY_DIR}/libwebsockets-test-server.pem")
+
+       if (WIN32)
+               if (MINGW)
+                       message("cmd = \"${OPENSSL_EXECUTABLE}\" req -new -newkey rsa:1024 -days 10000 -nodes -x509 -subj \"/C=GB/ST=Erewhon/L=All around/O=libwebsockets-test/CN=localhost\" -keyout \"${TEST_SERVER_SSL_KEY}\" -out \"${TEST_SERVER_SSL_CERT}\"")
+                       execute_process(
+                               COMMAND "${OPENSSL_EXECUTABLE}" req -new -newkey rsa:1024 -days 10000 -nodes -x509 -subj "/C=GB/ST=Erewhon/L=All around/O=libwebsockets-test/CN=localhost" -keyout "${TEST_SERVER_SSL_KEY}" -out "${TEST_SERVER_SSL_CERT}"
+                               RESULT_VARIABLE OPENSSL_RETURN_CODE)
+               else()
+                       file(WRITE "${PROJECT_BINARY_DIR}/openssl_input.txt"
+                               "GB\n"
+                               "Erewhon\n"
+                               "All around\n"
+                               "libwebsockets-test\n"
+                               "localhost\n"
+                               "none@invalid.org\n\n"
+                               )
+
+                       # The "type" command is a bit picky with paths.
+                       file(TO_NATIVE_PATH "${PROJECT_BINARY_DIR}/openssl_input.txt" OPENSSL_INPUT_WIN_PATH)
+                       message("OPENSSL_INPUT_WIN_PATH = ${OPENSSL_INPUT_WIN_PATH}")
+                       message("cmd = \"${OPENSSL_EXECUTABLE}\" req -new -newkey rsa:1024 -days 10000 -nodes -x509 -keyout \"${TEST_SERVER_SSL_KEY}\" -out \"${TEST_SERVER_SSL_CERT}\"")
+
+                       execute_process(
+                               COMMAND cmd /c type "${OPENSSL_INPUT_WIN_PATH}"
+                               COMMAND "${OPENSSL_EXECUTABLE}" req -new -newkey rsa:1024 -days 10000 -nodes -x509 -keyout "${TEST_SERVER_SSL_KEY}" -out "${TEST_SERVER_SSL_CERT}"
+                               RESULT_VARIABLE OPENSSL_RETURN_CODE
+                               OUTPUT_QUIET ERROR_QUIET)
+
+                       message("\n")
+               endif()
+
+               if (OPENSSL_RETURN_CODE)
+                       message(WARNING "!!! Failed to generate SSL certificate for Test Server using cmd.exe !!!:\nOpenSSL return code = ${OPENSSL_RETURN_CODE}")
+               else()
+                       message("SUCCSESFULLY generated SSL certificate")
+               endif()
+       else()
+               # Unix.
+               execute_process(
+                       COMMAND printf "GB\\nErewhon\\nAll around\\nlibwebsockets-test\\n\\nlocalhost\\nnone@invalid.org\\n"
+                       COMMAND "${OPENSSL_EXECUTABLE}"
+                               req -new -newkey rsa:1024 -days 10000 -nodes -x509 -keyout "${TEST_SERVER_SSL_KEY}" -out "${TEST_SERVER_SSL_CERT}"
+                       RESULT_VARIABLE OPENSSL_RETURN_CODE
+                       #               OUTPUT_QUIET ERROR_QUIET
+                       )
+
+               if (OPENSSL_RETURN_CODE)
+                       message(WARNING "!!! Failed to generate SSL certificate for Test Server!!!:\nOpenSSL return code = ${OPENSSL_RETURN_CODE}")
+               else()
+                       message("SUCCESSFULLY generated SSL certificate")
+               endif()
+       endif()
+
+       list(APPEND TEST_SERVER_DATA 
+               "${TEST_SERVER_SSL_KEY}"
+               "${TEST_SERVER_SSL_CERT}")
+endif()
+
+
 
 
 #
@@ -1052,12 +1223,6 @@ if (NOT LWS_WITHOUT_TESTAPPS)
                list(APPEND TEST_APP_LIST ${TEST_NAME})
        endmacro()
 
-       if (LWS_WITH_SSL AND NOT LWS_USE_WOLFSSL)
-               message("Searching for OpenSSL executable and dlls")
-               find_package(OpenSSLbins)
-               message("OpenSSL executable: ${OPENSSL_EXECUTABLE}")
-       endif()
-
        if (UNIX AND LWS_WITH_PLUGINS)
                set(CMAKE_C_FLAGS "-fPIC ${CMAKE_C_FLAGS}")
                if(NOT(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD"))
@@ -1065,6 +1230,9 @@ if (NOT LWS_WITHOUT_TESTAPPS)
                endif()
        endif()
 
+
+
+
        if (NOT LWS_WITHOUT_SERVER)
                #
                # test-server
@@ -1084,7 +1252,7 @@ if (NOT LWS_WITHOUT_TESTAPPS)
                                        ""
                                        "")
                        endif()
-                       if (UNIX AND NOT ((CMAKE_C_COMPILER_ID MATCHES "Clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang")))
+                       if (UNIX AND NOT ((CMAKE_C_COMPILER_ID MATCHES "Clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang")) AND LWS_MAX_SMP GREATER 1)
                                create_test_app(test-server-pthreads
                                        "test-server/test-server-pthreads.c"
                                        "test-server/test-server-http.c"
@@ -1113,6 +1281,16 @@ if (NOT LWS_WITHOUT_TESTAPPS)
                                        "test-server/test-server-status.c"
                                        "test-server/test-server-echogen.c")
                        endif()
+                       if (NOT ((CMAKE_C_COMPILER_ID MATCHES "Clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
+                               AND LWS_WITH_LIBEVENT)
+                               create_test_app(test-server-libevent
+                                       "test-server/test-server-libevent.c"
+                                       "test-server/test-server-http.c"
+                                       "test-server/test-server-dumb-increment.c"
+                                       "test-server/test-server-mirror.c"
+                                       "test-server/test-server-status.c"
+                                       "test-server/test-server-echogen.c")
+                       endif()
                endif()
 
                #
@@ -1157,73 +1335,11 @@ if (NOT LWS_WITHOUT_TESTAPPS)
                set(TEST_SERVER_DATA
                        "${PROJECT_SOURCE_DIR}/test-server/favicon.ico"
                        "${PROJECT_SOURCE_DIR}/test-server/leaf.jpg"
+                       "${PROJECT_SOURCE_DIR}/test-server/candide.zip"
                        "${PROJECT_SOURCE_DIR}/test-server/libwebsockets.org-logo.png"
                        "${PROJECT_SOURCE_DIR}/test-server/lws-common.js"
                        "${PROJECT_SOURCE_DIR}/test-server/test.html")
 
-               # Generate self-signed SSL certs for the test-server.
-               if (LWS_WITH_SSL AND OPENSSL_EXECUTABLE AND NOT LWS_WITHOUT_TEST_SERVER)
-                       message("Generating SSL Certificates for the test-server...")
-
-                       set(TEST_SERVER_SSL_KEY "${PROJECT_BINARY_DIR}/libwebsockets-test-server.key.pem")
-                       set(TEST_SERVER_SSL_CERT "${PROJECT_BINARY_DIR}/libwebsockets-test-server.pem")
-
-                       if (WIN32)
-                               if (MINGW)
-                                       message("cmd = \"${OPENSSL_EXECUTABLE}\" req -new -newkey rsa:1024 -days 10000 -nodes -x509 -subj \"/C=GB/ST=Erewhon/L=All around/O=libwebsockets-test/CN=localhost\" -keyout \"${TEST_SERVER_SSL_KEY}\" -out \"${TEST_SERVER_SSL_CERT}\"")
-                                       execute_process(
-                                               COMMAND "${OPENSSL_EXECUTABLE}" req -new -newkey rsa:1024 -days 10000 -nodes -x509 -subj "/C=GB/ST=Erewhon/L=All around/O=libwebsockets-test/CN=localhost" -keyout "${TEST_SERVER_SSL_KEY}" -out "${TEST_SERVER_SSL_CERT}"
-                                               RESULT_VARIABLE OPENSSL_RETURN_CODE)
-                               else()
-                                       file(WRITE "${PROJECT_BINARY_DIR}/openssl_input.txt"
-                                               "GB\n"
-                                               "Erewhon\n"
-                                               "All around\n"
-                                               "libwebsockets-test\n"
-                                               "localhost\n"
-                                               "none@invalid.org\n\n"
-                                               )
-
-                                       # The "type" command is a bit picky with paths.
-                                       file(TO_NATIVE_PATH "${PROJECT_BINARY_DIR}/openssl_input.txt" OPENSSL_INPUT_WIN_PATH)
-                                       message("OPENSSL_INPUT_WIN_PATH = ${OPENSSL_INPUT_WIN_PATH}")
-                                       message("cmd = \"${OPENSSL_EXECUTABLE}\" req -new -newkey rsa:1024 -days 10000 -nodes -x509 -keyout \"${TEST_SERVER_SSL_KEY}\" -out \"${TEST_SERVER_SSL_CERT}\"")
-
-                                       execute_process(
-                                               COMMAND cmd /c type "${OPENSSL_INPUT_WIN_PATH}"
-                                               COMMAND "${OPENSSL_EXECUTABLE}" req -new -newkey rsa:1024 -days 10000 -nodes -x509 -keyout "${TEST_SERVER_SSL_KEY}" -out "${TEST_SERVER_SSL_CERT}"
-                                               RESULT_VARIABLE OPENSSL_RETURN_CODE
-                                               OUTPUT_QUIET ERROR_QUIET)
-
-                                       message("\n")
-                               endif()
-
-                               if (OPENSSL_RETURN_CODE)
-                                       message(WARNING "!!! Failed to generate SSL certificate for Test Server using cmd.exe !!!:\nOpenSSL return code = ${OPENSSL_RETURN_CODE}")
-                               else()
-                                       message("SUCCSESFULLY generated SSL certificate")
-                               endif()
-                       else()
-                               # Unix.
-                               execute_process(
-                                       COMMAND printf "GB\\nErewhon\\nAll around\\nlibwebsockets-test\\n\\nlocalhost\\nnone@invalid.org\\n"
-                                       COMMAND "${OPENSSL_EXECUTABLE}"
-                                               req -new -newkey rsa:1024 -days 10000 -nodes -x509 -keyout "${TEST_SERVER_SSL_KEY}" -out "${TEST_SERVER_SSL_CERT}"
-                                       RESULT_VARIABLE OPENSSL_RETURN_CODE
-                                       OUTPUT_QUIET ERROR_QUIET)
-
-                               if (OPENSSL_RETURN_CODE)
-                                       message(WARNING "!!! Failed to generate SSL certificate for Test Server!!!:\nOpenSSL return code = ${OPENSSL_RETURN_CODE}")
-                               else()
-                                       message("SUCCESSFULLY generated SSL certificate")
-                               endif()
-                       endif()
-
-                       list(APPEND TEST_SERVER_DATA 
-                               "${TEST_SERVER_SSL_KEY}"
-                               "${TEST_SERVER_SSL_CERT}")
-               endif()
-
                add_custom_command(TARGET test-server
                                                POST_BUILD 
                                                COMMAND "${CMAKE_COMMAND}" -E make_directory "$<TARGET_FILE_DIR:test-server>/../share/libwebsockets-test-server")
@@ -1329,6 +1445,10 @@ if (NOT LWS_WITHOUT_TESTAPPS)
                              "plugins/protocol_post_demo.c" "" "")
                create_plugin(protocol_lws_table_dirlisting
                              "plugins/generic-table/protocol_table_dirlisting.c" "" "")
+               if (NOT WIN32)
+                     create_plugin(protocol_lws_raw_test
+                             "plugins/protocol_lws_raw_test.c" "" "")
+               endif()
 
 if (LWS_WITH_SERVER_STATUS)
                create_plugin(protocol_lws_server_status
@@ -1439,6 +1559,26 @@ Cflags: -I\${includedir}"
 
        install(FILES "${PROJECT_BINARY_DIR}/libwebsockets.pc"
                DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+
+file(WRITE "${PROJECT_BINARY_DIR}/libwebsockets_static.pc"
+"prefix=\"${CMAKE_INSTALL_PREFIX}\"
+exec_prefix=\${prefix}
+libdir=\${exec_prefix}/lib${LIB_SUFFIX}
+includedir=\${prefix}/include
+
+Name: libwebsockets_static
+Description: Websockets server and client static library
+Version: ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}
+
+Libs: -L\${libdir} -lwebsockets_static
+Libs.private:
+Cflags: -I\${includedir}"
+)
+
+       install(FILES "${PROJECT_BINARY_DIR}/libwebsockets_static.pc"
+               DESTINATION lib${LIB_SUFFIX}/pkgconfig)
+
+
 endif(UNIX)
 
 #
@@ -1634,6 +1774,7 @@ message(" LWS_WITH_LATENCY = ${LWS_WITH_LATENCY}")
 message(" LWS_WITHOUT_DAEMONIZE = ${LWS_WITHOUT_DAEMONIZE}")
 message(" LWS_USE_LIBEV = ${LWS_USE_LIBEV}")
 message(" LWS_USE_LIBUV = ${LWS_USE_LIBUV}")
+message(" LWS_USE_LIBEVENT = ${LWS_USE_LIBEVENT}")
 message(" LWS_IPV6 = ${LWS_IPV6}")
 message(" LWS_UNIX_SOCK = ${LWS_UNIX_SOCK}")
 message(" LWS_WITH_HTTP2 = ${LWS_WITH_HTTP2}")
@@ -1655,13 +1796,22 @@ message(" LWS_STATIC_PIC = ${LWS_STATIC_PIC}")
 message(" LWS_WITH_RANGES = ${LWS_WITH_RANGES}")
 message(" LWS_PLAT_OPTEE = ${LWS_PLAT_OPTEE}")
 message(" LWS_WITH_ESP32 = ${LWS_WITH_ESP32}")
+message(" LWS_WITH_ZIP_FOPS = ${LWS_WITH_ZIP_FOPS}")
+message(" LWS_AVOID_SIGPIPE_IGN = ${LWS_AVOID_SIGPIPE_IGN}")
+message(" LWS_WITH_STATS = ${LWS_WITH_STATS}")
+message(" LWS_WITH_SOCKS5 = ${LWS_WITH_SOCKS5}")
+message(" LWS_HAVE_SYS_CAPABILITY_H = ${LWS_HAVE_SYS_CAPABILITY_H}")
+message(" LWS_HAVE_LIBCAP = ${LWS_HAVE_LIBCAP}")
+message(" LWS_HAVE_ATOLL = ${LWS_HAVE_ATOLL}")
+message(" LWS_HAVE__ATOI64 = ${LWS_HAVE__ATOI64}")
+message(" LWS_HAVE_STAT32I64 = ${LWS_HAVE_STAT32I64}")
 
 message("---------------------------------------------------------------------")
 
 # These will be available to parent projects including libwebsockets using add_subdirectory()
 set(LIBWEBSOCKETS_LIBRARIES ${LWS_LIBRARIES} CACHE STRING "Libwebsocket libraries")
 if (LWS_WITH_STATIC)
-       set(LIBWEBSOCKETS_LIBRARIES_STATIC websocket CACHE STRING "Libwebsocket static library")
+       set(LIBWEBSOCKETS_LIBRARIES_STATIC websockets CACHE STRING "Libwebsocket static library")
 endif()
 if (LWS_WITH_SHARED)
        set(LIBWEBSOCKETS_LIBRARIES_SHARED websockets_shared CACHE STRING "Libwebsocket shared library")