build: make `HTTP_ONLY` build options also disable websockets

Closes #20525

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index b8f8f298b67652ce5127a80aaee615996341acc5..8dafc969378efa4ec63a17ff7aa3346666edfa39 100644 (file)
--- 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 14dcc955dedaf1b5d01d6ea22e91cf95b0111e8a..e8e2897ef1fa9f93ebe923de65f554460884435c 100644 (file)
--- 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 387dc57439d7fc0e478b2f86dc0d64e20cd822f9..5c1e97aea6b4bd85923d382529c8e4b0b9ebfd44 100644 (file)
--- 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
 
 /*