Skip to content

Commit

Permalink
replace -big option with -psl, -idn2 and -gsasl [ci skip]
Browse files Browse the repository at this point in the history
  • Loading branch information
vszakats committed Jan 14, 2024
1 parent 592e646 commit b7b23ce
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 15 deletions.
8 changes: 0 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,6 @@ Features: alt-svc AsynchDNS brotli HSTS HTTP2 HTTP3 HTTPS-proxy IPv6
<details><summary>Alternate configurations:</summary><p>

```
"big":
Protocols: dict file ftp ftps gopher gophers http https imap imaps ipfs ipns ldap ldaps mqtt pop3 pop3s rtsp scp sftp smb smbs smtp smtps telnet tftp ws wss
Features: alt-svc AsynchDNS brotli gsasl HSTS HTTP2 HTTP3 HTTPS-proxy IDN IPv6 Kerberos Largefile libz MultiSSL NTLM PSL SPNEGO SSL SSPI threadsafe UnixSockets zstd
"boringssl":
Protocols: dict file ftp ftps gopher gophers http https imap imaps ipfs ipns ldap ldaps mqtt pop3 pop3s rtsp scp sftp smb smbs smtp smtps telnet tftp ws wss
Features: alt-svc AsynchDNS brotli HSTS HTTP2 HTTP3 HTTPS-proxy IDN IPv6 Kerberos Largefile libz MultiSSL NTLM SPNEGO SSL SSPI threadsafe UnixSockets zstd
"noh3", HTTP/2:
Protocols: dict file ftp ftps gopher gophers http https imap imaps ipfs ipns ldap ldaps mqtt pop3 pop3s rtsp scp sftp smb smbs smtp smtps telnet tftp ws wss
Features: alt-svc AsynchDNS brotli HSTS HTTP2 HTTPS-proxy IDN IPv6 Kerberos Largefile libz MultiSSL NTLM SPNEGO SSL SSPI threadsafe UnixSockets zstd
Expand Down
2 changes: 1 addition & 1 deletion _build-runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ set -o xtrace -o errexit -o nounset; [ -n "${BASH:-}${ZSH_NAME:-}" ] && set -o p
cd "$(dirname "$0")"

# Customize these
export CW_CONFIG='dev-x64-big-cares'
export CW_CONFIG='dev-x64-psl-cares'
#export CURL_REV_='master'

# Install necessary packages
Expand Down
6 changes: 3 additions & 3 deletions _build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,9 @@ set -o xtrace -o errexit -o nounset; [ -n "${BASH:-}${ZSH_NAME:-}" ] && set -o p
# wolfssl build with wolfSSL (caveats!)
# wolfssh build with wolfSSH (requires wolfSSL)
# libssh build with libssh
# big build with more features, see README.md
# idn2 build with libidn2
# psl build with libpsl + embedded PublicSuffixList
# gsasl build with gsasl
# mini build with less features, see README.md
# micro build with less features, see README.md
# nano build with less features, see README.md
Expand Down Expand Up @@ -351,8 +353,6 @@ elif [[ "${_CONFIG}" = *'mini'* ]]; then
_FLAV='-mini'
elif [[ "${_CONFIG}" = *'noh3'* ]]; then
_FLAV='-noh3'
elif [[ "${_CONFIG}" = *'big'* ]]; then
_FLAV='-big'
fi

# For 'configure'-based builds.
Expand Down
13 changes: 10 additions & 3 deletions _dl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -681,6 +681,16 @@ if [[ "${_CONFIG}" = *'cares'* ]]; then
_DEPS+=' cares'
fi

if [[ "${_CONFIG}" = *'idn2'* ]]; then
_DEPS+=' libidn2'
fi
if [[ "${_CONFIG}" = *'psl'* ]]; then
_DEPS+=' libpsl'
fi
if [[ "${_CONFIG}" = *'gsasl'* ]]; then
_DEPS+=' gsasl'
fi

if [[ ! "${_CONFIG}" =~ (zero|bldtst|pico|nano) ]]; then
_DEPS+=' nghttp2'
if [[ "${_CONFIG}" != *'noh3'* ]]; then
Expand All @@ -690,9 +700,6 @@ fi

need_cacert=0

if [[ "${_CONFIG}" = *'big'* ]]; then
_DEPS+=' libidn2 libpsl gsasl'
fi
if [[ "${_CONFIG}" = *'wolfssl'* ]]; then
_DEPS+=' wolfssl'
need_cacert=1
Expand Down

0 comments on commit b7b23ce

Please sign in to comment.