scripts: bump to lws 4.1.4

diff --git a/scripts/cross-build.sh b/scripts/cross-build.sh
index 3bfa11bda3bc50316fbb042070616ed8378e461c..e27b94eb0e48cfd7214d86bd78840e76867f4897 100755 (executable)
--- a/scripts/cross-build.sh
+++ b/scripts/cross-build.sh
@@ -15,7 +15,7 @@ ZLIB_VERSION="${ZLIB_VERSION:-1.2.11}"
 JSON_C_VERSION="${JSON_C_VERSION:-0.14}"
 OPENSSL_VERSION="${OPENSSL_VERSION:-1.1.1g}"
 LIBUV_VERSION="${LIBUV_VERSION:-1.38.0}"
-LIBWEBSOCKETS_VERSION="${LIBWEBSOCKETS_VERSION:-4.0.20}"
+LIBWEBSOCKETS_VERSION="${LIBWEBSOCKETS_VERSION:-4.1.4}"
 
 build_zlib() {
     echo "=== Building zlib-${ZLIB_VERSION} (${TARGET})..."
@@ -93,7 +93,7 @@ build_libwebsockets() {
     echo "=== Building libwebsockets-${LIBWEBSOCKETS_VERSION} (${TARGET})..."
     curl -sLo- "https://github.com/warmcat/libwebsockets/archive/v${LIBWEBSOCKETS_VERSION}.tar.gz" | tar xz -C "${BUILD_DIR}"
     pushd "${BUILD_DIR}/libwebsockets-${LIBWEBSOCKETS_VERSION}"
-        sed -i 's/ websockets_shared//g' cmake/LibwebsocketsConfig.cmake.in
+        sed -i 's/ websockets_shared//g' cmake/libwebsockets-config.cmake.in
         sed -i '/PC_OPENSSL/d' CMakeLists.txt
         mkdir build && cd build
         [ "${WITH_SSL}" = true ] || CMAKE_OPTIONS="-DLWS_WITH_SSL=OFF"

diff --git a/src/server.c b/src/server.c
index 3818f68444354ef214908e9aec65fa9c3ee96cde..44f6ca63b23d92f090b267b72702c5fc43ad613b 100644 (file)
--- a/src/server.c
+++ b/src/server.c
@@ -283,8 +283,6 @@ int main(int argc, char **argv) {
   info.port = 7681;
   info.iface = NULL;
   info.protocols = protocols;
-  info.ssl_cert_filepath = NULL;
-  info.ssl_private_key_filepath = NULL;
   info.gid = -1;
   info.uid = -1;
   info.max_http_header_pool = 16;