← Commit list

2e160c9c65

Daniel Stenberg

2023-07-31

SUCCESS Duration: 77s

Subject

tool: add "variable" support

Binary

Download Binary (820 KB)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

$ git checkout -f 2e160c9c652504e147f474ed920ae891481e299c
Previous HEAD position was 92ac5a8d59 RELEASE-NOTES: synced
HEAD is now at 2e160c9c65 tool: add "variable" support

$ git clean -fdx
Removing Makefile
Removing Makefile.in
Removing aclocal.m4
Removing autom4te.cache/
Removing compile
Removing config.guess
Removing config.log
Removing config.status
Removing config.sub
Removing configure
Removing curl-config
Removing depcomp
Removing docs/Makefile
Removing docs/Makefile.in
Removing docs/cmdline-opts/Makefile
Removing docs/cmdline-opts/Makefile.in
Removing docs/curl.1
Removing docs/examples/.deps/
Removing docs/examples/Makefile
Removing docs/examples/Makefile.in
Removing docs/libcurl/Makefile
Removing docs/libcurl/Makefile.in
Removing docs/libcurl/opts/Makefile
Removing docs/libcurl/opts/Makefile.in
Removing include/Makefile
Removing include/Makefile.in
Removing include/curl/Makefile
Removing include/curl/Makefile.in
Removing install-sh
Removing lib/.deps/
Removing lib/.dirstamp
Removing lib/.libs/
Removing lib/Makefile
Removing lib/Makefile.in
Removing lib/base64.o
Removing lib/curl_config.h
Removing lib/curl_config.h.in
Removing lib/curl_multibyte.o
Removing lib/dynbuf.o
Removing lib/libcurl.la
Removing lib/libcurl.plist
Removing lib/libcurl.vers
Removing lib/libcurl_la-altsvc.lo
Removing lib/libcurl_la-altsvc.o
Removing lib/libcurl_la-amigaos.lo
Removing lib/libcurl_la-amigaos.o
Removing lib/libcurl_la-asyn-ares.lo
Removing lib/libcurl_la-asyn-ares.o
Removing lib/libcurl_la-asyn-thread.lo
Removing lib/libcurl_la-asyn-thread.o
Removing lib/libcurl_la-base64.lo
Removing lib/libcurl_la-base64.o
Removing lib/libcurl_la-bufq.lo
Removing lib/libcurl_la-bufq.o
Removing lib/libcurl_la-bufref.lo
Removing lib/libcurl_la-bufref.o
Removing lib/libcurl_la-c-hyper.lo
Removing lib/libcurl_la-c-hyper.o
Removing lib/libcurl_la-cf-h1-proxy.lo
Removing lib/libcurl_la-cf-h1-proxy.o
Removing lib/libcurl_la-cf-h2-proxy.lo
Removing lib/libcurl_la-cf-h2-proxy.o
Removing lib/libcurl_la-cf-haproxy.lo
Removing lib/libcurl_la-cf-haproxy.o
Removing lib/libcurl_la-cf-https-connect.lo
Removing lib/libcurl_la-cf-https-connect.o
Removing lib/libcurl_la-cf-socket.lo
Removing lib/libcurl_la-cf-socket.o
Removing lib/libcurl_la-cfilters.lo
Removing lib/libcurl_la-cfilters.o
Removing lib/libcurl_la-conncache.lo
Removing lib/libcurl_la-conncache.o
Removing lib/libcurl_la-connect.lo
Removing lib/libcurl_la-connect.o
Removing lib/libcurl_la-content_encoding.lo
Removing lib/libcurl_la-content_encoding.o
Removing lib/libcurl_la-cookie.lo
Removing lib/libcurl_la-cookie.o
Removing lib/libcurl_la-curl_addrinfo.lo
Removing lib/libcurl_la-curl_addrinfo.o
Removing lib/libcurl_la-curl_des.lo
Removing lib/libcurl_la-curl_des.o
Removing lib/libcurl_la-curl_endian.lo
Removing lib/libcurl_la-curl_endian.o
Removing lib/libcurl_la-curl_fnmatch.lo
Removing lib/libcurl_la-curl_fnmatch.o
Removing lib/libcurl_la-curl_get_line.lo
Removing lib/libcurl_la-curl_get_line.o
Removing lib/libcurl_la-curl_gethostname.lo
Removing lib/libcurl_la-curl_gethostname.o
Removing lib/libcurl_la-curl_gssapi.lo
Removing lib/libcurl_la-curl_gssapi.o
Removing lib/libcurl_la-curl_log.lo
Removing lib/libcurl_la-curl_log.o
Removing lib/libcurl_la-curl_memrchr.lo
Removing lib/libcurl_la-curl_memrchr.o
Removing lib/libcurl_la-curl_multibyte.lo
Removing lib/libcurl_la-curl_multibyte.o
Removing lib/libcurl_la-curl_ntlm_core.lo
Removing lib/libcurl_la-curl_ntlm_core.o
Removing lib/libcurl_la-curl_ntlm_wb.lo
Removing lib/libcurl_la-curl_ntlm_wb.o
Removing lib/libcurl_la-curl_path.lo
Removing lib/libcurl_la-curl_path.o
Removing lib/libcurl_la-curl_range.lo
Removing lib/libcurl_la-curl_range.o
Removing lib/libcurl_la-curl_rtmp.lo
Removing lib/libcurl_la-curl_rtmp.o
Removing lib/libcurl_la-curl_sasl.lo
Removing lib/libcurl_la-curl_sasl.o
Removing lib/libcurl_la-curl_sspi.lo
Removing lib/libcurl_la-curl_sspi.o
Removing lib/libcurl_la-curl_threads.lo
Removing lib/libcurl_la-curl_threads.o
Removing lib/libcurl_la-dict.lo
Removing lib/libcurl_la-dict.o
Removing lib/libcurl_la-doh.lo
Removing lib/libcurl_la-doh.o
Removing lib/libcurl_la-dynbuf.lo
Removing lib/libcurl_la-dynbuf.o
Removing lib/libcurl_la-dynhds.lo
Removing lib/libcurl_la-dynhds.o
Removing lib/libcurl_la-easy.lo
Removing lib/libcurl_la-easy.o
Removing lib/libcurl_la-easygetopt.lo
Removing lib/libcurl_la-easygetopt.o
Removing lib/libcurl_la-easyoptions.lo
Removing lib/libcurl_la-easyoptions.o
Removing lib/libcurl_la-escape.lo
Removing lib/libcurl_la-escape.o
Removing lib/libcurl_la-file.lo
Removing lib/libcurl_la-file.o
Removing lib/libcurl_la-fileinfo.lo
Removing lib/libcurl_la-fileinfo.o
Removing lib/libcurl_la-fopen.lo
Removing lib/libcurl_la-fopen.o
Removing lib/libcurl_la-formdata.lo
Removing lib/libcurl_la-formdata.o
Removing lib/libcurl_la-ftp.lo
Removing lib/libcurl_la-ftp.o
Removing lib/libcurl_la-ftplistparser.lo
Removing lib/libcurl_la-ftplistparser.o
Removing lib/libcurl_la-getenv.lo
Removing lib/libcurl_la-getenv.o
Removing lib/libcurl_la-getinfo.lo
Removing lib/libcurl_la-getinfo.o
Removing lib/libcurl_la-gopher.lo
Removing lib/libcurl_la-gopher.o
Removing lib/libcurl_la-hash.lo
Removing lib/libcurl_la-hash.o
Removing lib/libcurl_la-headers.lo
Removing lib/libcurl_la-headers.o
Removing lib/libcurl_la-hmac.lo
Removing lib/libcurl_la-hmac.o
Removing lib/libcurl_la-hostasyn.lo
Removing lib/libcurl_la-hostasyn.o
Removing lib/libcurl_la-hostip.lo
Removing lib/libcurl_la-hostip.o
Removing lib/libcurl_la-hostip4.lo
Removing lib/libcurl_la-hostip4.o
Removing lib/libcurl_la-hostip6.lo
Removing lib/libcurl_la-hostip6.o
Removing lib/libcurl_la-hostsyn.lo
Removing lib/libcurl_la-hostsyn.o
Removing lib/libcurl_la-hsts.lo
Removing lib/libcurl_la-hsts.o
Removing lib/libcurl_la-http.lo
Removing lib/libcurl_la-http.o
Removing lib/libcurl_la-http1.lo
Removing lib/libcurl_la-http1.o
Removing lib/libcurl_la-http2.lo
Removing lib/libcurl_la-http2.o
Removing lib/libcurl_la-http_aws_sigv4.lo
Removing lib/libcurl_la-http_aws_sigv4.o
Removing lib/libcurl_la-http_chunks.lo
Removing lib/libcurl_la-http_chunks.o
Removing lib/libcurl_la-http_digest.lo
Removing lib/libcurl_la-http_digest.o
Removing lib/libcurl_la-http_negotiate.lo
Removing lib/libcurl_la-http_negotiate.o
Removing lib/libcurl_la-http_ntlm.lo
Removing lib/libcurl_la-http_ntlm.o
Removing lib/libcurl_la-http_proxy.lo
Removing lib/libcurl_la-http_proxy.o
Removing lib/libcurl_la-idn.lo
Removing lib/libcurl_la-idn.o
Removing lib/libcurl_la-if2ip.lo
Removing lib/libcurl_la-if2ip.o
Removing lib/libcurl_la-imap.lo
Removing lib/libcurl_la-imap.o
Removing lib/libcurl_la-inet_ntop.lo
Removing lib/libcurl_la-inet_ntop.o
Removing lib/libcurl_la-inet_pton.lo
Removing lib/libcurl_la-inet_pton.o
Removing lib/libcurl_la-krb5.lo
Removing lib/libcurl_la-krb5.o
Removing lib/libcurl_la-ldap.lo
Removing lib/libcurl_la-ldap.o
Removing lib/libcurl_la-llist.lo
Removing lib/libcurl_la-llist.o
Removing lib/libcurl_la-macos.lo
Removing lib/libcurl_la-macos.o
Removing lib/libcurl_la-md4.lo
Removing lib/libcurl_la-md4.o
Removing lib/libcurl_la-md5.lo
Removing lib/libcurl_la-md5.o
Removing lib/libcurl_la-memdebug.lo
Removing lib/libcurl_la-memdebug.o
Removing lib/libcurl_la-mime.lo
Removing lib/libcurl_la-mime.o
Removing lib/libcurl_la-mprintf.lo
Removing lib/libcurl_la-mprintf.o
Removing lib/libcurl_la-mqtt.lo
Removing lib/libcurl_la-mqtt.o
Removing lib/libcurl_la-multi.lo
Removing lib/libcurl_la-multi.o
Removing lib/libcurl_la-netrc.lo
Removing lib/libcurl_la-netrc.o
Removing lib/libcurl_la-nonblock.lo
Removing lib/libcurl_la-nonblock.o
Removing lib/libcurl_la-noproxy.lo
Removing lib/libcurl_la-noproxy.o
Removing lib/libcurl_la-openldap.lo
Removing lib/libcurl_la-openldap.o
Removing lib/libcurl_la-parsedate.lo
Removing lib/libcurl_la-parsedate.o
Removing lib/libcurl_la-pingpong.lo
Removing lib/libcurl_la-pingpong.o
Removing lib/libcurl_la-pop3.lo
Removing lib/libcurl_la-pop3.o
Removing lib/libcurl_la-progress.lo
Removing lib/libcurl_la-progress.o
Removing lib/libcurl_la-psl.lo
Removing lib/libcurl_la-psl.o
Removing lib/libcurl_la-rand.lo
Removing lib/libcurl_la-rand.o
Removing lib/libcurl_la-rename.lo
Removing lib/libcurl_la-rename.o
Removing lib/libcurl_la-rtsp.lo
Removing lib/libcurl_la-rtsp.o
Removing lib/libcurl_la-select.lo
Removing lib/libcurl_la-select.o
Removing lib/libcurl_la-sendf.lo
Removing lib/libcurl_la-sendf.o
Removing lib/libcurl_la-setopt.lo
Removing lib/libcurl_la-setopt.o
Removing lib/libcurl_la-sha256.lo
Removing lib/libcurl_la-sha256.o
Removing lib/libcurl_la-share.lo
Removing lib/libcurl_la-share.o
Removing lib/libcurl_la-slist.lo
Removing lib/libcurl_la-slist.o
Removing lib/libcurl_la-smb.lo
Removing lib/libcurl_la-smb.o
Removing lib/libcurl_la-smtp.lo
Removing lib/libcurl_la-smtp.o
Removing lib/libcurl_la-socketpair.lo
Removing lib/libcurl_la-socketpair.o
Removing lib/libcurl_la-socks.lo
Removing lib/libcurl_la-socks.o
Removing lib/libcurl_la-socks_gssapi.lo
Removing lib/libcurl_la-socks_gssapi.o
Removing lib/libcurl_la-socks_sspi.lo
Removing lib/libcurl_la-socks_sspi.o
Removing lib/libcurl_la-speedcheck.lo
Removing lib/libcurl_la-speedcheck.o
Removing lib/libcurl_la-splay.lo
Removing lib/libcurl_la-splay.o
Removing lib/libcurl_la-strcase.lo
Removing lib/libcurl_la-strcase.o
Removing lib/libcurl_la-strdup.lo
Removing lib/libcurl_la-strdup.o
Removing lib/libcurl_la-strerror.lo
Removing lib/libcurl_la-strerror.o
Removing lib/libcurl_la-strtok.lo
Removing lib/libcurl_la-strtok.o
Removing lib/libcurl_la-strtoofft.lo
Removing lib/libcurl_la-strtoofft.o
Removing lib/libcurl_la-system_win32.lo
Removing lib/libcurl_la-system_win32.o
Removing lib/libcurl_la-telnet.lo
Removing lib/libcurl_la-telnet.o
Removing lib/libcurl_la-tftp.lo
Removing lib/libcurl_la-tftp.o
Removing lib/libcurl_la-timediff.lo
Removing lib/libcurl_la-timediff.o
Removing lib/libcurl_la-timeval.lo
Removing lib/libcurl_la-timeval.o
Removing lib/libcurl_la-transfer.lo
Removing lib/libcurl_la-transfer.o
Removing lib/libcurl_la-url.lo
Removing lib/libcurl_la-url.o
Removing lib/libcurl_la-urlapi.lo
Removing lib/libcurl_la-urlapi.o
Removing lib/libcurl_la-version.lo
Removing lib/libcurl_la-version.o
Removing lib/libcurl_la-version_win32.lo
Removing lib/libcurl_la-version_win32.o
Removing lib/libcurl_la-warnless.lo
Removing lib/libcurl_la-warnless.o
Removing lib/libcurl_la-ws.lo
Removing lib/libcurl_la-ws.o
Removing lib/nonblock.o
Removing lib/stamp-h1
Removing lib/strtoofft.o
Removing lib/timediff.o
Removing lib/vauth/.deps/
Removing lib/vauth/.dirstamp
Removing lib/vauth/libcurl_la-cleartext.lo
Removing lib/vauth/libcurl_la-cleartext.o
Removing lib/vauth/libcurl_la-cram.lo
Removing lib/vauth/libcurl_la-cram.o
Removing lib/vauth/libcurl_la-digest.lo
Removing lib/vauth/libcurl_la-digest.o
Removing lib/vauth/libcurl_la-digest_sspi.lo
Removing lib/vauth/libcurl_la-digest_sspi.o
Removing lib/vauth/libcurl_la-gsasl.lo
Removing lib/vauth/libcurl_la-gsasl.o
Removing lib/vauth/libcurl_la-krb5_gssapi.lo
Removing lib/vauth/libcurl_la-krb5_gssapi.o
Removing lib/vauth/libcurl_la-krb5_sspi.lo
Removing lib/vauth/libcurl_la-krb5_sspi.o
Removing lib/vauth/libcurl_la-ntlm.lo
Removing lib/vauth/libcurl_la-ntlm.o
Removing lib/vauth/libcurl_la-ntlm_sspi.lo
Removing lib/vauth/libcurl_la-ntlm_sspi.o
Removing lib/vauth/libcurl_la-oauth2.lo
Removing lib/vauth/libcurl_la-oauth2.o
Removing lib/vauth/libcurl_la-spnego_gssapi.lo
Removing lib/vauth/libcurl_la-spnego_gssapi.o
Removing lib/vauth/libcurl_la-spnego_sspi.lo
Removing lib/vauth/libcurl_la-spnego_sspi.o
Removing lib/vauth/libcurl_la-vauth.lo
Removing lib/vauth/libcurl_la-vauth.o
Removing lib/version_win32.o
Removing lib/vquic/.deps/
Removing lib/vquic/.dirstamp
Removing lib/vquic/libcurl_la-curl_msh3.lo
Removing lib/vquic/libcurl_la-curl_msh3.o
Removing lib/vquic/libcurl_la-curl_ngtcp2.lo
Removing lib/vquic/libcurl_la-curl_ngtcp2.o
Removing lib/vquic/libcurl_la-curl_quiche.lo
Removing lib/vquic/libcurl_la-curl_quiche.o
Removing lib/vquic/libcurl_la-vquic.lo
Removing lib/vquic/libcurl_la-vquic.o
Removing lib/vssh/.deps/
Removing lib/vssh/.dirstamp
Removing lib/vssh/libcurl_la-libssh.lo
Removing lib/vssh/libcurl_la-libssh.o
Removing lib/vssh/libcurl_la-libssh2.lo
Removing lib/vssh/libcurl_la-libssh2.o
Removing lib/vssh/libcurl_la-wolfssh.lo
Removing lib/vssh/libcurl_la-wolfssh.o
Removing lib/vtls/.deps/
Removing lib/vtls/.dirstamp
Removing lib/vtls/libcurl_la-bearssl.lo
Removing lib/vtls/libcurl_la-bearssl.o
Removing lib/vtls/libcurl_la-gskit.lo
Removing lib/vtls/libcurl_la-gskit.o
Removing lib/vtls/libcurl_la-gtls.lo
Removing lib/vtls/libcurl_la-gtls.o
Removing lib/vtls/libcurl_la-hostcheck.lo
Removing lib/vtls/libcurl_la-hostcheck.o
Removing lib/vtls/libcurl_la-keylog.lo
Removing lib/vtls/libcurl_la-keylog.o
Removing lib/vtls/libcurl_la-mbedtls.lo
Removing lib/vtls/libcurl_la-mbedtls.o
Removing lib/vtls/libcurl_la-mbedtls_threadlock.lo
Removing lib/vtls/libcurl_la-mbedtls_threadlock.o
Removing lib/vtls/libcurl_la-openssl.lo
Removing lib/vtls/libcurl_la-openssl.o
Removing lib/vtls/libcurl_la-rustls.lo
Removing lib/vtls/libcurl_la-rustls.o
Removing lib/vtls/libcurl_la-schannel.lo
Removing lib/vtls/libcurl_la-schannel.o
Removing lib/vtls/libcurl_la-schannel_verify.lo
Removing lib/vtls/libcurl_la-schannel_verify.o
Removing lib/vtls/libcurl_la-sectransp.lo
Removing lib/vtls/libcurl_la-sectransp.o
Removing lib/vtls/libcurl_la-vtls.lo
Removing lib/vtls/libcurl_la-vtls.o
Removing lib/vtls/libcurl_la-wolfssl.lo
Removing lib/vtls/libcurl_la-wolfssl.o
Removing lib/vtls/libcurl_la-x509asn1.lo
Removing lib/vtls/libcurl_la-x509asn1.o
Removing lib/warnless.o
Removing libcurl.pc
Removing libtool
Removing ltmain.sh
Removing m4/libtool.m4
Removing m4/ltoptions.m4
Removing m4/ltsugar.m4
Removing m4/ltversion.m4
Removing m4/lt~obsolete.m4
Removing missing
Removing packages/Makefile
Removing packages/Makefile.in
Removing packages/vms/Makefile
Removing packages/vms/Makefile.in
Removing scripts/Makefile
Removing scripts/Makefile.in
Removing src/.deps/
Removing src/.libs/
Removing src/Makefile
Removing src/Makefile.in
Removing src/curl
Removing src/slist_wc.o
Removing src/tool_binmode.o
Removing src/tool_bname.o
Removing src/tool_cb_dbg.o
Removing src/tool_cb_hdr.o
Removing src/tool_cb_prg.o
Removing src/tool_cb_rea.o
Removing src/tool_cb_see.o
Removing src/tool_cb_wrt.o
Removing src/tool_cfgable.o
Removing src/tool_dirhie.o
Removing src/tool_doswin.o
Removing src/tool_easysrc.o
Removing src/tool_filetime.o
Removing src/tool_findfile.o
Removing src/tool_formparse.o
Removing src/tool_getparam.o
Removing src/tool_getpass.o
Removing src/tool_help.o
Removing src/tool_helpers.o
Removing src/tool_hugehelp.c
Removing src/tool_hugehelp.o
Removing src/tool_libinfo.o
Removing src/tool_listhelp.o
Removing src/tool_main.o
Removing src/tool_msgs.o
Removing src/tool_operate.o
Removing src/tool_operhlp.o
Removing src/tool_paramhlp.o
Removing src/tool_parsecfg.o
Removing src/tool_progress.o
Removing src/tool_setopt.o
Removing src/tool_sleep.o
Removing src/tool_stderr.o
Removing src/tool_strdup.o
Removing src/tool_urlglob.o
Removing src/tool_util.o
Removing src/tool_vms.o
Removing src/tool_writeout.o
Removing src/tool_writeout_json.o
Removing src/tool_xattr.o
Removing src/var.o
Removing test-driver
Removing tests/Makefile
Removing tests/Makefile.in
Removing tests/certs/Makefile
Removing tests/certs/Makefile.in
Removing tests/certs/scripts/Makefile
Removing tests/certs/scripts/Makefile.in
Removing tests/config
Removing tests/configurehelp.pm
Removing tests/data/Makefile
Removing tests/data/Makefile.in
Removing tests/http/Makefile
Removing tests/http/Makefile.in
Removing tests/http/clients/.deps/
Removing tests/http/clients/Makefile
Removing tests/http/clients/Makefile.in
Removing tests/http/config.ini
Removing tests/libtest/.deps/
Removing tests/libtest/Makefile
Removing tests/libtest/Makefile.in
Removing tests/server/.deps/
Removing tests/server/Makefile
Removing tests/server/Makefile.in
Removing tests/unit/.deps/
Removing tests/unit/Makefile
Removing tests/unit/Makefile.in

$ autoreconf -fi
libtoolize: putting auxiliary files in '.'.
libtoolize: copying file './ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
libtoolize: copying file 'm4/libtool.m4'
libtoolize: copying file 'm4/ltoptions.m4'
libtoolize: copying file 'm4/ltsugar.m4'
libtoolize: copying file 'm4/ltversion.m4'
libtoolize: copying file 'm4/lt~obsolete.m4'
libtoolize: Remember to add 'LT_INIT' to configure.ac.
configure.ac:123: installing './compile'
configure.ac:424: installing './config.guess'
configure.ac:424: installing './config.sub'
configure.ac:123: installing './install-sh'
configure.ac:129: installing './missing'
docs/examples/Makefile.am: installing './depcomp'
parallel-tests: installing './test-driver'

$ bash -c find . -name config.guess -exec cp /usr/share/misc/config.guess {} \;

$ bash -c find . -name config.sub -exec cp /usr/share/misc/config.sub {} \;

$ chmod +x configure

$ ./configure --disable-shared --without-ssl --disable-docs
checking whether to enable maintainer-specific portions of Makefiles... no
checking whether make supports nested variables... yes
checking whether to enable debug build options... no
checking whether to enable compiler optimizer... (assumed) yes
checking whether to enable strict compiler warnings... no
checking whether to enable compiler warnings as errors... no
checking whether to enable curl debug memory tracking... no
checking whether to enable hiding of library internal symbols... yes
checking whether to enable c-ares for DNS lookups... no
checking whether to disable dependency on -lrt... (assumed no)
checking whether to enable ECH support... no
checking for path separator... :
checking for sed... /usr/bin/sed
checking for grep... /usr/bin/grep
checking that grep -E works... yes
checking for ar... /usr/bin/ar
checking for a BSD-compatible install... /usr/bin/install -c
checking for gcc... ccache gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether the compiler supports GNU C... yes
checking whether ccache gcc accepts -g... yes
checking for ccache gcc option to enable C11 features... none needed
checking whether ccache gcc understands -c and -o together... yes
checking how to run the C preprocessor... ccache gcc -E
checking for stdio.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for strings.h... yes
checking for sys/stat.h... yes
checking for sys/types.h... yes
checking for unistd.h... yes
checking for stdatomic.h... yes
checking if _Atomic is available... yes
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for code coverage support... no
checking whether build environment is sane... yes
checking for a race-free mkdir -p... /usr/bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking whether make supports the include directive... yes (GNU style)
checking dependency style of ccache gcc... gcc3
checking curl version... 8.3.0-DEV
checking for httpd... no
checking for apache2... no
checking for apachectl... no
checking for apxs... no
configure: httpd/apache2 not in PATH, http tests disabled
configure: apxs not in PATH, http tests disabled
checking for nghttpx... no
checking for caddy... no
checking build system type... x86_64-pc-linux-gnu
checking host system type... x86_64-pc-linux-gnu
checking for grep that handles long lines and -e... (cached) /usr/bin/grep
checking for egrep... /usr/bin/grep -E
checking if OS is AIX (to define _ALL_SOURCE)... no
checking if _THREAD_SAFE is already defined... no
checking if _THREAD_SAFE is actually needed... no
checking if _THREAD_SAFE is onwards defined... no
checking if _REENTRANT is already defined... no
checking if _REENTRANT is actually needed... no
checking if _REENTRANT is onwards defined... no
checking for special C compiler options needed for large files... no
checking for _FILE_OFFSET_BITS value needed for large files... no
checking how to print strings... printf
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for fgrep... /usr/bin/grep -F
checking for ld used by ccache gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu format... func_convert_file_noop
checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for dlltool... no
checking how to associate runtime and link libraries... printf %s\n
checking for archiver @FILE support... @
checking for strip... strip
checking for ranlib... ranlib
checking command to parse /usr/bin/nm -B output from ccache gcc object... ok
checking for sysroot... no
checking for a working dd... /usr/bin/dd
checking how to truncate binary pipes... /usr/bin/dd bs=4096 count=1
checking for mt... mt
checking if mt is a manifest tool... no
checking for dlfcn.h... yes
checking for objdir... .libs
checking if ccache gcc supports -fno-rtti -fno-exceptions... no
checking for ccache gcc option to produce PIC... -fPIC -DPIC
checking if ccache gcc PIC flag -fPIC -DPIC works... yes
checking if ccache gcc static flag -static works... yes
checking if ccache gcc supports -c -o file.o... yes
checking if ccache gcc supports -c -o file.o... (cached) yes
checking whether the ccache gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... no
checking whether to build static libraries... yes
checking whether to build shared libraries with -version-info... yes
checking whether to build shared libraries with -no-undefined... no
checking whether to build shared libraries with -mimpure-text... no
checking whether to build shared libraries with PIC... yes
checking whether to build static libraries with PIC... yes
checking whether to build shared libraries only... no
checking whether to build static libraries only... yes
checking for windres... no
checking for inline... inline
checking if cpp -P is needed... yes
checking if cpp -P works... yes
checking if compiler is DEC/Compaq/HP C... no
checking if compiler is HP-UX C... no
checking if compiler is IBM C... no
checking if compiler is Intel C... no
checking if compiler is clang... no
checking if compiler is GNU C... yes
checking if compiler is LCC... no
checking if compiler is SGI MIPSpro C... no
checking if compiler is SGI MIPS C... no
checking if compiler is SunPro C... no
checking if compiler is Tiny C... no
checking if compiler accepts some basic options... yes
configure: compiler options added: -Werror-implicit-function-declaration
checking if compiler optimizer assumed setting might be used... yes
checking if compiler accepts optimizer enabling options... yes
configure: compiler options added: -O2
checking if compiler accepts strict warning options... yes
configure: compiler options added: -Wno-system-headers
checking if compiler halts on compilation errors... yes
checking if compiler halts on negative sized arrays... yes
checking if compiler halts on function prototype mismatch... yes
checking if compiler supports hiding library internal symbols... yes
checking for windows.h... no
checking whether build target is a native Windows one... no
checking whether build target supports WIN32 file API... no
checking whether build target supports WIN32 crypto API... no
checking for good-to-use Darwin CFLAGS... no
checking whether to link macOS CoreFoundation and SystemConfiguration framework... no
checking to see if the compiler supports __builtin_available()... no
checking whether to support http... yes
checking whether to support ftp... yes
checking whether to support file... yes
checking whether to support ldap... yes
checking whether to support ldaps... yes
checking whether to support rtsp... yes
checking whether to support proxies... yes
checking whether to support dict... yes
checking whether to support telnet... yes
checking whether to support tftp... yes
checking whether to support pop3... yes
checking whether to support imap... yes
checking whether to support smb... yes
checking whether to support smtp... yes
checking whether to support gopher... yes
checking whether to support mqtt... no
checking whether to provide built-in manual... yes
checking whether to enable generation of C code... yes
checking whether to use libgcc... no
checking if X/Open network library is required... no
checking for gethostbyname... yes
checking for windows.h... (cached) no
checking for winsock2.h... (cached) no
checking for proto/bsdsocket.h... no
checking for connect in libraries... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... yes
checking for monotonic clock_gettime... yes
checking for clock_gettime in libraries... no additional lib required
checking if monotonic clock_gettime works... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for raw monotonic clock_gettime... yes
checking for pkg-config... /usr/bin/pkg-config
checking for zlib options with pkg-config... found
checking for zlib.h... yes
configure: found both libz and libz.h header
checking for BrotliDecoderDecompress in -lbrotlidec... no
checking for brotli/decode.h... no
checking for ZSTD_createDStream in -lzstd... no
checking for zstd.h... no
checking for lber.h... no
checking for ldap.h... no
checking for ldap_ssl.h... no
checking for LDAP libraries... cannot find LDAP libraries
checking whether to enable IPv6... yes
checking if struct sockaddr_in6 has sin6_scope_id member... yes
checking if argv can be written to... yes
checking if GSS-API support is requested... no
checking whether to enable Windows native SSL/TLS... no
checking whether to enable Secure Transport... no
checking whether to enable Amiga native SSL/TLS (AmiSSL v5)... no
checking for library containing psl_builtin... -lpsl
checking for library containing gsasl_init... no
checking for RTMP_Init in -lrtmp... no
checking whether versioned symbols are wanted... no
checking whether to enable Windows native IDN (Windows native builds only)... no
checking whether to build with libidn2... (assumed) yes
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libidn2 options with pkg-config... no
configure: IDN_LIBS: "-lidn2"
configure: IDN_LDFLAGS: ""
configure: IDN_CPPFLAGS: ""
configure: IDN_DIR: ""
checking if idn2_lookup_ul can be linked... no
checking for idn2.h... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libnghttp2 options with pkg-config... no
checking for nghttp2_session_get_stream_local_window_size in -lnghttp2... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for fish options with pkg-config... no
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/select.h... yes
checking for sys/socket.h... yes
checking for sys/ioctl.h... yes
checking for sys/uio.h... yes
checking for unistd.h... (cached) yes
checking for stdlib.h... (cached) yes
checking for arpa/inet.h... yes
checking for net/if.h... yes
checking for netinet/in.h... yes
checking for netinet/in6.h... no
checking for sys/un.h... yes
checking for linux/tcp.h... yes
checking for netinet/tcp.h... yes
checking for netinet/udp.h... yes
checking for netdb.h... yes
checking for sys/sockio.h... no
checking for sys/stat.h... (cached) yes
checking for sys/param.h... yes
checking for termios.h... yes
checking for termio.h... yes
checking for fcntl.h... yes
checking for io.h... no
checking for pwd.h... yes
checking for utime.h... yes
checking for sys/utime.h... no
checking for sys/poll.h... yes
checking for poll.h... yes
checking for socket.h... no
checking for sys/resource.h... yes
checking for libgen.h... yes
checking for locale.h... yes
checking for stdbool.h... yes
checking for arpa/tftp.h... yes
checking for sys/filio.h... no
checking for sys/wait.h... yes
checking for setjmp.h... yes
checking for an ANSI C-conforming const... yes
checking for compiler support of C99 variadic macro style... yes
checking for compiler support of old gcc variadic macro style... yes
checking for size_t... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for struct timeval... yes
checking run-time libs availability... fine
checking size of size_t... 8
checking size of long... 8
checking size of int... 4
checking size of time_t... 8
checking size of off_t... 8
checking size of curl_off_t... 8
checking size of curl_socket_t... 4
checking for long long... yes
checking for ssize_t... yes
checking for bool... yes
checking for sa_family_t... yes
checking for suseconds_t... yes
checking if time_t is unsigned... no
checking for sys/types.h... (cached) yes
checking for poll.h... (cached) yes
checking for sys/poll.h... (cached) yes
checking for in_addr_t... yes
checking for struct sockaddr_storage... yes
checking for sys/select.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for select... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for recv... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for send... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for MSG_NOSIGNAL... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking if alarm can be linked... yes
checking if alarm is prototyped... yes
checking if alarm is compilable... yes
checking if alarm usage allowed... yes
checking if alarm might be used... yes
checking for sys/types.h... (cached) yes
checking for string.h... (cached) yes
checking for strings.h... (cached) yes
checking for sys/types.h... (cached) yes
checking for libgen.h... (cached) yes
checking if basename can be linked... yes
checking if basename is prototyped... yes
checking if basename is compilable... yes
checking if basename usage allowed... yes
checking if basename might be used... yes
checking for sys/types.h... (cached) yes
checking for socket.h... (cached) no
checking if closesocket can be linked... no
checking if closesocket might be used... no
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking if CloseSocket can be linked... no
checking if CloseSocket might be used... no
checking if connect can be linked... yes
checking if connect is prototyped... yes
checking if connect is compilable... yes
checking if connect usage allowed... yes
checking if connect might be used... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for fcntl.h... (cached) yes
checking if fcntl can be linked... yes
checking if fcntl is prototyped... yes
checking if fcntl is compilable... yes
checking if fcntl usage allowed... yes
checking if fcntl might be used... yes
checking if fcntl O_NONBLOCK is compilable... yes
checking if fcntl O_NONBLOCK usage allowed... yes
checking if fcntl O_NONBLOCK might be used... yes
checking for windows.h... (cached) no
checking for winsock2.h... (cached) no
checking for ws2tcpip.h... (cached) no
checking for sys/types.h... (cached) yes
checking for netdb.h... (cached) yes
checking if freeaddrinfo can be linked... yes
checking if freeaddrinfo is prototyped... yes
checking if freeaddrinfo is compilable... yes
checking if freeaddrinfo usage allowed... yes
checking if freeaddrinfo might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/xattr.h... yes
checking if fsetxattr can be linked... yes
checking if fsetxattr is prototyped... yes
checking if fsetxattr takes 5 args.... yes
checking if fsetxattr is compilable... yes
checking if fsetxattr usage allowed... yes
checking if fsetxattr might be used... yes
checking if ftruncate can be linked... yes
checking if ftruncate is prototyped... yes
checking if ftruncate is compilable... yes
checking if ftruncate usage allowed... yes
checking if ftruncate might be used... yes
checking for sys/types.h... (cached) yes
checking for stdlib.h... (cached) yes
checking if getaddrinfo can be linked... yes
checking if getaddrinfo is prototyped... yes
checking if getaddrinfo is compilable... yes
checking if getaddrinfo seems to work... yes
checking if getaddrinfo usage allowed... yes
checking if getaddrinfo might be used... yes
checking if getaddrinfo is threadsafe... yes
checking if gethostbyname can be linked... yes
checking if gethostbyname is prototyped... yes
checking if gethostbyname is compilable... yes
checking if gethostbyname usage allowed... yes
checking if gethostbyname might be used... yes
checking if gethostbyname_r can be linked... yes
checking if gethostbyname_r is prototyped... yes
checking if gethostbyname_r takes 3 args.... no
checking if gethostbyname_r takes 5 args.... no
checking if gethostbyname_r takes 6 args.... yes
checking if gethostbyname_r is compilable... yes
checking if gethostbyname_r usage allowed... yes
checking if gethostbyname_r might be used... yes
checking if gethostname can be linked... yes
checking if gethostname is prototyped... yes
checking if gethostname is compilable... yes
checking for gethostname arg 2 data type... size_t
checking if gethostname usage allowed... yes
checking if gethostname might be used... yes
checking if getpeername can be linked... yes
checking if getpeername is prototyped... yes
checking if getpeername is compilable... yes
checking if getpeername usage allowed... yes
checking if getpeername might be used... yes
checking if getsockname can be linked... yes
checking if getsockname is prototyped... yes
checking if getsockname is compilable... yes
checking if getsockname usage allowed... yes
checking if getsockname might be used... yes
checking for net/if.h... (cached) yes
checking if if_nametoindex can be linked... yes
checking if if_nametoindex is prototyped... yes
checking if if_nametoindex is compilable... yes
checking if if_nametoindex usage allowed... yes
checking if if_nametoindex might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for ifaddrs.h... yes
checking if getifaddrs can be linked... yes
checking if getifaddrs is prototyped... yes
checking if getifaddrs is compilable... yes
checking if getifaddrs seems to work... yes
checking if getifaddrs usage allowed... yes
checking if getifaddrs might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking if gmtime_r can be linked... yes
checking if gmtime_r is prototyped... yes
checking if gmtime_r is compilable... yes
checking if gmtime_r seems to work... yes
checking if gmtime_r usage allowed... yes
checking if gmtime_r might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for arpa/inet.h... (cached) yes
checking if inet_ntop can be linked... yes
checking if inet_ntop is prototyped... yes
checking if inet_ntop is compilable... yes
checking if inet_ntop seems to work... yes
checking if inet_ntop usage allowed... yes
checking if inet_ntop might be used... yes
checking if inet_pton can be linked... yes
checking if inet_pton is prototyped... yes
checking if inet_pton is compilable... yes
checking if inet_pton seems to work... yes
checking if inet_pton usage allowed... yes
checking if inet_pton might be used... yes
checking if ioctlsocket can be linked... no
checking if ioctlsocket might be used... no
checking if IoctlSocket can be linked... no
checking if IoctlSocket might be used... no
checking if memrchr can be linked... yes
checking if memrchr is prototyped... no
checking if memrchr might be used... no
checking if poll can be linked... yes
checking if poll is prototyped... yes
checking if poll is compilable... yes
checking if poll seems to work... yes
checking if poll usage allowed... yes
checking if poll might be used... yes
checking for sys/types.h... (cached) yes
checking for signal.h... yes
checking if sigaction can be linked... yes
checking if sigaction is prototyped... yes
checking if sigaction is compilable... yes
checking if sigaction usage allowed... yes
checking if sigaction might be used... yes
checking if siginterrupt can be linked... yes
checking if siginterrupt is prototyped... yes
checking if siginterrupt is compilable... yes
checking if siginterrupt usage allowed... yes
checking if siginterrupt might be used... yes
checking if signal can be linked... yes
checking if signal is prototyped... yes
checking if signal is compilable... yes
checking if signal usage allowed... yes
checking if signal might be used... yes
checking for sys/types.h... (cached) yes
checking for setjmp.h... (cached) yes
checking if sigsetjmp can be linked... no
checking if sigsetjmp seems a macro... yes
checking if sigsetjmp is compilable... yes
checking if sigsetjmp usage allowed... yes
checking if sigsetjmp might be used... yes
checking if socket can be linked... yes
checking if socket is prototyped... yes
checking if socket is compilable... yes
checking if socket usage allowed... yes
checking if socket might be used... yes
checking if socketpair can be linked... yes
checking if socketpair is prototyped... yes
checking if socketpair is compilable... yes
checking if socketpair usage allowed... yes
checking if socketpair might be used... yes
checking if strcasecmp can be linked... yes
checking if strcasecmp is prototyped... yes
checking if strcasecmp is compilable... yes
checking if strcasecmp usage allowed... yes
checking if strcasecmp might be used... yes
checking if strcmpi can be linked... no
checking if strcmpi might be used... no
checking if strdup can be linked... yes
checking if strdup is prototyped... yes
checking if strdup is compilable... yes
checking if strdup usage allowed... yes
checking if strdup might be used... yes
checking if strerror_r can be linked... yes
checking if strerror_r is prototyped... yes
checking if strerror_r is compilable... yes
checking if strerror_r is glibc like... no
checking if strerror_r is POSIX like... yes
checking if strerror_r seems to work... yes
checking if strerror_r usage allowed... yes
checking if strerror_r might be used... yes
checking if stricmp can be linked... no
checking if stricmp might be used... no
checking if strtok_r can be linked... yes
checking if strtok_r is prototyped... yes
checking if strtok_r is compilable... yes
checking if strtok_r usage allowed... yes
checking if strtok_r might be used... yes
checking if strtoll can be linked... yes
checking if strtoll is prototyped... yes
checking if strtoll is compilable... yes
checking if strtoll usage allowed... yes
checking if strtoll might be used... yes
checking for ccache gcc options needed to detect all undeclared functions... none needed
checking whether getpwuid_r is declared... yes
checking for fnmatch... yes
checking for fchmod... yes
checking for fork... yes
checking for geteuid... yes
checking for getpass_r... no
checking deeper for getpass_r... but still no
checking for getppid... yes
checking for getpwuid... yes
checking for getpwuid_r... yes
checking for getrlimit... yes
checking for gettimeofday... yes
checking for if_nametoindex... yes
checking for mach_absolute_time... no
checking deeper for mach_absolute_time... but still no
checking for pipe... yes
checking for sched_yield... yes
checking for sendmsg... yes
checking for setlocale... yes
checking for setmode... no
checking deeper for setmode... but still no
checking for setrlimit... yes
checking for snprintf... yes
checking for utime... yes
checking for utimes... yes
checking for arc4random... no
checking deeper for arc4random... but still no
checking how to set a socket into non-blocking mode... fcntl O_NONBLOCK
checking for perl... /usr/bin/perl
checking for gnroff... no
checking for nroff... /usr/bin/nroff
checking how to use *nroff to get plain text from man pages... -man
checking whether to enable the threaded resolver... yes
checking whether to use POSIX threads for threaded resolver... auto
checking for pthread.h... yes
checking for pthread_create... yes
checking convert -I options to -isystem... yes
checking whether to enable verbose strings... yes
checking whether to enable SSPI support (Windows native builds only)... no
checking whether to enable cryptographic authentication methods... yes
checking whether to support NTLM... yes
checking whether to enable NTLM delegation to winbind's helper... no
checking whether to enable TLS-SRP authentication... yes
checking whether to enable Unix domain sockets... auto
checking for struct sockaddr_un.sun_path... yes
checking whether to support cookies... yes
checking whether to support socketpair... yes
checking whether to support HTTP authentication... yes
checking whether to support DoH... yes
checking whether to support the MIME API... yes
checking whether to support the form API... yes
checking whether to support date parsing... yes
checking whether to support netrc parsing... yes
checking whether to support progress-meter... yes
checking whether to support DNS shuffling... yes
checking whether to support curl_easy_option*... yes
checking whether to support alt-svc... yes
checking whether to support headers-api... yes
configure: disables HSTS due to lack of SSL
checking whether to support WebSockets... no
checking whether hiding of library internal symbols will actually happen... yes
checking that generated files are newer than configure... done
configure: creating ./config.status
config.status: creating Makefile
config.status: creating docs/Makefile
config.status: creating docs/examples/Makefile
config.status: creating docs/libcurl/Makefile
config.status: creating docs/libcurl/opts/Makefile
config.status: creating docs/cmdline-opts/Makefile
config.status: creating include/Makefile
config.status: creating include/curl/Makefile
config.status: creating src/Makefile
config.status: creating lib/Makefile
config.status: creating scripts/Makefile
config.status: creating lib/libcurl.vers
config.status: creating lib/libcurl.plist
config.status: creating tests/Makefile
config.status: creating tests/config
config.status: creating tests/certs/Makefile
config.status: creating tests/certs/scripts/Makefile
config.status: creating tests/data/Makefile
config.status: creating tests/server/Makefile
config.status: creating tests/libtest/Makefile
config.status: creating tests/unit/Makefile
config.status: creating tests/http/config.ini
config.status: creating tests/http/Makefile
config.status: creating tests/http/clients/Makefile
config.status: creating packages/Makefile
config.status: creating packages/vms/Makefile
config.status: creating curl-config
config.status: creating libcurl.pc
config.status: creating lib/curl_config.h
config.status: executing depfiles commands
config.status: executing libtool commands
configure: Configured to build curl/libcurl:

Host setup: x86_64-pc-linux-gnu
Install prefix: /usr/local
Compiler: ccache gcc
CFLAGS: -Werror-implicit-function-declaration -O2 -Wno-system-headers
CPPFLAGS:
LDFLAGS:
LIBS: -lpsl -lz

curl version: 8.3.0-DEV
SSL: no (--with-{openssl,gnutls,mbedtls,wolfssl,schannel,secure-transport,amissl,bearssl,rustls} )
SSH: no (--with-{libssh,libssh2})
zlib: enabled
brotli: no (--with-brotli)
zstd: no (--with-zstd)
GSS-API: no (--with-gssapi)
GSASL: no (libgsasl not found)
TLS-SRP: no (--enable-tls-srp)
resolver: POSIX threaded
IPv6: enabled
Unix sockets: enabled
IDN: no (--with-{libidn2,winidn})
Build libcurl: Shared=no, Static=yes
Built-in manual: enabled
--libcurl option: enabled (--disable-libcurl-option)
Verbose errors: enabled (--disable-verbose)
Code coverage: disabled
SSPI: no (--enable-sspi)
ca cert bundle: no
ca cert path:
ca fallback:
LDAP: no (--enable-ldap / --with-ldap-lib / --with-lber-lib)
LDAPS: no (--enable-ldaps)
RTSP: enabled
RTMP: no (--with-librtmp)
PSL: enabled
Alt-svc: enabled (--disable-alt-svc)
Headers API: enabled (--disable-headers-api)
HSTS: no (--enable-hsts)
HTTP1: enabled (internal)
HTTP2: no (--with-nghttp2, --with-hyper)
HTTP3: no (--with-ngtcp2 --with-nghttp3, --with-quiche, --with-msh3)
ECH: no (--enable-ech)
WebSockets: no (--enable-websockets)
Protocols: DICT FILE FTP GOPHER HTTP IMAP MQTT POP3 RTSP SMTP TELNET TFTP
Features: AsynchDNS IPv6 Largefile PSL UnixSockets alt-svc libz threadsafe

configure: WARNING: unrecognized options: --disable-docs
configure: WARNING: Cannot find libraries for LDAP support: LDAP disabled
configure: WARNING: libgsasl was not found
configure: WARNING: Cannot find libraries for IDN support: IDN disabled
configure: WARNING: unrecognized options: --disable-docs

$ make -j3
Making all in lib
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make all-am
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
CC libcurl_la-altsvc.lo
CC libcurl_la-amigaos.lo
CC libcurl_la-asyn-ares.lo
CC libcurl_la-asyn-thread.lo
CC libcurl_la-base64.lo
CC libcurl_la-bufq.lo
CC libcurl_la-bufref.lo
CC libcurl_la-c-hyper.lo
CC libcurl_la-cf-h1-proxy.lo
CC libcurl_la-cf-haproxy.lo
CC libcurl_la-cf-h2-proxy.lo
CC libcurl_la-cf-https-connect.lo
CC libcurl_la-cf-socket.lo
CC libcurl_la-cfilters.lo
CC libcurl_la-conncache.lo
CC libcurl_la-connect.lo
CC libcurl_la-cookie.lo
CC libcurl_la-content_encoding.lo
CC libcurl_la-curl_addrinfo.lo
CC libcurl_la-curl_des.lo
CC libcurl_la-curl_endian.lo
CC libcurl_la-curl_fnmatch.lo
CC libcurl_la-curl_get_line.lo
CC libcurl_la-curl_gethostname.lo
CC libcurl_la-curl_gssapi.lo
CC libcurl_la-curl_log.lo
CC libcurl_la-curl_memrchr.lo
CC libcurl_la-curl_multibyte.lo
CC libcurl_la-curl_ntlm_core.lo
CC libcurl_la-curl_ntlm_wb.lo
CC libcurl_la-curl_path.lo
CC libcurl_la-curl_range.lo
CC libcurl_la-curl_rtmp.lo
CC libcurl_la-curl_sasl.lo
CC libcurl_la-curl_sspi.lo
CC libcurl_la-curl_threads.lo
CC libcurl_la-dict.lo
CC libcurl_la-doh.lo
CC libcurl_la-dynbuf.lo
CC libcurl_la-dynhds.lo
CC libcurl_la-easy.lo
CC libcurl_la-easygetopt.lo
CC libcurl_la-easyoptions.lo
CC libcurl_la-escape.lo
CC libcurl_la-file.lo
CC libcurl_la-fileinfo.lo
CC libcurl_la-fopen.lo
CC libcurl_la-formdata.lo
CC libcurl_la-ftp.lo
CC libcurl_la-ftplistparser.lo
CC libcurl_la-getenv.lo
CC libcurl_la-getinfo.lo
CC libcurl_la-gopher.lo
CC libcurl_la-hash.lo
CC libcurl_la-headers.lo
CC libcurl_la-hmac.lo
CC libcurl_la-hostasyn.lo
CC libcurl_la-hostip.lo
CC libcurl_la-hostip4.lo
CC libcurl_la-hostip6.lo
CC libcurl_la-hostsyn.lo
CC libcurl_la-hsts.lo
CC libcurl_la-http.lo
CC libcurl_la-http1.lo
CC libcurl_la-http2.lo
CC libcurl_la-http_chunks.lo
CC libcurl_la-http_digest.lo
CC libcurl_la-http_negotiate.lo
CC libcurl_la-http_ntlm.lo
CC libcurl_la-http_proxy.lo
CC libcurl_la-http_aws_sigv4.lo
CC libcurl_la-idn.lo
CC libcurl_la-if2ip.lo
CC libcurl_la-imap.lo
CC libcurl_la-inet_ntop.lo
CC libcurl_la-inet_pton.lo
CC libcurl_la-krb5.lo
CC libcurl_la-ldap.lo
CC libcurl_la-llist.lo
CC libcurl_la-macos.lo
CC libcurl_la-md4.lo
CC libcurl_la-md5.lo
CC libcurl_la-memdebug.lo
CC libcurl_la-mime.lo
CC libcurl_la-mprintf.lo
CC libcurl_la-mqtt.lo
CC libcurl_la-multi.lo
CC libcurl_la-netrc.lo
CC libcurl_la-nonblock.lo
CC libcurl_la-noproxy.lo
CC libcurl_la-openldap.lo
CC libcurl_la-parsedate.lo
CC libcurl_la-pingpong.lo
CC libcurl_la-pop3.lo
CC libcurl_la-progress.lo
CC libcurl_la-psl.lo
CC libcurl_la-rand.lo
CC libcurl_la-rename.lo
CC libcurl_la-rtsp.lo
CC libcurl_la-select.lo
CC libcurl_la-sendf.lo
CC libcurl_la-setopt.lo
CC libcurl_la-sha256.lo
CC libcurl_la-share.lo
CC libcurl_la-slist.lo
CC libcurl_la-smb.lo
CC libcurl_la-smtp.lo
CC libcurl_la-socketpair.lo
CC libcurl_la-socks.lo
CC libcurl_la-socks_gssapi.lo
CC libcurl_la-socks_sspi.lo
CC libcurl_la-speedcheck.lo
CC libcurl_la-splay.lo
CC libcurl_la-strcase.lo
CC libcurl_la-strdup.lo
CC libcurl_la-strerror.lo
CC libcurl_la-strtok.lo
CC libcurl_la-strtoofft.lo
CC libcurl_la-system_win32.lo
CC libcurl_la-telnet.lo
CC libcurl_la-tftp.lo
CC libcurl_la-timediff.lo
CC libcurl_la-timeval.lo
CC libcurl_la-transfer.lo
CC libcurl_la-url.lo
CC libcurl_la-urlapi.lo
CC libcurl_la-version.lo
CC libcurl_la-version_win32.lo
CC libcurl_la-warnless.lo
CC libcurl_la-ws.lo
CC vauth/libcurl_la-cleartext.lo
CC vauth/libcurl_la-cram.lo
CC vauth/libcurl_la-digest.lo
CC vauth/libcurl_la-digest_sspi.lo
CC vauth/libcurl_la-krb5_gssapi.lo
CC vauth/libcurl_la-gsasl.lo
CC vauth/libcurl_la-krb5_sspi.lo
CC vauth/libcurl_la-ntlm.lo
CC vauth/libcurl_la-ntlm_sspi.lo
CC vauth/libcurl_la-oauth2.lo
CC vauth/libcurl_la-spnego_gssapi.lo
CC vauth/libcurl_la-spnego_sspi.lo
CC vauth/libcurl_la-vauth.lo
CC vtls/libcurl_la-bearssl.lo
CC vtls/libcurl_la-gskit.lo
CC vtls/libcurl_la-gtls.lo
CC vtls/libcurl_la-hostcheck.lo
CC vtls/libcurl_la-keylog.lo
CC vtls/libcurl_la-mbedtls.lo
CC vtls/libcurl_la-mbedtls_threadlock.lo
CC vtls/libcurl_la-openssl.lo
CC vtls/libcurl_la-rustls.lo
CC vtls/libcurl_la-schannel.lo
CC vtls/libcurl_la-schannel_verify.lo
CC vtls/libcurl_la-sectransp.lo
CC vtls/libcurl_la-vtls.lo
CC vtls/libcurl_la-wolfssl.lo
CC vtls/libcurl_la-x509asn1.lo
CC vquic/libcurl_la-curl_msh3.lo
CC vquic/libcurl_la-curl_ngtcp2.lo
CC vquic/libcurl_la-curl_quiche.lo
CC vquic/libcurl_la-vquic.lo
CC vssh/libcurl_la-libssh.lo
CC vssh/libcurl_la-libssh2.lo
CC vssh/libcurl_la-wolfssh.lo
CCLD libcurl.la
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
Making all in src
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
Making all in ../docs
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in .
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
if test "..x" != "..x" -a -e "./curl.1"; then \
/usr/bin/install -c -m 644 "./curl.1" /root/asi_db/builds/curl/_worktrees/w0/docs/curl.1; fi
cd cmdline-opts && make
make[4]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
GENERATE ../../docs/curl.1
make[4]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in cmdline-opts
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[3]: Nothing to be done for 'all'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
CC slist_wc.o
CC tool_binmode.o
CC tool_bname.o
CC tool_cb_dbg.o
CC tool_cb_hdr.o
CC tool_cb_prg.o
CC tool_cb_rea.o
CC tool_cb_see.o
CC tool_cb_wrt.o
CC tool_cfgable.o
CC tool_dirhie.o
CC tool_doswin.o
CC tool_filetime.o
CC tool_findfile.o
CC tool_easysrc.o
CC tool_formparse.o
CC tool_getparam.o
CC tool_getpass.o
CC tool_help.o
CC tool_helpers.o
HUGE tool_hugehelp.c
CC tool_libinfo.o
CC tool_listhelp.o
CC tool_main.o
CC tool_msgs.o
CC tool_operate.o
CC tool_operhlp.o
CC tool_parsecfg.o
CC tool_paramhlp.o
CC tool_progress.o
CC tool_stderr.o
CC tool_setopt.o
CC tool_strdup.o
CC tool_sleep.o
CC tool_urlglob.o
CC tool_util.o
CC tool_vms.o
CC tool_writeout.o
CC tool_writeout_json.o
CC tool_xattr.o
CC var.o
CC ../lib/base64.o
CC ../lib/curl_multibyte.o
CC ../lib/dynbuf.o
CC ../lib/nonblock.o
CC ../lib/strtoofft.o
CC ../lib/timediff.o
CC ../lib/version_win32.o
CC ../lib/warnless.o
CC tool_hugehelp.o
CCLD curl
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0'
make[1]: Nothing to be done for 'all-am'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0'

Commit Diff GitHub →

docs/cmdline-opts/Makefile.inc+1 -0

@@ -275,6 +275,7 @@ DPAGES = \
	use-ascii.d \
	user-agent.d \
	user.d \
+	variable.d \
	verbose.d \
	version.d \
	write-out.d \

docs/cmdline-opts/config.d+5 -5

@@ -21,12 +21,12 @@ if so, the colon or equals characters can be used as separators. If the option
	is specified with one or two dashes, there can be no colon or equals character
	between the option and its parameter.

-	If the parameter contains whitespace (or starts with : or =), the parameter
-	must be enclosed within quotes. Within double quotes, the following escape
-	sequences are available: \\\\, \\", \\t, \\n, \\r and \\v. A backslash
-	preceding any other letter is ignored.
+	If the parameter contains whitespace or starts with a colon (:) or equals sign
+	(=), it must be specified enclosed within double quotes (\&"). Within double
+	quotes the following escape sequences are available: \\\\, \\", \\t, \\n, \\r
+	and \\v. A backslash preceding any other letter is ignored.

-	If the first column of a config line is a '#' character, the rest of the line
+	If the first non-blank column of a config line is a '#' character, that line
	will be treated as a comment.

	Only write one option per physical line in the config file. A single line is

docs/cmdline-opts/page-header+42 -0

@@ -97,6 +97,48 @@ that getting many files from the same server do not use multiple connects /
	handshakes. This improves speed. Connection re-use can only be done for URLs
	specified for a single command line invocation and cannot be performed between
	separate curl runs.
+	.SH VARIABLES
+	Starting in curl 8.3.0, curl supports command line variables. Set variables
+	with --variable name=content or --variable name@file (where "file" can be
+	stdin if set to a single dash (-)).
+
+	Variable contents can expanded in option parameters using "{{name}}" (without
+	the quotes) if the option name is prefixed with "--expand-". This gets the
+	contents of the variable "name" inserted, or a blank if the name does not
+	exist as a variable. Insert "{{" verbatim in the string by prefixing it with a
+	backslash, like "\\{{".
+
+	You an access and expand environment variables by first importing them. You
+	can select to either require the environment variable to be set or you can
+	provide a default value in case it is not already set. Plain --variable %name
+	imports the variable called 'name' but exits with an error if that environment
+	variable is not alreadty set. To provide a default value if it is not set, use
+	--variable %name=content or --variable %name@content.
+
+	Example. Get the USER environment variable into the URL, fail if USER is not
+	set:
+
+	--variable '%USER'
+	--expand-url = "https://example.com/api/{{USER}}/method"
+
+	When expanding variables, curl supports a set of functions that can make the
+	variable contents more convenient to use. It can trim leading and trailing
+	white space with "trim", it can output the contents as a JSON quoted string
+	with "json" and it can URL encode the string with "urlencode". You apply
+	function to a variable expansion, add them colon separated to the right side
+	of the variable. Variable content holding null bytes that are not encoded when
+	expanded, will cause error.
+
+	Exmaple: get the contents of a file called $HOME/.secret into a variable
+	called "fix". Make sure that the content is trimmed and percent-encoded sent
+	as POST data:
+
+	--variable %HOME
+	--expand-variable fix@{{HOME}}/.secret
+	--expand-data "{{fix:trim:urlencode}}"
+	https://example.com/
+
+	Command line variables and expansions were added in in 8.3.0.
	.SH OUTPUT
	If not told otherwise, curl writes the received data to stdout. It can be
	instructed to instead save that data into a local file, using the --output or

docs/cmdline-opts/variable.d+50 -0

@@ -0,0 +1,50 @@
+	c: Copyright (C) Daniel Stenberg, <[email protected]>, et al.
+	SPDX-License-Identifier: curl
+	Long: variable
+	Arg: <[%]name=text/@file>
+	Help: Set variable
+	Category: curl
+	Example: --variable name=smith $URL
+	Added: 8.3.0
+	See-also: config
+	Multi: append
+	---
+	Set a variable with "name=content" or "name@file" (where "file" can be stdin
+	if set to a single dash (-)). The name is a case sensitive identifier that
+	must consist of no other letters than a-z, A-Z, 0-9 or underscore. The
+	specified content is then associated with this identifier.
+
+	The name must be unique within a command line invoke, setting the same
+	variable name again will be ignored.
+
+	The contents of a variable can be referenced in a later command line option
+	when that option name is prefixed with "--expand-", and the name is used as
+	"{{name}}" (without the quotes).
+
+	--variable can import environment variables into the name space. Opt to either
+	require the environment variable to be set or provide a default value for the
+	variable in case it is not already set.
+
+	--variable %name imports the variable called 'name' but exits with an error if
+	that environment variable is not alreadty set. To provide a default value if
+	the environment variable is not set, use --variable %name=content or
+	--variable %name@content. Note that on some systems - but not all -
+	environment variables are case insensitive.
+
+	When expanding variables, curl supports a set of functions that can make the
+	variable contents more convenient to use. You apply a function to a variable
+	expansion by adding a colon and then list the desired functions in a
+	comma-separted list that is evaluated in a left-to-right order. Variable
+	content holding null bytes that are not encoded when expanded, will cause
+	error.
+
+	These are functions that can help you get the value inserted more
+	conveniently.
+
+	"trim" removes all leading and trailing white space.
+
+	"json" outputs the content using JSON string quoting rules.
+
+	"url" shows the content URL (percent) encoded.
+
+	"b64" expands the variable base64 encoded

docs/options-in-versions+1 -0

@@ -261,6 +261,7 @@
	--use-ascii (-B) 5.0
	--user (-u) 4.0
	--user-agent (-A) 4.5.1
+	--variable 8.3.0
	--verbose (-v) 4.0
	--version (-V) 4.0
	--write-out (-w) 6.5

lib/base64.c+3 -2

@@ -32,13 +32,14 @@
	!defined(CURL_DISABLE_POP3) \|\| \
	!defined(CURL_DISABLE_IMAP) \|\| \
	!defined(CURL_DISABLE_DOH) \|\| defined(USE_SSL)
-
-	#include "urldata.h" /* for the Curl_easy definition */
+	#include "curl/curl.h"
	#include "warnless.h"
	#include "curl_base64.h"

	/* The last 2 #include files should be in this order */
+	#ifdef BUILDING_LIBCURL
	#include "curl_memory.h"
+	#endif
	#include "memdebug.h"

	/* ---- Base64 Encoding/Decoding Table --- */

lib/curl_base64.h+8 -1

@@ -24,11 +24,18 @@
	*
	***************************************************************************/

+	#ifndef BUILDING_LIBCURL
+	/* this renames functions so that the tool code can use the same code
+	without getting symbol collisions */
+	#define Curl_base64_encode(a,b,c,d) curlx_base64_encode(a,b,c,d)
+	#define Curl_base64url_encode(a,b,c,d) curlx_base64url_encode(a,b,c,d)
+	#define Curl_base64_decode(a,b,c) curlx_base64_decode(a,b,c)
+	#endif
+
	CURLcode Curl_base64_encode(const char *inputbuff, size_t insize,
	char *outptr, size_t outlen);
	CURLcode Curl_base64url_encode(const char *inputbuff, size_t insize,
	char *outptr, size_t outlen);
	CURLcode Curl_base64_decode(const char *src,
	unsigned char *outptr, size_t outlen);
-
	#endif /* HEADER_CURL_BASE64_H */

projects/generate.bat+2 -0

@@ -217,6 +217,7 @@ rem
	call :element %1 lib "curl_multibyte.c" %3
	call :element %1 lib "version_win32.c" %3
	call :element %1 lib "dynbuf.c" %3
+	call :element %1 lib "base64.c" %3
	) else if "!var!" == "CURL_SRC_X_H_FILES" (
	call :element %1 lib "config-win32.h" %3
	call :element %1 lib "curl_setup.h" %3
@@ -228,6 +229,7 @@ rem
	call :element %1 lib "curl_multibyte.h" %3
	call :element %1 lib "version_win32.h" %3
	call :element %1 lib "dynbuf.h" %3
+	call :element %1 lib "curl_base64.h" %3
	) else if "!var!" == "CURL_LIB_C_FILES" (
	for /f "delims=" %%c in ('dir /b ..\lib\*.c') do call :element %1 lib "%%c" %3
	) else if "!var!" == "CURL_LIB_H_FILES" (

src/CMakeLists.txt+1 -1

@@ -63,7 +63,7 @@ endif()

	# CURL_CFILES, CURLX_CFILES, CURL_HFILES come from Makefile.inc
	if(BUILD_STATIC_CURL)
-	set(CURLX_CFILES ../lib/dynbuf.c)
+	set(CURLX_CFILES ../lib/dynbuf.c ../lib/base64.c)
	endif()

	add_executable(

src/Makefile.inc+9 -6

@@ -32,13 +32,14 @@
	# libcurl has sources that provide functions named curlx_* that aren't part of
	# the official API, but we re-use the code here to avoid duplication.
	CURLX_CFILES = \
+	../lib/base64.c \
+	../lib/curl_multibyte.c \
+	../lib/dynbuf.c \
+	../lib/nonblock.c \
	../lib/strtoofft.c \
	../lib/timediff.c \
-	../lib/nonblock.c \
-	../lib/warnless.c \
-	../lib/curl_multibyte.c \
	../lib/version_win32.c \
-	../lib/dynbuf.c
+	../lib/warnless.c

	CURLX_HFILES = \
	../lib/curl_setup.h \
@@ -91,7 +92,8 @@ CURL_CFILES = \
	tool_vms.c \
	tool_writeout.c \
	tool_writeout_json.c \
-	tool_xattr.c
+	tool_xattr.c \
+	var.c

	CURL_HFILES = \
	slist_wc.h \
@@ -135,7 +137,8 @@ CURL_HFILES = \
	tool_vms.h \
	tool_writeout.h \
	tool_writeout_json.h \
-	tool_xattr.h
+	tool_xattr.h \
+	var.h

	CURL_RCFILES = curl.rc

src/tool_cfgable.h+2 -0

@@ -26,6 +26,7 @@
	#include "tool_setup.h"
	#include "tool_sdecls.h"
	#include "tool_urlglob.h"
+	#include "var.h"

	struct GlobalConfig;

@@ -322,6 +323,7 @@ struct GlobalConfig {
	unsigned short parallel_max; /* MAX_PARALLEL is the maximum */
	bool parallel_connect;
	char help_category; / The help category, if set */
+	struct var *variables;
	struct OperationConfig *first;
	struct OperationConfig *current;
	struct OperationConfig last; / Always last in the struct */

src/tool_getparam.c+303 -194

@@ -43,6 +43,7 @@
	#include "tool_main.h"
	#include "dynbuf.h"
	#include "tool_stderr.h"
+	#include "var.h"

	#include "memdebug.h" /* keep this as LAST include */

@@ -50,17 +51,19 @@
	# define USE_WATT32
	#endif

-	#define GetStr(str,val) do { \
-	if(*(str)) { \
-	free(*(str)); \
-	*(str) = NULL; \
-	} \
-	if((val)) { \
-	*(str) = strdup((val)); \
-	if(!(*(str))) \
-	return PARAM_NO_MEM; \
-	} \
-	} while(0)
+	#define GetStr(str,val) do { \
+	if(*(str)) { \
+	free(*(str)); \
+	*(str) = NULL; \
+	} \
+	if((val)) { \
+	*(str) = strdup((val)); \
+	if(!(*(str))) { \
+	err = PARAM_NO_MEM; \
+	goto error; \
+	} \
+	} \
+	} while(0)

	struct LongShort {
	const char letter; / short name option */
@@ -354,6 +357,7 @@ static const struct LongShort aliases[]= {
	{"#", "progress-bar", ARG_BOOL},
	{"#m", "progress-meter", ARG_BOOL},
	{":", "next", ARG_NONE},
+	{":a", "variable", ARG_STRING},
	};

	/* Split the argument of -E to 'certname' and 'passphrase' separated by colon.
@@ -662,6 +666,8 @@ static ParameterError data_urlencode(struct GlobalConfig *global,
	*postp = postdata;
	*lenp = size;
	return PARAM_OK;
+	error:
+	return err;
	}

	static void sethttpver(struct GlobalConfig *global,
@@ -692,9 +698,10 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	int hit = -1;
	bool longopt = FALSE;
	bool singleopt = FALSE; /* when true means '-o foo' used '-ofoo' */
-	ParameterError err;
+	ParameterError err = PARAM_OK;
	bool toggle = TRUE; /* how to switch boolean options, on or off. Controlled
	by using --OPTION or --no-OPTION */
+	bool nextalloc = FALSE; /* if nextarg is allocated */
	static const char *redir_protos[] = {
	"http",
	"https",
@@ -716,6 +723,7 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	size_t fnam = strlen(word);
	int numhits = 0;
	bool noflagged = FALSE;
+	bool expand = FALSE;

	if(!strncmp(word, "no-", 3)) {
	/* disable this option but ignore the "no-" part when looking for it */
@@ -723,6 +731,11 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	toggle = FALSE;
	noflagged = TRUE;
	}
+	else if(!strncmp(word, "expand-", 7)) {
+	/* variable expansions is to be done on the argument */
+	word += 7;
+	expand = TRUE;
+	}

	for(j = 0; j < sizeof(aliases)/sizeof(aliases[0]); j++) {
	if(curl_strnequal(aliases[j].lname, word, fnam)) {
@@ -740,14 +753,37 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	}
	if(numhits > 1) {
	/* this is at least the second match! */
-	return PARAM_OPTION_AMBIGUOUS;
+	err = PARAM_OPTION_AMBIGUOUS;
+	goto error;
	}
-	if(hit < 0) {
-	return PARAM_OPTION_UNKNOWN;
+	else if(hit < 0) {
+	err = PARAM_OPTION_UNKNOWN;
+	goto error;
	}
-	if(noflagged && (aliases[hit].desc != ARG_BOOL))
+	else if(noflagged && (aliases[hit].desc != ARG_BOOL)) {
	/* --no- prefixed an option that isn't boolean! */
-	return PARAM_NO_NOT_BOOLEAN;
+	err = PARAM_NO_NOT_BOOLEAN;
+	goto error;
+	}
+	else if(expand) {
+	struct curlx_dynbuf nbuf;
+	bool replaced;
+
+	if(aliases[hit].desc != ARG_STRING) {
+	/* --expand on an option that isn't a string */
+	err = PARAM_EXPAND_ERROR;
+	goto error;
+	}
+	err = varexpand(global, nextarg, &nbuf, &replaced);
+	if(err) {
+	curlx_dyn_free(&nbuf);
+	goto error;
+	}
+	if(replaced) {
+	nextarg = curlx_dyn_ptr(&nbuf);
+	nextalloc = TRUE;
+	}
+	}
	}
	else {
	flag++; /* prefixed with one dash, pass it */
@@ -775,7 +811,8 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	}
	}
	if(hit < 0) {
-	return PARAM_OPTION_UNKNOWN;
+	err = PARAM_OPTION_UNKNOWN;
+	break;
	}
	}

@@ -785,8 +822,10 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	nextarg = (char )&parse[1]; / this is the actual extra parameter */
	singleopt = TRUE; /* don't loop anymore after this */
	}
-	else if(!nextarg)
-	return PARAM_REQUIRES_PARAMETER;
+	else if(!nextarg) {
+	err = PARAM_REQUIRES_PARAMETER;
+	break;
+	}
	else {
	#ifdef HAVE_WRITABLE_ARGV
	clearthis = cleararg;
@@ -801,21 +840,27 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	nextarg);
	}
	}
-	else if((aliases[hit].desc == ARG_NONE) && !toggle)
-	return PARAM_NO_PREFIX;
+	else if((aliases[hit].desc == ARG_NONE) && !toggle) {
+	err = PARAM_NO_PREFIX;
+	break;
+	}

	switch(letter) {
	case '': / options without a short option */
	switch(subletter) {
	case '4': /* --dns-ipv4-addr */
-	if(!curlinfo->ares_num) /* c-ares is needed for this */
-	return PARAM_LIBCURL_DOESNT_SUPPORT;
+	if(!curlinfo->ares_num) { /* c-ares is needed for this */
+	err = PARAM_LIBCURL_DOESNT_SUPPORT;
+	break;
+	}
	/* addr in dot notation */
	GetStr(&config->dns_ipv4_addr, nextarg);
	break;
	case '6': /* --dns-ipv6-addr */
-	if(!curlinfo->ares_num) /* c-ares is needed for this */
-	return PARAM_LIBCURL_DOESNT_SUPPORT;
+	if(!curlinfo->ares_num) { /* c-ares is needed for this */
+	err = PARAM_LIBCURL_DOESNT_SUPPORT;
+	break;
+	}
	/* addr in dot notation */
	GetStr(&config->dns_ipv6_addr, nextarg);
	break;
@@ -830,8 +875,6 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	break;
	case 'c': /* connect-timeout */
	err = secs2ms(&config->connecttimeout_ms, nextarg);
-	if(err)
-	return err;
	break;
	case 'C': /* doh-url */
	GetStr(&config->doh_url, nextarg);
@@ -844,9 +887,10 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	break;
	case 'D': /* --dns-interface */
	if(!curlinfo->ares_num) /* c-ares is needed for this */
-	return PARAM_LIBCURL_DOESNT_SUPPORT;
-	/* interface name */
-	GetStr(&config->dns_interface, nextarg);
+	err = PARAM_LIBCURL_DOESNT_SUPPORT;
+	else
+	/* interface name */
+	GetStr(&config->dns_interface, nextarg);
	break;
	case 'e': /* --disable-epsv */
	config->disable_epsv = toggle;
@@ -859,9 +903,10 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	break;
	case 'F': /* --dns-servers */
	if(!curlinfo->ares_num) /* c-ares is needed for this */
-	return PARAM_LIBCURL_DOESNT_SUPPORT;
-	/* IP addrs of DNS servers */
-	GetStr(&config->dns_servers, nextarg);
+	err = PARAM_LIBCURL_DOESNT_SUPPORT;
+	else
+	/* IP addrs of DNS servers */
+	GetStr(&config->dns_servers, nextarg);
	break;
	case 'g': /* --trace */
	GetStr(&global->trace_dump, nextarg);
@@ -885,10 +930,9 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	case 'i': /* --limit-rate */
	{
	curl_off_t value;
-	ParameterError pe = GetSizeParameter(global, nextarg, "rate", &value);
-
-	if(pe != PARAM_OK)
-	return pe;
+	err = GetSizeParameter(global, nextarg, "rate", &value);
+	if(err)
+	break;
	config->recvpersecond = value;
	config->sendpersecond = value;
	}
@@ -907,15 +951,20 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	long denominator;
	long numerator = 60601000; /* default per hour */
	size_t numlen = div ? (size_t)(div - nextarg) : strlen(nextarg);
-	if(numlen > sizeof(number)-1)
-	return PARAM_NUMBER_TOO_LARGE;
+	if(numlen > sizeof(number)-1) {
+	err = PARAM_NUMBER_TOO_LARGE;
+	break;
+	}
	strncpy(number, nextarg, numlen);
	number[numlen] = 0;
	err = str2unum(&denominator, number);
	if(err)
-	return err;
-	if(denominator < 1)
-	return PARAM_BAD_USE;
+	break;
+
+	if(denominator < 1) {
+	err = PARAM_BAD_USE;
+	break;
+	}
	if(div) {
	char unit = div[1];
	switch(unit) {
@@ -932,7 +981,8 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	break;
	default:
	errorf(global, "unsupported --rate unit");
-	return PARAM_BAD_USE;
+	err = PARAM_BAD_USE;
+	break;
	}
	}
	global->ms_per_transfer = numerator/denominator;
@@ -940,8 +990,10 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	break;

	case 'j': /* --compressed */
-	if(toggle && !(feature_libz \|\| feature_brotli \|\| feature_zstd))
-	return PARAM_LIBCURL_DOESNT_SUPPORT;
+	if(toggle && !(feature_libz \|\| feature_brotli \|\| feature_zstd)) {
+	err = PARAM_LIBCURL_DOESNT_SUPPORT;
+	break;
+	}
	config->encoding = toggle;
	break;

@@ -961,8 +1013,10 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	config->authtype &= ~CURLAUTH_NEGOTIATE;
	else if(feature_spnego)
	config->authtype \|= CURLAUTH_NEGOTIATE;
-	else
-	return PARAM_LIBCURL_DOESNT_SUPPORT;
+	else {
+	err = PARAM_LIBCURL_DOESNT_SUPPORT;
+	break;
+	}
	break;

	case 'm': /* --ntlm */
@@ -970,8 +1024,10 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	config->authtype &= ~CURLAUTH_NTLM;
	else if(feature_ntlm)
	config->authtype \|= CURLAUTH_NTLM;
-	else
-	return PARAM_LIBCURL_DOESNT_SUPPORT;
+	else {
+	err = PARAM_LIBCURL_DOESNT_SUPPORT;
+	break;
+	}
	break;

	case 'M': /* --ntlm-wb */
@@ -979,8 +1035,10 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	config->authtype &= ~CURLAUTH_NTLM_WB;
	else if(feature_ntlm_wb)
	config->authtype \|= CURLAUTH_NTLM_WB;
-	else
-	return PARAM_LIBCURL_DOESNT_SUPPORT;
+	else {
+	err = PARAM_LIBCURL_DOESNT_SUPPORT;
+	break;
+	}
	break;

	case 'n': /* --basic for completeness */
@@ -1011,8 +1069,6 @@ ParameterError getparameter(const char flag, / f or -long-flag */

	case 'R': /* --create-file-mode */
	err = oct2nummax(&config->create_file_mode, nextarg, 0777);
-	if(err)
-	return err;
	break;

	case 's': /* --max-redirs */
@@ -1020,14 +1076,16 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	special condition */
	err = str2num(&config->maxredirs, nextarg);
	if(err)
-	return err;
+	break;
	if(config->maxredirs < -1)
-	return PARAM_BAD_NUMERIC;
+	err = PARAM_BAD_NUMERIC;
	break;

	case 't': /* --proxy-ntlm */
-	if(!feature_ntlm)
-	return PARAM_LIBCURL_DOESNT_SUPPORT;
+	if(!feature_ntlm) {
+	err = PARAM_LIBCURL_DOESNT_SUPPORT;
+	break;
+	}
	config->proxyntlm = toggle;
	break;

@@ -1050,8 +1108,10 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	break;
	case 'x': /* --krb */
	/* kerberos level string */
-	if(!feature_spnego)
-	return PARAM_LIBCURL_DOESNT_SUPPORT;
+	if(!feature_spnego) {
+	err = PARAM_LIBCURL_DOESNT_SUPPORT;
+	break;
+	}
	GetStr(&config->krblevel, nextarg);
	break;
	case 'X': /* --haproxy-protocol */
@@ -1063,11 +1123,10 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	case 'y': /* --max-filesize */
	{
	curl_off_t value;
-	ParameterError pe =
+	err =
	GetSizeParameter(global, nextarg, "max-filesize", &value);
-
-	if(pe != PARAM_OK)
-	return pe;
+	if(err)
+	break;
	config->max_filesize = value;
	}
	break;
@@ -1103,8 +1162,10 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	/* there was no free node, create one! */
	config->url_get = url = new_getout(config);

-	if(!url)
-	return PARAM_NO_MEM;
+	if(!url) {
+	err = PARAM_NO_MEM;
+	break;
+	}

	/* fill in the URL */
	GetStr(&url->url, nextarg);
@@ -1115,8 +1176,10 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	case '$': /* more options without a short option */
	switch(subletter) {
	case 'a': /* --ssl */
-	if(toggle && !feature_ssl)
-	return PARAM_LIBCURL_DOESNT_SUPPORT;
+	if(toggle && !feature_ssl) {
+	err = PARAM_LIBCURL_DOESNT_SUPPORT;
+	break;
+	}
	config->ftp_ssl = toggle;
	if(config->ftp_ssl)
	warnf(global,
@@ -1154,29 +1217,25 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	break;
	case 'g': /* --retry */
	err = str2unum(&config->req_retry, nextarg);
-	if(err)
-	return err;
	break;
	case 'V': /* --retry-connrefused */
	config->retry_connrefused = toggle;
	break;
	case 'h': /* --retry-delay */
	err = str2unummax(&config->retry_delay, nextarg, LONG_MAX/1000);
-	if(err)
-	return err;
	break;
	case 'i': /* --retry-max-time */
	err = str2unummax(&config->retry_maxtime, nextarg, LONG_MAX/1000);
-	if(err)
-	return err;
	break;
	case '!': /* --retry-all-errors */
	config->retry_all_errors = toggle;
	break;

	case 'k': /* --proxy-negotiate */
-	if(!feature_spnego)
-	return PARAM_LIBCURL_DOESNT_SUPPORT;
+	if(!feature_spnego) {
+	err = PARAM_LIBCURL_DOESNT_SUPPORT;
+	break;
+	}
	config->proxynegotiate = toggle;
	break;

@@ -1220,17 +1279,21 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	rc = 0;

	err = str2unum(&config->localport, nextarg);
-	if(err \|\| (config->localport > 65535))
-	return PARAM_BAD_USE;
+	if(err \|\| (config->localport > 65535)) {
+	err = PARAM_BAD_USE;
+	break;
+	}
	if(!rc)
	config->localportrange = 1; /* default number of ports to try */
	else {
	err = str2unum(&config->localportrange, lrange);
	if(err \|\| (config->localportrange > 65535))
-	return PARAM_BAD_USE;
-	config->localportrange -= (config->localport-1);
-	if(config->localportrange < 1)
-	return PARAM_BAD_USE;
+	err = PARAM_BAD_USE;
+	else {
+	config->localportrange -= (config->localport-1);
+	if(config->localportrange < 1)
+	err = PARAM_BAD_USE;
+	}
	}
	break;
	}
@@ -1238,16 +1301,20 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	GetStr(&config->ftp_alternative_to_user, nextarg);
	break;
	case 'v': /* --ssl-reqd */
-	if(toggle && !feature_ssl)
-	return PARAM_LIBCURL_DOESNT_SUPPORT;
+	if(toggle && !feature_ssl) {
+	err = PARAM_LIBCURL_DOESNT_SUPPORT;
+	break;
+	}
	config->ftp_ssl_reqd = toggle;
	break;
	case 'w': /* --no-sessionid */
	config->disable_sessionid = (!toggle)?TRUE:FALSE;
	break;
	case 'x': /* --ftp-ssl-control */
-	if(toggle && !feature_ssl)
-	return PARAM_LIBCURL_DOESNT_SUPPORT;
+	if(toggle && !feature_ssl) {
+	err = PARAM_LIBCURL_DOESNT_SUPPORT;
+	break;
+	}
	config->ftp_ssl_control = toggle;
	break;
	case 'y': /* --ftp-ssl-ccc */
@@ -1263,7 +1330,8 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	#ifdef CURL_DISABLE_LIBCURL_OPTION
	warnf(global,
	"--libcurl option was disabled at build-time");
-	return PARAM_OPTION_UNKNOWN;
+	err = PARAM_OPTION_UNKNOWN;
+	break;
	#else
	GetStr(&global->libcurl, nextarg);
	break;
@@ -1279,8 +1347,6 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	break;
	case '3': /* --keepalive-time */
	err = str2unum(&config->alivetime, nextarg);
-	if(err)
-	return err;
	break;
	case '4': /* --post302 */
	config->post302 = toggle;
@@ -1302,8 +1368,6 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	break;
	case '9': /* --tftp-blksize */
	err = str2unum(&config->tftp_blksize, nextarg);
-	if(err)
-	return err;
	break;
	case 'A': /* --mail-from */
	GetStr(&config->mail_from, nextarg);
@@ -1311,8 +1375,6 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	case 'B': /* --mail-rcpt */
	/* append receiver to a list */
	err = add2list(&config->mail_rcpt, nextarg);
-	if(err)
-	return err;
	break;
	case 'C': /* --ftp-pret */
	config->ftp_pret = toggle;
@@ -1320,18 +1382,17 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	case 'D': /* --proto */
	config->proto_present = TRUE;
	err = proto2num(config, built_in_protos, &config->proto_str, nextarg);
-	if(err)
-	return err;
	break;
	case 'E': /* --proto-redir */
	config->proto_redir_present = TRUE;
-	if(proto2num(config, redir_protos, &config->proto_redir_str, nextarg))
-	return PARAM_BAD_USE;
+	if(proto2num(config, redir_protos, &config->proto_redir_str,
+	nextarg)) {
+	err = PARAM_BAD_USE;
+	break;
+	}
	break;
	case 'F': /* --resolve */
	err = add2list(&config->resolve, nextarg);
-	if(err)
-	return err;
	break;
	case 'G': /* --delegation LEVEL */
	config->gssapi_delegation = delegation(config, nextarg);
@@ -1341,7 +1402,8 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	break;
	case 'J': /* --metalink */
	errorf(global, "--metalink is disabled");
-	return PARAM_BAD_USE;
+	err = PARAM_BAD_USE;
+	break;
	case '6': /* --sasl-authzid */
	GetStr(&config->sasl_authzid, nextarg);
	break;
@@ -1371,21 +1433,15 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	case 'Q': /* --proto-default */
	GetStr(&config->proto_default, nextarg);
	err = check_protocol(config->proto_default);
-	if(err)
-	return err;
	break;
	case 'R': /* --expect100-timeout */
	err = secs2ms(&config->expect100timeout_ms, nextarg);
-	if(err)
-	return err;
	break;
	case 'S': /* --tftp-no-options */
	config->tftp_no_options = toggle;
	break;
	case 'U': /* --connect-to */
	err = add2list(&config->connect_to, nextarg);
-	if(err)
-	return err;
	break;
	case 'W': /* --abstract-unix-socket */
	config->abstract_unix_socket = TRUE;
@@ -1393,8 +1449,6 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	break;
	case 'X': /* --tls-max */
	err = str2tls_max(&config->ssl_version_max, nextarg);
-	if(err)
-	return err;
	break;
	case 'Y': /* --suppress-connect-headers */
	config->suppress_connect_headers = toggle;
@@ -1404,8 +1458,6 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	break;
	case '~': /* --happy-eyeballs-timeout-ms */
	err = str2unum(&config->happy_eyeballs_timeout_ms, nextarg);
-	if(err)
-	return err;
	/* 0 is a valid value for this timeout */
	break;
	case '%': /* --trace-ids */
@@ -1424,8 +1476,16 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	break;
	}
	break;
-	case ':': /* --next */
-	return PARAM_NEXT_OPERATION;
+	case ':':
+	switch(subletter) {
+	case 'a': /* --variable */
+	err = setvariable(global, nextarg);
+	break;
+	default: /* --next */
+	err = PARAM_NEXT_OPERATION;
+	break;
+	}
+	break;
	case '0': /* --http* options */
	switch(subletter) {
	case '\0':
@@ -1450,14 +1510,18 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	break;
	case '4': /* --http3 */
	/* Try HTTP/3, allow fallback */
-	if(!feature_http3)
-	return PARAM_LIBCURL_DOESNT_SUPPORT;
+	if(!feature_http3) {
+	err = PARAM_LIBCURL_DOESNT_SUPPORT;
+	break;
+	}
	sethttpver(global, config, CURL_HTTP_VERSION_3);
	break;
	case '5': /* --http3-only */
	/* Try HTTP/3 without fallback */
-	if(!feature_http3)
-	return PARAM_LIBCURL_DOESNT_SUPPORT;
+	if(!feature_http3) {
+	err = PARAM_LIBCURL_DOESNT_SUPPORT;
+	break;
+	}
	sethttpver(global, config, CURL_HTTP_VERSION_3ONLY);
	break;
	case '9':
@@ -1530,13 +1594,15 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	switch(subletter) {
	case 'a': /* --alt-svc */
	if(!feature_altsvc)
-	return PARAM_LIBCURL_DOESNT_SUPPORT;
-	GetStr(&config->altsvc, nextarg);
+	err = PARAM_LIBCURL_DOESNT_SUPPORT;
+	else
+	GetStr(&config->altsvc, nextarg);
	break;
	case 'b': /* --hsts */
	if(!feature_hsts)
-	return PARAM_LIBCURL_DOESNT_SUPPORT;
-	GetStr(&config->hsts, nextarg);
+	err = PARAM_LIBCURL_DOESNT_SUPPORT;
+	else
+	GetStr(&config->hsts, nextarg);
	break;
	default: /* --cookie string coming up: */
	if(nextarg[0] == '@') {
@@ -1545,14 +1611,10 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	else if(strchr(nextarg, '=')) {
	/* A cookie string must have a =-letter */
	err = add2list(&config->cookies, nextarg);
-	if(err)
-	return err;
	break;
	}
	/* We have a cookie file to read from! */
	err = add2list(&config->cookiefiles, nextarg);
-	if(err)
-	return err;
	}
	break;
	case 'B':
@@ -1568,7 +1630,7 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	if(strcmp(nextarg, "-")) {
	err = str2offset(&config->resume_from, nextarg);
	if(err)
-	return err;
+	break;
	config->resume_from_current = FALSE;
	}
	else {
@@ -1594,21 +1656,25 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	if(*nextarg == '+') {
	/* use without encoding */
	query = strdup(&nextarg[1]);
-	if(!query)
-	return PARAM_NO_MEM;
+	if(!query) {
+	err = PARAM_NO_MEM;
+	break;
+	}
	}
	else {
	err = data_urlencode(global, nextarg, &query, &size);
	if(err)
-	return err;
+	break;
	}

	if(config->query) {
	CURLcode result =
	curlx_dyn_addf(&dyn, "%s&%s", config->query, query);
	free(query);
-	if(result)
-	return PARAM_NO_MEM;
+	if(result) {
+	err = PARAM_NO_MEM;
+	break;
+	}
	free(config->query);
	config->query = curlx_dyn_ptr(&dyn);
	}
@@ -1620,7 +1686,7 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	else if(subletter == 'e') { /* --data-urlencode */
	err = data_urlencode(global, nextarg, &postdata, &size);
	if(err)
-	return err;
+	break;
	}
	else if('@' == *nextarg && !raw_mode) {
	/* the data begins with a '@' letter, it means that a file name
@@ -1652,14 +1718,16 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	if(file && (file != stdin))
	fclose(file);
	if(err)
-	return err;
+	break;

	if(!postdata) {
	/* no data from the file, point to a zero byte string to make this
	get sent as a POST anyway */
	postdata = strdup("");
-	if(!postdata)
-	return PARAM_NO_MEM;
+	if(!postdata) {
+	err = PARAM_NO_MEM;
+	break;
+	}
	}
	}
	else {
@@ -1680,7 +1748,8 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	if(!config->postfields) {
	Curl_safefree(oldpost);
	Curl_safefree(postdata);
-	return PARAM_NO_MEM;
+	err = PARAM_NO_MEM;
+	break;
	}
	memcpy(config->postfields, oldpost, (size_t)oldlen);
	if(subletter != 'f') {
@@ -1763,8 +1832,10 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	break;
	case 'f': /* crypto engine */
	GetStr(&config->engine, nextarg);
-	if(config->engine && curl_strequal(config->engine, "list"))
-	return PARAM_ENGINES_REQUESTED;
+	if(config->engine && curl_strequal(config->engine, "list")) {
+	err = PARAM_ENGINES_REQUESTED;
+	break;
+	}
	break;
	case 'g': /* CA cert directory */
	GetStr(&config->capath, nextarg);
@@ -1774,8 +1845,10 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	break;
	case 'i': /* --hostpubmd5 md5 of the host public key */
	GetStr(&config->hostpubmd5, nextarg);
-	if(!config->hostpubmd5 \|\| strlen(config->hostpubmd5) != 32)
-	return PARAM_BAD_USE;
+	if(!config->hostpubmd5 \|\| strlen(config->hostpubmd5) != 32) {
+	err = PARAM_BAD_USE;
+	break;
+	}
	break;
	case 'F': /* --hostpubsha256 sha256 of the host public key */
	GetStr(&config->hostpubsha256, nextarg);
@@ -1786,7 +1859,8 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	case 'k': /* TLS username */
	if(!feature_tls_srp) {
	cleanarg(clearthis);
-	return PARAM_LIBCURL_DOESNT_SUPPORT;
+	err = PARAM_LIBCURL_DOESNT_SUPPORT;
+	break;
	}
	GetStr(&config->tls_username, nextarg);
	cleanarg(clearthis);
@@ -1794,17 +1868,22 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	case 'l': /* TLS password */
	if(!feature_tls_srp) {
	cleanarg(clearthis);
-	return PARAM_LIBCURL_DOESNT_SUPPORT;
+	err = PARAM_LIBCURL_DOESNT_SUPPORT;
+	break;
	}
	GetStr(&config->tls_password, nextarg);
	cleanarg(clearthis);
	break;
	case 'm': /* TLS authentication type */
-	if(!feature_tls_srp)
-	return PARAM_LIBCURL_DOESNT_SUPPORT;
+	if(!feature_tls_srp) {
+	err = PARAM_LIBCURL_DOESNT_SUPPORT;
+	break;
+	}
	GetStr(&config->tls_authtype, nextarg);
-	if(!curl_strequal(config->tls_authtype, "SRP"))
-	return PARAM_LIBCURL_DOESNT_SUPPORT; /* only support TLS-SRP */
+	if(!curl_strequal(config->tls_authtype, "SRP")) {
+	err = PARAM_LIBCURL_DOESNT_SUPPORT; /* only support TLS-SRP */
+	break;
+	}
	break;
	case 'n': /* no empty SSL fragments, --ssl-allow-beast */
	if(feature_ssl)
@@ -1857,24 +1936,32 @@ ParameterError getparameter(const char flag, / f or -long-flag */

	case 'u': /* TLS username for proxy */
	cleanarg(clearthis);
-	if(!feature_tls_srp)
-	return PARAM_LIBCURL_DOESNT_SUPPORT;
+	if(!feature_tls_srp) {
+	err = PARAM_LIBCURL_DOESNT_SUPPORT;
+	break;
+	}
	GetStr(&config->proxy_tls_username, nextarg);
	break;

	case 'v': /* TLS password for proxy */
	cleanarg(clearthis);
-	if(!feature_tls_srp)
-	return PARAM_LIBCURL_DOESNT_SUPPORT;
+	if(!feature_tls_srp) {
+	err = PARAM_LIBCURL_DOESNT_SUPPORT;
+	break;
+	}
	GetStr(&config->proxy_tls_password, nextarg);
	break;

	case 'w': /* TLS authentication type for proxy */
-	if(!feature_tls_srp)
-	return PARAM_LIBCURL_DOESNT_SUPPORT;
+	if(!feature_tls_srp) {
+	err = PARAM_LIBCURL_DOESNT_SUPPORT;
+	break;
+	}
	GetStr(&config->proxy_tls_authtype, nextarg);
-	if(!curl_strequal(config->proxy_tls_authtype, "SRP"))
-	return PARAM_LIBCURL_DOESNT_SUPPORT; /* only support TLS-SRP */
+	if(!curl_strequal(config->proxy_tls_authtype, "SRP")) {
+	err = PARAM_LIBCURL_DOESNT_SUPPORT; /* only support TLS-SRP */
+	break;
+	}
	break;

	case 'x': /* certificate file for proxy */
@@ -1963,7 +2050,8 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	break;

	default: /* unknown flag */
-	return PARAM_OPTION_UNKNOWN;
+	err = PARAM_OPTION_UNKNOWN;
+	break;
	}
	break;
	case 'f':
@@ -1990,7 +2078,8 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	if(config->failonerror && config->failwithbody) {
	errorf(config->global, "You must select either --fail or "
	"--fail-with-body, not both.");
-	return PARAM_BAD_USE;
+	err = PARAM_BAD_USE;
+	break;
	}
	break;
	case 'F':
@@ -2000,10 +2089,15 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	nextarg,
	&config->mimeroot,
	&config->mimecurrent,
-	(subletter == 's')?TRUE:FALSE)) /* 's' is literal string */
-	return PARAM_BAD_USE;
-	if(SetHTTPrequest(config, HTTPREQ_MIMEPOST, &config->httpreq))
-	return PARAM_BAD_USE;
+	(subletter == 's')?TRUE:FALSE)) { /* 's' is literal
+	string */
+	err = PARAM_BAD_USE;
+	break;
+	}
+	if(SetHTTPrequest(config, HTTPREQ_MIMEPOST, &config->httpreq)) {
+	err = PARAM_BAD_USE;
+	break;
+	}
	break;

	case 'g': /* g disables URLglobbing */
@@ -2022,10 +2116,13 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	if(toggle) {
	if(nextarg) {
	global->help_category = strdup(nextarg);
-	if(!global->help_category)
-	return PARAM_NO_MEM;
+	if(!global->help_category) {
+	err = PARAM_NO_MEM;
+	break;
+	}
	}
-	return PARAM_HELP_REQUESTED;
+	err = PARAM_HELP_REQUESTED;
+	break;
	}
	/* we now actually support --no-help too! */
	break;
@@ -2059,7 +2156,7 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	if(!use_stdin)
	fclose(file);
	if(err)
-	return err;
+	break;
	}
	}
	else {
@@ -2067,8 +2164,6 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	err = add2list(&config->proxyheaders, nextarg);
	else
	err = add2list(&config->headers, nextarg);
-	if(err)
-	return err;
	}
	break;
	case 'i':
@@ -2083,8 +2178,10 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	config->show_headers = toggle;
	if(SetHTTPrequest(config,
	(config->no_body)?HTTPREQ_HEAD:HTTPREQ_GET,
-	&config->httpreq))
-	return PARAM_BAD_USE;
+	&config->httpreq)) {
+	err = PARAM_BAD_USE;
+	break;
+	}
	break;
	case 'J': /* --remote-header-name */
	config->content_disposition = toggle;
@@ -2098,7 +2195,8 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	case 'K': /* parse config file */
	if(parseconfig(nextarg, global)) {
	errorf(global, "cannot read config from '%s'", nextarg);
-	return PARAM_READ_ERROR;
+	err = PARAM_READ_ERROR;
+	break;
	}
	break;
	case 'l':
@@ -2117,8 +2215,6 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	case 'm':
	/* specified max time */
	err = secs2ms(&config->timeout_ms, nextarg);
-	if(err)
-	return err;
	break;
	case 'M': /* M for manual, huge help */
	if(toggle) { /* --no-manual shows no manual... */
@@ -2126,7 +2222,8 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	warnf(global,
	"built-in manual was disabled at build-time");
	#endif
-	return PARAM_MANUAL_REQUESTED;
+	err = PARAM_MANUAL_REQUESTED;
+	break;
	}
	break;
	case 'n':
@@ -2188,14 +2285,17 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	config->url_out = url = new_getout(config);
	}

-	if(!url)
-	return PARAM_NO_MEM;
+	if(!url) {
+	err = PARAM_NO_MEM;
+	break;
+	}

	/* fill in the outfile */
	if('o' == letter) {
	if(!*nextarg) {
	warnf(global, "output file name has no length");
-	return PARAM_BAD_USE;
+	err = PARAM_BAD_USE;
+	break;
	}
	GetStr(&url->outfile, nextarg);
	url->flags &= ~GETOUT_USEREMOTE; /* switch off */
@@ -2243,8 +2343,6 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	err = add2list(&config->quote, nextarg);
	break;
	}
-	if(err)
-	return err;
	break;
	case 'r':
	/* Specifying a range WITHOUT A DASH will create an illegal HTTP range
@@ -2256,7 +2354,8 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	curl_off_t off;
	if(curlx_strtoofft(nextarg, NULL, 10, &off)) {
	warnf(global, "unsupported range point");
-	return PARAM_BAD_USE;
+	err = PARAM_BAD_USE;
+	break;
	}
	warnf(global,
	"A specified range MUST include at least one dash (-). "
@@ -2264,8 +2363,10 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	msnprintf(buffer, sizeof(buffer), "%" CURL_FORMAT_CURL_OFF_T "-", off);
	Curl_safefree(config->range);
	config->range = strdup(buffer);
-	if(!config->range)
-	return PARAM_NO_MEM;
+	if(!config->range) {
+	err = PARAM_NO_MEM;
+	break;
+	}
	}
	else {
	/* byte range requested */
@@ -2296,8 +2397,6 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	case 't':
	/* Telnet options */
	err = add2list(&config->telnet_options, nextarg);
-	if(err)
-	return err;
	break;
	case 'T':
	/* we are uploading */
@@ -2321,8 +2420,10 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	/* there was no free node, create one! */
	config->url_ul = url = new_getout(config);

-	if(!url)
-	return PARAM_NO_MEM;
+	if(!url) {
+	err = PARAM_NO_MEM;
+	break;
+	}

	url->flags \|= GETOUT_UPLOAD; /* mark -T used */
	if(!*nextarg)
@@ -2348,8 +2449,10 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	/* the '%' thing here will cause the trace get sent to stderr */
	Curl_safefree(global->trace_dump);
	global->trace_dump = strdup("%");
-	if(!global->trace_dump)
-	return PARAM_NO_MEM;
+	if(!global->trace_dump) {
+	err = PARAM_NO_MEM;
+	break;
+	}
	if(global->tracetype && (global->tracetype != TRACE_PLAIN))
	warnf(global,
	"-v, --verbose overrides an earlier trace/verbose option");
@@ -2360,8 +2463,10 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	global->tracetype = TRACE_NONE;
	break;
	case 'V':
-	if(toggle) /* --no-version yields no output! */
-	return PARAM_VERSION_INFO_REQUESTED;
+	if(toggle) { /* --no-version yields no output! */
+	err = PARAM_VERSION_INFO_REQUESTED;
+	break;
+	}
	break;

	case 'w':
@@ -2385,7 +2490,7 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	if(file && (file != stdin))
	fclose(file);
	if(err)
-	return err;
+	break;
	if(!config->writeout)
	warnf(global, "Failed to read %s", fname);
	}
@@ -2413,7 +2518,7 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	/* low speed time */
	err = str2unum(&config->low_speed_time, nextarg);
	if(err)
-	return err;
+	break;
	if(!config->low_speed_limit)
	config->low_speed_limit = 1;
	break;
@@ -2421,7 +2526,7 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	/* low speed limit */
	err = str2unum(&config->low_speed_limit, nextarg);
	if(err)
-	return err;
+	break;
	if(!config->low_speed_time)
	config->low_speed_time = 30;
	break;
@@ -2434,7 +2539,7 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	long val;
	err = str2unum(&val, nextarg);
	if(err)
-	return err;
+	break;
	if(val > MAX_PARALLEL)
	global->parallel_max = MAX_PARALLEL;
	else if(val < 1)
@@ -2488,13 +2593,17 @@ ParameterError getparameter(const char flag, / f or -long-flag */
	}
	break;
	default: /* unknown flag */
-	return PARAM_OPTION_UNKNOWN;
+	err = PARAM_OPTION_UNKNOWN;
+	break;
	}
	hit = -1;

-	} while(!longopt && !singleopt && ++parse && !usedarg);
+	} while(!longopt && !singleopt && ++parse && !usedarg && !err);

-	return PARAM_OK;
+	error:
+	if(nextalloc)
+	free(nextarg);
+	return err;
	}

	ParameterError parse_args(struct GlobalConfig *global, int argc,

src/tool_getparam.h+1 -0

@@ -48,6 +48,7 @@ typedef enum {
	PARAM_CONTDISP_SHOW_HEADER, /* --include and --remote-header-name */
	PARAM_CONTDISP_RESUME_FROM, /* --continue-at and --remote-header-name */
	PARAM_READ_ERROR,
+	PARAM_EXPAND_ERROR, /* --expand problem */
	PARAM_LAST
	} ParameterError;

src/tool_helpers.c+2 -0

@@ -76,6 +76,8 @@ const char *param2text(int res)
	return "--continue-at and --remote-header-name cannot be combined";
	case PARAM_READ_ERROR:
	return "error encountered when reading a file";
+	case PARAM_EXPAND_ERROR:
+	return "variable expansion failure";
	default:
	return "unknown error";
	}

src/tool_listhelp.c+7 -4

@@ -246,12 +246,12 @@ const struct helptxt helptext[] = {
	{" --happy-eyeballs-timeout-ms <milliseconds>",
	"Time for IPv6 before trying IPv4",
	CURLHELP_CONNECTION},
+	{" --haproxy-clientip",
+	"Sets client IP in HAProxy PROXY protocol v1 header",
+	CURLHELP_HTTP \| CURLHELP_PROXY},
	{" --haproxy-protocol",
	"Send HAProxy PROXY protocol v1 header",
	CURLHELP_HTTP \| CURLHELP_PROXY},
-	{" --haproxy-clientip",
-	"Sets the HAProxy PROXY protocol v1 client IP",
-	CURLHELP_HTTP \| CURLHELP_PROXY},
	{"-I, --head",
	"Show document info only",
	CURLHELP_HTTP \| CURLHELP_FTP \| CURLHELP_FILE},
@@ -760,7 +760,7 @@ const struct helptxt helptext[] = {
	"Like --trace, but without hex output",
	CURLHELP_VERBOSE},
	{" --trace-ids",
-	"Add transfer/connection identifiers to trace/verbose output",
+	"Add transfer and connection identifiers to trace/verbose output",
	CURLHELP_VERBOSE},
	{" --trace-time",
	"Add time stamps to trace/verbose output",
@@ -786,6 +786,9 @@ const struct helptxt helptext[] = {
	{"-A, --user-agent <name>",
	"Send User-Agent <name> to server",
	CURLHELP_IMPORTANT \| CURLHELP_HTTP},
+	{" --variable <name=text/@file>",
+	"Set variable",
+	CURLHELP_CURL},
	{"-v, --verbose",
	"Make the operation more talkative",
	CURLHELP_IMPORTANT \| CURLHELP_VERBOSE},

src/tool_operate.c+27 -22

@@ -2756,36 +2756,39 @@ CURLcode operate(struct GlobalConfig *global, int argc, argv_item_t argv[])
	/* Cleanup the libcurl source output */
	easysrc_cleanup();
	}
-	return CURLE_OUT_OF_MEMORY;
+	result = CURLE_OUT_OF_MEMORY;
	}

-	curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_COOKIE);
-	curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_DNS);
-	curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_SSL_SESSION);
-	curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_CONNECT);
-	curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_PSL);
-	curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_HSTS);
+	if(!result) {
+	curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_COOKIE);
+	curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_DNS);
+	curl_share_setopt(share, CURLSHOPT_SHARE,
+	CURL_LOCK_DATA_SSL_SESSION);
+	curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_CONNECT);
+	curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_PSL);
+	curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_HSTS);

-	/* Get the required arguments for each operation */
-	do {
-	result = get_args(operation, count++);
+	/* Get the required arguments for each operation */
+	do {
+	result = get_args(operation, count++);

-	operation = operation->next;
-	} while(!result && operation);
+	operation = operation->next;
+	} while(!result && operation);

-	/* Set the current operation pointer */
-	global->current = global->first;
+	/* Set the current operation pointer */
+	global->current = global->first;

-	/* now run! */
-	result = run_all_transfers(global, share, result);
+	/* now run! */
+	result = run_all_transfers(global, share, result);

-	curl_share_cleanup(share);
-	if(global->libcurl) {
-	/* Cleanup the libcurl source output */
-	easysrc_cleanup();
+	curl_share_cleanup(share);
+	if(global->libcurl) {
+	/* Cleanup the libcurl source output */
+	easysrc_cleanup();

-	/* Dump the libcurl code if previously enabled */
-	dumpeasysrc(global);
+	/* Dump the libcurl code if previously enabled */
+	dumpeasysrc(global);
+	}
	}
	}
	else
@@ -2793,5 +2796,7 @@ CURLcode operate(struct GlobalConfig *global, int argc, argv_item_t argv[])
	}
	}

+	varcleanup(global);
+
	return result;
	}

src/tool_writeout_json.c+42 -19

@@ -31,50 +31,73 @@
	#include "tool_writeout_json.h"
	#include "tool_writeout.h"

-	void jsonWriteString(FILE stream, const char in, bool lowercase)
+	#define MAX_JSON_STRING 100000
+
+	/* provide the given string in dynbuf as a quoted json string, but without the
+	outer quotes. The buffer is not inited by this function.
+
+	Return 0 on success, non-zero on error.
+	*/
+	int jsonquoted(const char *in, size_t len,
+	struct curlx_dynbuf *out, bool lowercase)
	{
	const char *i = in;
-	const char *in_end = in + strlen(in);
+	const char *in_end = &in[len];
+	CURLcode result = CURLE_OK;

-	fputc('\"', stream);
-	for(; i < in_end; i++) {
+	for(; (i < in_end) && !result; i++) {
	switch(*i) {
	case '\\':
-	fputs("\\\\", stream);
+	result = curlx_dyn_addn(out, "\\\\", 2);
	break;
	case '\"':
-	fputs("\\\"", stream);
+	result = curlx_dyn_addn(out, "\\\"", 2);
	break;
	case '\b':
-	fputs("\\b", stream);
+	result = curlx_dyn_addn(out, "\\b", 2);
	break;
	case '\f':
-	fputs("\\f", stream);
+	result = curlx_dyn_addn(out, "\\f", 2);
	break;
	case '\n':
-	fputs("\\n", stream);
+	result = curlx_dyn_addn(out, "\\n", 2);
	break;
	case '\r':
-	fputs("\\r", stream);
+	result = curlx_dyn_addn(out, "\\r", 2);
	break;
	case '\t':
-	fputs("\\t", stream);
+	result = curlx_dyn_addn(out, "\\t", 2);
	break;
	default:
-	if(*i < 32) {
-	fprintf(stream, "\\u%04x", *i);
-	}
+	if(*i < 32)
+	result = curlx_dyn_addf(out, "\\u%04x", *i);
	else {
-	char out = *i;
-	if(lowercase && (out >= 'A' && out <= 'Z'))
+	char o = *i;
+	if(lowercase && (o >= 'A' && o <= 'Z'))
	/* do not use tolower() since that's locale specific */
-	out \|= ('a' - 'A');
-	fputc(out, stream);
+	o \|= ('a' - 'A');
+	result = curlx_dyn_addn(out, &o, 1);
	}
	break;
	}
	}
-	fputc('\"', stream);
+	if(result)
+	return (int)result;
+	return 0;
+	}
+
+	void jsonWriteString(FILE stream, const char in, bool lowercase)
+	{
+	struct curlx_dynbuf out;
+	curlx_dyn_init(&out, MAX_JSON_STRING);
+
+	if(!jsonquoted(in, strlen(in), &out, lowercase)) {
+	fputc('\"', stream);
+	if(curlx_dyn_len(&out))
+	fputs(curlx_dyn_ptr(&out), stream);
+	fputc('\"', stream);
+	}
+	curlx_dyn_free(&out);
	}

	void ourWriteOutJSON(FILE *stream, const struct writeoutvar mappings[],

src/tool_writeout_json.h+3 -0

@@ -26,6 +26,9 @@
	#include "tool_setup.h"
	#include "tool_writeout.h"

+	int jsonquoted(const char *in, size_t len,
+	struct curlx_dynbuf *out, bool lowercase);
+
	void ourWriteOutJSON(FILE *stream, const struct writeoutvar mappings[],
	struct per_transfer *per, CURLcode per_result);
	void headerJSON(FILE stream, struct per_transfer per);

src/var.c+462 -0

@@ -0,0 +1,462 @@
+	/***************************************************************************
+	* _ _ ____ _
+	* Project ___\| \| \| \| _ \\| \|
+	* / __\| \| \| \| \|_) \| \|
+	* \| (__\| \|_\| \| _ <\| \|___
+	* \___\|\___/\|_\| \_\_____\|
+	*
+	* Copyright (C) Daniel Stenberg, <[email protected]>, et al.
+	*
+	* This software is licensed as described in the file COPYING, which
+	* you should have received as part of this distribution. The terms
+	* are also available at https://curl.se/docs/copyright.html.
+	*
+	* You may opt to use, copy, modify, merge, publish, distribute and/or sell
+	* copies of the Software, and permit persons to whom the Software is
+	* furnished to do so, under the terms of the COPYING file.
+	*
+	* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+	* KIND, either express or implied.
+	*
+	* SPDX-License-Identifier: curl
+	*
+	***************************************************************************/
+	#include "tool_setup.h"
+
+	#define ENABLE_CURLX_PRINTF
+	/* use our own printf() functions */
+	#include "curlx.h"
+
+	#include "tool_cfgable.h"
+	#include "tool_getparam.h"
+	#include "tool_helpers.h"
+	#include "tool_findfile.h"
+	#include "tool_msgs.h"
+	#include "tool_parsecfg.h"
+	#include "dynbuf.h"
+	#include "curl_base64.h"
+	#include "tool_paramhlp.h"
+	#include "tool_writeout_json.h"
+	#include "var.h"
+
+	#include "memdebug.h" /* keep this as LAST include */
+
+	#define MAX_EXPAND_CONTENT 10000000
+
+	static char Memdup(const char data, size_t len)
+	{
+	char *p = malloc(len + 1);
+	if(!p)
+	return NULL;
+	if(len)
+	memcpy(p, data, len);
+	p[len] = 0;
+	return p;
+	}
+
+	/* free everything */
+	void varcleanup(struct GlobalConfig *global)
+	{
+	struct var *list = global->variables;
+	while(list) {
+	struct var *t = list;
+	list = list->next;
+	free((char *)t->content);
+	free((char *)t->name);
+	free(t);
+	}
+	}
+
+	static const struct var varcontent(struct GlobalConfig global,
+	const char *name, size_t nlen)
+	{
+	struct var *list = global->variables;
+	while(list) {
+	if((strlen(list->name) == nlen) &&
+	!strncmp(name, list->name, nlen)) {
+	return list;
+	}
+	list = list->next;
+	}
+	return NULL;
+	}
+
+	#define ENDOFFUNC(x) (((x) == '}') \|\| ((x) == ':'))
+	#define FUNCMATCH(ptr,name,len) \
+	(!strncmp(ptr, name, len) && ENDOFFUNC(ptr[len]))
+
+	#define FUNC_TRIM "trim"
+	#define FUNC_TRIM_LEN (sizeof(FUNC_TRIM) - 1)
+	#define FUNC_JSON "json"
+	#define FUNC_JSON_LEN (sizeof(FUNC_JSON) - 1)
+	#define FUNC_URL "url"
+	#define FUNC_URL_LEN (sizeof(FUNC_URL) - 1)
+	#define FUNC_B64 "b64"
+	#define FUNC_B64_LEN (sizeof(FUNC_B64) - 1)
+
+	static ParameterError varfunc(struct GlobalConfig *global,
+	char c, / content */
+	size_t clen, /* content length */
+	char f, / functions */
+	size_t flen, /* function string length */
+	struct curlx_dynbuf *out)
+	{
+	bool alloc = FALSE;
+	ParameterError err = PARAM_OK;
+	const char *finput = f;
+
+	/* The functions are independent and runs left to right */
+	while(*f && !err) {
+	if(*f == '}')
+	/* end of functions */
+	break;
+	/* On entry, this is known to be a colon already. In subsequent laps, it
+	is also known to be a colon since that is part of the FUNCMATCH()
+	checks */
+	f++;
+	if(FUNCMATCH(f, FUNC_TRIM, FUNC_TRIM_LEN)) {
+	size_t len = clen;
+	f += FUNC_TRIM_LEN;
+	if(clen) {
+	/* skip leading white space, including CRLF */
+	while(c && ISSPACE(c)) {
+	c++;
+	len--;
+	}
+	while(len && ISSPACE(c[len-1]))
+	len--;
+	}
+	/* put it in the output */
+	curlx_dyn_reset(out);
+	if(curlx_dyn_addn(out, c, len)) {
+	err = PARAM_NO_MEM;
+	break;
+	}
+	}
+	else if(FUNCMATCH(f, FUNC_JSON, FUNC_JSON_LEN)) {
+	f += FUNC_JSON_LEN;
+	curlx_dyn_reset(out);
+	if(clen) {
+	if(jsonquoted(c, clen, out, FALSE)) {
+	err = PARAM_NO_MEM;
+	break;
+	}
+	}
+	}
+	else if(FUNCMATCH(f, FUNC_URL, FUNC_URL_LEN)) {
+	f += FUNC_URL_LEN;
+	curlx_dyn_reset(out);
+	if(clen) {
+	char *enc = curl_easy_escape(NULL, c, (int)clen);
+	if(!enc) {
+	err = PARAM_NO_MEM;
+	break;
+	}
+
+	/* put it in the output */
+	if(curlx_dyn_add(out, enc)) {
+	err = PARAM_NO_MEM;
+	break;
+	}
+	curl_free(enc);
+	}
+	}
+	else if(FUNCMATCH(f, FUNC_B64, FUNC_B64_LEN)) {
+	f += FUNC_B64_LEN;
+	curlx_dyn_reset(out);
+	if(clen) {
+	char *enc;
+	size_t elen;
+	CURLcode result = curlx_base64_encode(c, clen, &enc, &elen);
+	if(result) {
+	err = PARAM_NO_MEM;
+	break;
+	}
+
+	/* put it in the output */
+	if(curlx_dyn_addn(out, enc, elen))
+	err = PARAM_NO_MEM;
+	curl_free(enc);
+	if(err)
+	break;
+	}
+	}
+	else {
+	/* unsupported function */
+	errorf(global, "unknown variable function in '%.*s'",
+	(int)flen, finput);
+	err = PARAM_EXPAND_ERROR;
+	break;
+	}
+	if(alloc)
+	free(c);
+
+	clen = curlx_dyn_len(out);
+	c = Memdup(curlx_dyn_ptr(out), clen);
+	if(!c) {
+	err = PARAM_NO_MEM;
+	break;
+	}
+	alloc = TRUE;
+	}
+	if(alloc)
+	free(c);
+	if(err)
+	curlx_dyn_free(out);
+	return err;
+	}
+
+	ParameterError varexpand(struct GlobalConfig *global,
+	const char line, struct curlx_dynbuf out,
+	bool *replaced)
+	{
+	CURLcode result;
+	char *envp;
+	bool added = FALSE;
+	const char *input = line;
+	*replaced = FALSE;
+	curlx_dyn_init(out, MAX_EXPAND_CONTENT);
+	do {
+	envp = strstr(line, "{{");
+	if((envp > line) && envp[-1] == '\\') {
+	/* preceding backslash, we want this verbatim */
+
+	/* insert the text up to this point, minus the backslash */
+	result = curlx_dyn_addn(out, line, envp - line - 1);
+	if(result)
+	return PARAM_NO_MEM;
+
+	/* output '{{' then continue from here */
+	result = curlx_dyn_addn(out, "{{", 2);
+	if(result)
+	return PARAM_NO_MEM;
+	line = &envp[2];
+	}
+	else if(envp) {
+	char name[128];
+	size_t nlen;
+	size_t i;
+	char *funcp;
+	char *clp = strstr(envp, "}}");
+	size_t prefix;
+
+	if(!clp) {
+	/* uneven braces */
+	warnf(global, "missing close '}}' in '%s'", input);
+	break;
+	}
+
+	prefix = 2;
+	envp += 2; /* move over the {{ */
+
+	/* if there is a function, it ends the name with a colon */
+	funcp = memchr(envp, ':', clp - envp);
+	if(funcp)
+	nlen = funcp - envp;
+	else
+	nlen = clp - envp;
+	if(!nlen \|\| (nlen >= sizeof(name))) {
+	warnf(global, "bad variable name length '%s'", input);
+	/* insert the text as-is since this is not an env variable */
+	result = curlx_dyn_addn(out, line, clp - line + prefix);
+	if(result)
+	return PARAM_NO_MEM;
+	}
+	else {
+	/* insert the text up to this point */
+	result = curlx_dyn_addn(out, line, envp - prefix - line);
+	if(result)
+	return PARAM_NO_MEM;
+
+	/* copy the name to separate buffer */
+	memcpy(name, envp, nlen);
+	name[nlen] = 0;
+
+	/* verify that the name looks sensible */
+	for(i = 0; (i < nlen) &&
+	(ISALNUM(name[i]) \|\| (name[i] == '_')); i++);
+	if(i != nlen) {
+	warnf(global, "bad variable name: %s", name);
+	/* insert the text as-is since this is not an env variable */
+	result = curlx_dyn_addn(out, envp - prefix,
+	clp - envp + prefix + 2);
+	if(result)
+	return PARAM_NO_MEM;
+	}
+	else {
+	char *value;
+	size_t vlen = 0;
+	struct curlx_dynbuf buf;
+	const struct var *v = varcontent(global, name, nlen);
+	if(v) {
+	value = (char *)v->content;
+	vlen = v->clen;
+	}
+	else
+	value = NULL;
+
+	curlx_dyn_init(&buf, MAX_EXPAND_CONTENT);
+	if(funcp) {
+	/* apply the list of functions on the value */
+	size_t flen = clp - funcp;
+	ParameterError err = varfunc(global, value, vlen, funcp, flen,
+	&buf);
+	if(err)
+	return err;
+	value = curlx_dyn_ptr(&buf);
+	vlen = curlx_dyn_len(&buf);
+	}
+
+	if(value && *value) {
+	/* A variable might contain null bytes. Such bytes cannot be shown
+	using normal means, this is an error. */
+	char *nb = memchr(value, '\0', vlen);
+	if(nb) {
+	errorf(global, "variable contains null byte");
+	return PARAM_EXPAND_ERROR;
+	}
+	}
+	/* insert the value */
+	result = curlx_dyn_addn(out, value, vlen);
+	curlx_dyn_free(&buf);
+	if(result)
+	return PARAM_NO_MEM;
+
+	added = true;
+	}
+	}
+	line = &clp[2];
+	}
+
+	} while(envp);
+	if(added && *line) {
+	/* add the "suffix" as well */
+	result = curlx_dyn_add(out, line);
+	if(result)
+	return PARAM_NO_MEM;
+	}
+	*replaced = added;
+	if(!added)
+	curlx_dyn_free(out);
+	return PARAM_OK;
+	}
+
+	/*
+	* Created in a way that is not revealing how variables is actually stored so
+	* that we can improve this if we want better performance when managing many
+	* at a later point.
+	*/
+	static ParameterError addvariable(struct GlobalConfig *global,
+	const char *name,
+	size_t nlen,
+	const char *content,
+	size_t clen,
+	bool contalloc)
+	{
+	struct var *p;
+	const struct var *check = varcontent(global, name, nlen);
+	if(check)
+	notef(global, "Overwriting variable '%s'", check->name);
+
+	p = calloc(sizeof(struct var), 1);
+	if(!p)
+	return PARAM_NO_MEM;
+
+	p->name = Memdup(name, nlen);
+	if(!p->name)
+	goto err;
+
+	p->content = contalloc ? content: Memdup(content, clen);
+	if(!p->content)
+	goto err;
+	p->clen = clen;
+
+	p->next = global->variables;
+	global->variables = p;
+	return PARAM_OK;
+	err:
+	free((char *)p->content);
+	free((char *)p->name);
+	free(p);
+	return PARAM_NO_MEM;
+	}
+
+	ParameterError setvariable(struct GlobalConfig *global,
+	const char *input)
+	{
+	const char *name;
+	size_t nlen;
+	char *content = NULL;
+	size_t clen = 0;
+	bool contalloc = FALSE;
+	const char *line = input;
+	ParameterError err = PARAM_OK;
+	bool import = FALSE;
+	char *ge = NULL;
+
+	if(*input == '%') {
+	import = TRUE;
+	line++;
+	}
+	name = line;
+	while(line && (ISALNUM(line) \|\| (*line == '_')))
+	line++;
+	nlen = line - name;
+	if(!nlen \|\| (nlen > 128)) {
+	warnf(global, "Bad variable name length (%zd), skipping", nlen);
+	return PARAM_OK;
+	}
+	if(import) {
+	ge = curl_getenv(name);
+	if(!*line && !ge) {
+	/* no assign, no variable, fail */
+	errorf(global, "Variable '%s' import fail, not set", name);
+	return PARAM_EXPAND_ERROR;
+	}
+	else if(ge) {
+	/* there is a value to use */
+	content = ge;
+	clen = strlen(ge);
+	}
+	}
+	if(content)
+	;
+	else if(*line == '@') {
+	/* read from file or stdin */
+	FILE *file;
+	bool use_stdin;
+	line++;
+	use_stdin = !strcmp(line, "-");
+	if(use_stdin)
+	file = stdin;
+	else {
+	file = fopen(line, "rb");
+	}
+	if(file) {
+	err = file2memory(&content, &clen, file);
+	/* in case of out of memory, this should fail the entire operation */
+	contalloc = TRUE;
+	}
+	if(!use_stdin)
+	fclose(file);
+	if(err)
+	return err;
+	}
+	else if(*line == '=') {
+	line++;
+	/* this is the exact content */
+	content = (char *)line;
+	clen = strlen(line);
+	}
+	else {
+	warnf(global, "Bad --variable syntax, skipping: %s", input);
+	return PARAM_OK;
+	}
+	err = addvariable(global, name, nlen, content, clen, contalloc);
+	if(err) {
+	if(contalloc)
+	free(content);
+	}
+	curl_free(ge);
+	return err;
+	}

src/var.h+48 -0

@@ -0,0 +1,48 @@
+	#ifndef HEADER_CURL_VAR_H
+	#define HEADER_CURL_VAR_H
+	/***************************************************************************
+	* _ _ ____ _
+	* Project ___\| \| \| \| _ \\| \|
+	* / __\| \| \| \| \|_) \| \|
+	* \| (__\| \|_\| \| _ <\| \|___
+	* \___\|\___/\|_\| \_\_____\|
+	*
+	* Copyright (C) Daniel Stenberg, <[email protected]>, et al.
+	*
+	* This software is licensed as described in the file COPYING, which
+	* you should have received as part of this distribution. The terms
+	* are also available at https://curl.se/docs/copyright.html.
+	*
+	* You may opt to use, copy, modify, merge, publish, distribute and/or sell
+	* copies of the Software, and permit persons to whom the Software is
+	* furnished to do so, under the terms of the COPYING file.
+	*
+	* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
+	* KIND, either express or implied.
+	*
+	* SPDX-License-Identifier: curl
+	*
+	***************************************************************************/
+
+	#include "tool_getparam.h"
+	#include "dynbuf.h"
+
+	struct var {
+	struct var *next;
+	const char *name;
+	const char *content;
+	size_t clen; /* content length */
+	};
+
+	struct GlobalConfig;
+
+	ParameterError setvariable(struct GlobalConfig global, const char input);
+	ParameterError varexpand(struct GlobalConfig *global,
+	const char line, struct curlx_dynbuf out,
+	bool *replaced);
+
+	/* free everything */
+	void varcleanup(struct GlobalConfig *global);
+
+	#endif /* HEADER_CURL_VAR_H */
+

tests/data/Makefile.inc+4 -3

@@ -69,10 +69,11 @@ test390 test391 test392 test393 test394 test395 test396 test397 test398 \
	test399 test400 test401 test402 test403 test404 test405 test406 test407 \
	test408 test409 test410 test411 test412 test413 test414 test415 test416 \
	test417 test418 test419 test420 test421 test422 test423 test424 test425 \
-	test426 test427 \
-	test430 test431 test432 test433 test434 test435 test436 \
+	test426 test427 test428 test429 test430 test431 test432 test433 test434 \
+	test435 test436 \
	\
-	test440 test441 test442 test443 test444 test445 test446 test447 \
+	test440 test441 test442 test443 test444 test445 test446 test447 test448 \
+	test449 test450 test451 test452 test453 test454 test455 \
	\
	test490 test491 test492 test493 test494 test495 test496 \
	\

tests/data/test428+68 -0

@@ -0,0 +1,68 @@
+	<testcase>
+	<info>
+	<keywords>
+	HTTP
+	variables
+	</keywords>
+	</info>
+
+	#
+	# Server-side
+	<reply>
+	<data crlf="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
+	-foo-
+	</data>
+	</reply>
+
+	#
+	# Client-side
+	<client>
+	<server>
+	http
+	</server>
+	<setenv>
+	FUNVALUE=contents
+	VALUE2=curl
+	BLANK=
+	</setenv>
+	<name>
+	Expand environment variables within config file
+	</name>
+	<file name="%LOGDIR/cmd">
+	--variable %FUNVALUE
+	--variable %VALUE2
+	--variable %BLANK
+	--variable %curl_NOT_SET=default
+	--expand-data 1{{FUNVALUE}}2{{VALUE2}}3{{curl_NOT_SET}}4{{BLANK}}5\{{verbatim}}6{{not.good}}7{{}}
+	</file>
+	<command>
+	http://%HOSTIP:%HTTPPORT/%TESTNUMBER -K %LOGDIR/cmd
+	</command>
+	</client>
+
+	#
+	# Verify data after the test has been "shot"
+	<verify>
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 54
+	Content-Type: application/x-www-form-urlencoded
+
+	1contents2curl3default45{{verbatim}}6{{not.good}}7{{}}
+	</protocol>
+	</verify>
+	</testcase>

tests/data/test429+63 -0

@@ -0,0 +1,63 @@
+	<testcase>
+	<info>
+	<keywords>
+	HTTP
+	HTTP POST
+	variables
+	</keywords>
+	</info>
+
+	#
+	# Server-side
+	<reply>
+	<data crlf="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
+	-foo-
+	</data>
+	</reply>
+
+	#
+	# Client-side
+	<client>
+	<server>
+	http
+	</server>
+	<setenv>
+	FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF=contents2023
+	</setenv>
+	<name>
+	Expand environment variable in config file - too long name
+	</name>
+	<file name="%LOGDIR/cmd">
+	--expand-data {{FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF}}
+	</file>
+	<command>
+	http://%HOSTIP:%HTTPPORT/%TESTNUMBER -K %LOGDIR/cmd
+	</command>
+	</client>
+
+	#
+	# Verify data after the test has been "shot"
+	<verify>
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 133
+	Content-Type: application/x-www-form-urlencoded
+
+	{{FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF}}
+	</protocol>
+	</verify>
+	</testcase>

tests/data/test448+67 -0

@@ -0,0 +1,67 @@
+	<testcase>
+	<info>
+	<keywords>
+	HTTP
+	variables
+	--config
+	</keywords>
+	</info>
+
+	#
+	# Server-side
+	<reply>
+	<data crlf="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
+	-foo-
+	</data>
+	</reply>
+
+	#
+	# Client-side
+	<client>
+	<server>
+	http
+	</server>
+	<setenv>
+	FUNVALUE=contents
+	VALUE2=curl
+	BLANK=
+	</setenv>
+	<name>
+	Environment variables within config file, unbalanced braces
+	</name>
+	<file name="%LOGDIR/cmd">
+	--variable %FUNVALUE
+	--variable %VALUE2
+	--expand-data 1{{FUNVALUE}}2{{VALUE2}}3{{curl_NOT_SET}}4{{AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA}}5{{broken
+	</file>
+	<command>
+	http://%HOSTIP:%HTTPPORT/%TESTNUMBER -K %LOGDIR/cmd
+	</command>
+	</client>
+
+	#
+	# Verify data after the test has been "shot"
+	<verify>
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 157
+	Content-Type: application/x-www-form-urlencoded
+
+	1contents2curl34{{AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA}}5{{broken
+	</protocol>
+	</verify>
+	</testcase>

tests/data/test449+65 -0

@@ -0,0 +1,65 @@
+	<testcase>
+	<info>
+	<keywords>
+	HTTP
+	variables
+	--config
+	</keywords>
+	</info>
+
+	#
+	# Server-side
+	<reply>
+	<data crlf="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
+	-foo-
+	</data>
+	</reply>
+
+	#
+	# Client-side
+	<client>
+	<server>
+	http
+	</server>
+	<setenv>
+	FUNVALUE=contents
+	VALUE2=curl
+	BLANK=
+	</setenv>
+	<name>
+	Environment variables in config file w/o [expand]
+	</name>
+	<file name="%LOGDIR/cmd">
+	-d 1{{FUNVALUE}}2{{VALUE2}}3{{CURL_NOT_SET}}4{{BLANK}}5\{{verbatim}}6{{not.good}}7{{}}
+	</file>
+	<command>
+	http://%HOSTIP:%HTTPPORT/%TESTNUMBER -K %LOGDIR/cmd
+	</command>
+	</client>
+
+	#
+	# Verify data after the test has been "shot"
+	<verify>
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 83
+	Content-Type: application/x-www-form-urlencoded
+
+	1{{FUNVALUE}}2{{VALUE2}}3{{CURL_NOT_SET}}4{{BLANK}}5\{{verbatim}}6{{not.good}}7{{}}
+	</protocol>
+	</verify>
+	</testcase>

tests/data/test450+60 -0

@@ -0,0 +1,60 @@
+	<testcase>
+	<info>
+	<keywords>
+	HTTP
+	--config
+	variables
+	</keywords>
+	</info>
+
+	#
+	# Server-side
+	<reply>
+	<data crlf="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
+	-foo-
+	</data>
+	</reply>
+
+	#
+	# Client-side
+	<client>
+	<server>
+	http
+	</server>
+	<name>
+	Variable from file that is trimmed and URL encoded
+	</name>
+	<file name="%LOGDIR/junk">
+	space with space
+	</file>
+	<command>
+	http://%HOSTIP:%HTTPPORT/%TESTNUMBER --variable what@%LOGDIR/junk --expand-data "{{what:trim:url}}"
+	</command>
+	</client>
+
+	#
+	# Verify data after the test has been "shot"
+	<verify>
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 20
+	Content-Type: application/x-www-form-urlencoded
+
+	space%20with%20space
+	</protocol>
+	</verify>
+	</testcase>

tests/data/test451+59 -0

@@ -0,0 +1,59 @@
+	<testcase>
+	<info>
+	<keywords>
+	HTTP
+	variables
+	</keywords>
+	</info>
+
+	#
+	# Server-side
+	<reply>
+	<data crlf="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
+	-foo-
+	</data>
+	</reply>
+
+	#
+	# Client-side
+	<client>
+	<server>
+	http
+	</server>
+	<name>
+	Variable from file that is JSON and URL encoded (with null byte)
+	</name>
+	<file name="%LOGDIR/junk">
+	%hex[%01%02%03%00%04%05%06]hex%
+	</file>
+	<command>
+	http://%HOSTIP:%HTTPPORT/%TESTNUMBER --variable what@%LOGDIR/junk --variable second=hello --variable second=again --expand-data "--{{what:trim:json}}22{{none}}--{{second}}{{what:trim:url}}"
+	</command>
+	</client>
+
+	#
+	# Verify data after the test has been "shot"
+	<verify>
+	<protocol crlf="yes" nonewline="yes">
+	POST /%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+	Content-Length: 74
+	Content-Type: application/x-www-form-urlencoded
+
+	--\u0001\u0002\u0003\u0000\u0004\u0005\u000622--again%01%02%03%00%04%05%06
+	</protocol>
+	</verify>
+	</testcase>

tests/data/test452+34 -0

@@ -0,0 +1,34 @@
+	<testcase>
+	<info>
+	<keywords>
+	variables
+	</keywords>
+	</info>
+
+	#
+	# Server-side
+	<reply>
+	</reply>
+
+	#
+	# Client-side
+	<client>
+	<server>
+	http
+	</server>
+	<name>
+	Variable using illegal function in expansion
+	</name>
+	<command>
+	http://%HOSTIP:%HTTPPORT/%TESTNUMBER --variable what=hello --expand-data "--{{what:trim:super}}"
+	</command>
+	</client>
+
+	#
+	# Verify data after the test has been "shot"
+	<verify>
+	<errorcode>
+	2
+	</errorcode>
+	</verify>
+	</testcase>

tests/data/test453+33 -0

@@ -0,0 +1,33 @@
+	<testcase>
+	<info>
+	<keywords>
+	HTTP
+	variables
+	</keywords>
+	</info>
+
+	#
+	# Client-side
+	<client>
+	<server>
+	http
+	</server>
+	<name>
+	Variable output containing null byte
+	</name>
+	<file name="%LOGDIR/junk">
+	%hex[%01%02%03%00%04%05%06]hex%
+	</file>
+	<command>
+	http://%HOSTIP:%HTTPPORT/%TESTNUMBER --variable what@%LOGDIR/junk --expand-data "{{what}}"
+	</command>
+	</client>
+
+	#
+	# Verify data after the test has been "shot"
+	<verify>
+	<errorcode>
+	2
+	</errorcode>
+	</verify>
+	</testcase>

tests/data/test454+34 -0

@@ -0,0 +1,34 @@
+	<testcase>
+	<info>
+	<keywords>
+	variables
+	</keywords>
+	</info>
+
+	#
+	# Server-side
+	<reply>
+	</reply>
+
+	#
+	# Client-side
+	<client>
+	<server>
+	http
+	</server>
+	<name>
+	Variable using illegal function separator
+	</name>
+	<command>
+	http://%HOSTIP:%HTTPPORT/%TESTNUMBER --variable what=hello --expand-data "--{{what:trim,url}}"
+	</command>
+	</client>
+
+	#
+	# Verify data after the test has been "shot"
+	<verify>
+	<errorcode>
+	2
+	</errorcode>
+	</verify>
+	</testcase>

tests/data/test455+52 -0

@@ -0,0 +1,52 @@
+	<testcase>
+	<info>
+	<keywords>
+	variables
+	</keywords>
+	</info>
+
+	#
+	# Server-side
+	<reply>
+	<data crlf="yes">
+	HTTP/1.1 200 OK
+	Date: Tue, 09 Nov 2010 14:49:00 GMT
+	Server: test-server/fake
+	Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+	ETag: "21025-dc7-39462498"
+	Accept-Ranges: bytes
+	Content-Length: 6
+	Connection: close
+	Content-Type: text/html
+	Funny-head: yesyes
+
+	-foo-
+	</data>
+	</reply>
+
+	#
+	# Client-side
+	<client>
+	<server>
+	http
+	</server>
+	<name>
+	Variable using base64
+	</name>
+	<command>
+	--variable moby="Call me Ishmael" --expand-url "http://%HOSTIP:%HTTPPORT/{{moby:b64}}/%TESTNUMBER"
+	</command>
+	</client>
+
+	#
+	# Verify data after the test has been "shot"
+	<verify>
+	<protocol crlf="yes">
+	GET /%b64[Call me Ishmael]b64%/%TESTNUMBER HTTP/1.1
+	Host: %HOSTIP:%HTTPPORT
+	User-Agent: curl/%VERSION
+	Accept: /
+
+	</protocol>
+	</verify>
+	</testcase>

winbuild/MakefileBuild.vc+4 -1

@@ -666,7 +666,8 @@ CURL_FROM_LIBCURL=$(CURL_DIROBJ)\tool_hugehelp.obj \
	$(CURL_DIROBJ)\warnless.obj \
	$(CURL_DIROBJ)\curl_multibyte.obj \
	$(CURL_DIROBJ)\version_win32.obj \
-	$(CURL_DIROBJ)\dynbuf.obj
+	$(CURL_DIROBJ)\dynbuf.obj \
+	$(CURL_DIROBJ)\base64.obj

	$(PROGRAM_NAME): $(CURL_DIROBJ) $(CURL_FROM_LIBCURL) $(EXE_OBJS)
	$(CURL_LINK) $(CURL_LFLAGS) $(CURL_LIBCURL_LIBNAME) $(WIN_LIBS) $(CURL_FROM_LIBCURL) $(EXE_OBJS)
@@ -689,6 +690,8 @@ $(CURL_DIROBJ)\version_win32.obj: ../lib/version_win32.c
	$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/version_win32.c
	$(CURL_DIROBJ)\dynbuf.obj: ../lib/dynbuf.c
	$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/dynbuf.c
+	$(CURL_DIROBJ)\base64.obj: ../lib/base64.c
+	$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/base64.c
	$(CURL_DIROBJ)\curl.res: $(CURL_SRC_DIR)\curl.rc
	rc $(CURL_RC_FLAGS)