779b84936b
Viktor Szakats
2026-09-04
Subject
build: drop `HTTP_ONLY` option
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
.github/workflows/macos.yml +4 -2CMakeLists.txt +0 -22appveyor.yml +2 -2docs/INSTALL-CMAKE.md +0 -1lib/curl_setup.h +0 -48
.github/workflows/macos.yml+4 -2
| @@ -267,12 +267,14 @@ jobs: | |
| tflags: '--min=960' | |
| generate: >- | |
| -DENABLE_DEBUG=ON -DENABLE_ARES=ON | |
| - | -DCURL_ENABLE_SSL=OFF -DHTTP_ONLY=ON |
| - | -DCURL_DISABLE_ALTSVC=ON -DENABLE_UNIX_SOCKETS=OFF |
| + | -DCURL_ENABLE_SSL=OFF -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 | |
| -DCURL_BROTLI=OFF -DCURL_ZLIB=OFF -DCURL_ZSTD=OFF | |
| -DBUILD_STATIC_LIBS=ON -DBUILD_SHARED_LIBS=OFF | |
| + | -DCURL_DISABLE_DICT=ON -DCURL_DISABLE_FILE=ON -DCURL_DISABLE_FTP=ON -DCURL_DISABLE_GOPHER=ON -DCURL_DISABLE_IMAP=ON |
| + | -DCURL_DISABLE_IPFS=ON -DCURL_DISABLE_LDAP=ON -DCURL_DISABLE_LDAPS=ON -DCURL_DISABLE_MQTT=ON -DCURL_DISABLE_POP3=ON |
| + | -DCURL_DISABLE_RTSP=ON -DCURL_DISABLE_SMTP=ON -DCURL_DISABLE_TELNET=ON -DCURL_DISABLE_TFTP=ON -DCURL_DISABLE_WEBSOCKETS=ON |
| - name: 'LibreSSL !ldap +examples' | |
| compiler: clang | |
CMakeLists.txt+0 -22
| @@ -534,28 +534,6 @@ if(CURL_DISABLE_HTTP) | |
| set(CURL_DISABLE_WEBSOCKETS ON) | |
| endif() | |
| - | # Corresponds to HTTP_ONLY in lib/curl_setup.h |
| - | option(HTTP_ONLY "Disable all protocols except HTTP (This overrides all CURL_DISABLE_* options)" OFF) |
| - | mark_as_advanced(HTTP_ONLY) |
| - | |
| - | if(HTTP_ONLY) |
| - | set(CURL_DISABLE_DICT ON) |
| - | set(CURL_DISABLE_FILE ON) |
| - | set(CURL_DISABLE_FTP ON) |
| - | set(CURL_DISABLE_GOPHER ON) |
| - | set(CURL_DISABLE_IMAP ON) |
| - | set(CURL_DISABLE_IPFS ON) |
| - | set(CURL_DISABLE_LDAP ON) |
| - | set(CURL_DISABLE_LDAPS ON) |
| - | set(CURL_DISABLE_MQTT ON) |
| - | set(CURL_DISABLE_POP3 ON) |
| - | set(CURL_DISABLE_RTSP ON) |
| - | set(CURL_DISABLE_SMTP ON) |
| - | set(CURL_DISABLE_TELNET ON) |
| - | set(CURL_DISABLE_TFTP ON) |
| - | set(CURL_DISABLE_WEBSOCKETS ON) |
| - | endif() |
| - | |
| if(WINDOWS_STORE) | |
| set(CURL_DISABLE_TELNET ON) # telnet code needs fixing to compile for UWP. | |
| endif() | |
appveyor.yml+2 -2
| @@ -107,10 +107,10 @@ environment: | |
| CMAKE_GENERATOR: 'Visual Studio 18 2026' | |
| CMAKE_GENERATE: '-A x64 -DBUILD_SHARED_LIBS=OFF -DCURL_USE_SCHANNEL=OFF' | |
| - | - job_name: 'CM VS2022, Debug, x64, !ssl, Static, HTTP-only, Build-tests' |
| + | - job_name: 'CM VS2022, Debug, x64, !ssl, Static, Build-tests' |
| APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2022' | |
| CMAKE_GENERATOR: 'Visual Studio 17 2022' | |
| - | CMAKE_GENERATE: '-A x64 -DBUILD_SHARED_LIBS=OFF -DCURL_USE_SCHANNEL=OFF -DHTTP_ONLY=ON' |
| + | CMAKE_GENERATE: '-A x64 -DBUILD_SHARED_LIBS=OFF -DCURL_USE_SCHANNEL=OFF' |
| # VisualStudioSolution builds | |
docs/INSTALL-CMAKE.md+0 -1
| @@ -309,7 +309,6 @@ target_link_libraries(my_target PRIVATE CURL::libcurl) | |
| - `CURL_DISABLE_TYPECHECK`: Disable curl_easy_setopt()/curl_easy_getinfo() type checking. Default: `OFF` | |
| - `CURL_DISABLE_VERBOSE_STRINGS`: Disable verbose strings. Default: `OFF` | |
| - `CURL_DISABLE_WEBSOCKETS`: Disable WebSocket. Default: `OFF` | |
| - | - `HTTP_ONLY`: Disable all protocols except HTTP (This overrides all `CURL_DISABLE_*` options). Default: `OFF` |
| ## Environment | |
lib/curl_setup.h+0 -48
| @@ -220,54 +220,6 @@ | |
| # include <pthread.h> | |
| #endif | |
| - | /* |
| - | * Disable other protocols when http is the only one desired. |
| - | */ |
| - | #ifdef HTTP_ONLY |
| - | # ifndef CURL_DISABLE_DICT |
| - | # define CURL_DISABLE_DICT |
| - | # endif |
| - | # ifndef CURL_DISABLE_FILE |
| - | # define CURL_DISABLE_FILE |
| - | # endif |
| - | # ifndef CURL_DISABLE_FTP |
| - | # define CURL_DISABLE_FTP |
| - | # endif |
| - | # ifndef CURL_DISABLE_GOPHER |
| - | # define CURL_DISABLE_GOPHER |
| - | # endif |
| - | # ifndef CURL_DISABLE_IMAP |
| - | # define CURL_DISABLE_IMAP |
| - | # endif |
| - | # ifndef CURL_DISABLE_LDAP |
| - | # define CURL_DISABLE_LDAP |
| - | # endif |
| - | # ifndef CURL_DISABLE_LDAPS |
| - | # define CURL_DISABLE_LDAPS |
| - | # endif |
| - | # ifndef CURL_DISABLE_MQTT |
| - | # define CURL_DISABLE_MQTT |
| - | # endif |
| - | # ifndef CURL_DISABLE_POP3 |
| - | # define CURL_DISABLE_POP3 |
| - | # endif |
| - | # ifndef CURL_DISABLE_RTSP |
| - | # define CURL_DISABLE_RTSP |
| - | # endif |
| - | # ifndef CURL_DISABLE_SMTP |
| - | # define CURL_DISABLE_SMTP |
| - | # endif |
| - | # ifndef CURL_DISABLE_TELNET |
| - | # define CURL_DISABLE_TELNET |
| - | # endif |
| - | # ifndef CURL_DISABLE_TFTP |
| - | # define CURL_DISABLE_TFTP |
| - | # endif |
| - | # ifndef CURL_DISABLE_WEBSOCKETS |
| - | # define CURL_DISABLE_WEBSOCKETS |
| - | # endif |
| - | #endif |
| - | |
| /* | |
| * When HTTP is disabled, disable HTTP-only features | |
| */ | |