From 268a6ff38aa7066ab2cb7d9dd0c2a1026833e4c1 Mon Sep 17 00:00:00 2001 From: Shuanglei Tao Date: Sat, 7 Nov 2020 19:34:25 +0800 Subject: [PATCH] scripts: bump to lws 4.1.4 --- scripts/cross-build.sh | 4 ++-- src/server.c | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/scripts/cross-build.sh b/scripts/cross-build.sh index 3bfa11b..e27b94e 100755 --- 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 3818f68..44f6ca6 100644 --- 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; -- 2.43.4