From: Viktor Szakats Date: Thu, 5 Feb 2026 11:31:42 +0000 (+0100) Subject: build: make `HTTP_ONLY` build options also disable websockets X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f659b82c2ae1e509a75a38650a8626febab34b5f;p=thirdparty%2Fcurl.git build: make `HTTP_ONLY` build options also disable websockets Closes #20525 --- diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index b8f8f298b6..8dafc96937 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -234,7 +234,7 @@ jobs: tflags: '--min=930' generate: >- -DENABLE_DEBUG=ON -DENABLE_ARES=ON - -DCURL_ENABLE_SSL=OFF -DHTTP_ONLY=ON -DCURL_DISABLE_WEBSOCKETS=ON + -DCURL_ENABLE_SSL=OFF -DHTTP_ONLY=ON -DCURL_DISABLE_NTLM=ON -DCURL_DISABLE_ALTSVC=ON -DENABLE_UNIX_SOCKETS=OFF -DCURL_USE_LIBSSH2=OFF -DCURL_USE_LIBSSH=OFF -DUSE_NGHTTP2=OFF -DCURL_USE_GSSAPI=OFF -DUSE_LIBIDN2=OFF -DCURL_USE_LIBPSL=OFF -DUSE_LIBRTMP=OFF diff --git a/CMakeLists.txt b/CMakeLists.txt index 14dcc955de..e8e2897ef1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -525,6 +525,7 @@ if(HTTP_ONLY) set(CURL_DISABLE_SMTP ON) set(CURL_DISABLE_TELNET ON) set(CURL_DISABLE_TFTP ON) + set(CURL_DISABLE_WEBSOCKETS ON) endif() if(WINDOWS_STORE) diff --git a/lib/curl_setup.h b/lib/curl_setup.h index 387dc57439..5c1e97aea6 100644 --- a/lib/curl_setup.h +++ b/lib/curl_setup.h @@ -263,6 +263,9 @@ # ifndef CURL_DISABLE_TFTP # define CURL_DISABLE_TFTP # endif +# ifndef CURL_DISABLE_WEBSOCKETS +# define CURL_DISABLE_WEBSOCKETS +# endif #endif /*