urlapi: leaner with fewer allocs
—
$ git checkout -f f703cf971ccdb93fea05f223cabbb99ca06cdc75
Previous HEAD position was d668685657 ftp: ignore a 550 response to MDTM
HEAD is now at f703cf971c urlapi: leaner with fewer allocs
$ 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/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-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-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_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-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-h2h3.lo
Removing lib/libcurl_la-h2h3.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-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_win32.lo
Removing lib/libcurl_la-idn_win32.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-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-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-wildcard.lo
Removing lib/libcurl_la-wildcard.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-msh3.lo
Removing lib/vquic/libcurl_la-msh3.o
Removing lib/vquic/libcurl_la-ngtcp2.lo
Removing lib/vquic/libcurl_la-ngtcp2.o
Removing lib/vquic/libcurl_la-quiche.lo
Removing lib/vquic/libcurl_la-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-nss.lo
Removing lib/vtls/libcurl_la-nss.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_panykey.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_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 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/configurehelp.pm
Removing tests/data/Makefile
Removing tests/data/Makefile.in
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:122: installing './compile'
configure.ac:331: installing './config.guess'
configure.ac:331: installing './config.sub'
configure.ac:122: installing './install-sh'
configure.ac:128: 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 for egrep... /usr/bin/grep -E
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... 7.85.1-DEV
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 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 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_set_local_window_size in -lnghttp2... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libngtcp2 options with pkg-config... 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 assert.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 errno.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 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 types of args and return type for select... int,fd_set *,struct timeval *,int
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for recv... yes
checking types of args and return type for recv... int,void *,size_t,int,ssize_t
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for send... yes
checking types of args and return type for send... int,const void *,size_t,int,ssize_t
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 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 utime... yes
checking for utimes... yes
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 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 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/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 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: amending lib/Makefile
configure: amending src/Makefile
configure: amending tests/unit/Makefile
configure: amending tests/server/Makefile
configure: amending tests/libtest/Makefile
configure: amending docs/examples/Makefile
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: 7.85.1-DEV
SSL: no (--with-{openssl,gnutls,nss,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-quiche --with-msh3)
ECH: no (--enable-ech)
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-bufref.lo
CC libcurl_la-base64.lo
CC libcurl_la-c-hyper.lo
CC libcurl_la-conncache.lo
CC libcurl_la-connect.lo
CC libcurl_la-content_encoding.lo
CC libcurl_la-cookie.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_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-easygetopt.lo
CC libcurl_la-easy.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-h2h3.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-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_win32.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-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-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-wildcard.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-gsasl.lo
CC vauth/libcurl_la-krb5_gssapi.lo
CC vauth/libcurl_la-krb5_sspi.lo
CC vauth/libcurl_la-ntlm_sspi.lo
CC vauth/libcurl_la-ntlm.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-nss.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-msh3.lo
CC vquic/libcurl_la-ngtcp2.lo
CC vquic/libcurl_la-quiche.lo
CC vquic/libcurl_la-vquic.lo
CC vssh/libcurl_la-libssh2.lo
CC vssh/libcurl_la-libssh.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_prg.o
CC tool_cb_hdr.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_easysrc.o
CC tool_filetime.o
CC tool_findfile.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_panykey.o
CC tool_paramhlp.o
CC tool_parsecfg.o
CC tool_progress.o
CC tool_strdup.o
CC tool_setopt.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 ../lib/strtoofft.o
CC ../lib/timediff.o
CC ../lib/nonblock.o
CC ../lib/warnless.o
CC ../lib/curl_multibyte.o
CC ../lib/version_win32.o
CC ../lib/dynbuf.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'
| @@ -76,7 +76,8 @@ CURLcode Curl_dyn_tail(struct dynbuf *s, size_t length); | |
| Keep `length` bytes of the buffer tail (the last `length` bytes of the | |
| buffer). The rest of the buffer is dropped. The specified `length` must not be | |
| - | larger than the buffer length. |
| + | larger than the buffer length. To instead keep the leading part, see |
| + | `Curl_dyn_setlen()`. |
| ## ptr | |
| @@ -106,3 +107,13 @@ size_t Curl_dyn_len(const struct dynbuf *s); | |
| Returns the length of the buffer in bytes. Does not include the terminating | |
| zero byte. | |
| + | |
| + | ## setlen |
| + | |
| + | ```c |
| + | CURLcode Curl_dyn_setlen(struct dynbuf *s, size_t len); |
| + | ``` |
| + | |
| + | Sets the new shorter length of the buffer in number of bytes. Keeps the |
| + | leftmost set number of bytes, discards the rest. To instead keep the tail part |
| + | of the buffer, see `Curl_dyn_tail()`. |
| @@ -128,7 +128,6 @@ LIB_CFILES = \ | |
| curl_threads.c \ | |
| dict.c \ | |
| doh.c \ | |
| - | dotdot.c \ |
| dynbuf.c \ | |
| easy.c \ | |
| easygetopt.c \ | |
| @@ -262,7 +261,6 @@ LIB_HFILES = \ | |
| curlx.h \ | |
| dict.h \ | |
| doh.h \ | |
| - | dotdot.h \ |
| dynbuf.h \ | |
| easy_lock.h \ | |
| easyif.h \ | |
| @@ -1,184 +0,0 @@ | |
| - | /*************************************************************************** |
| - | * _ _ ____ _ |
| - | * Project ___| | | | _ \| | |
| - | * / __| | | | |_) | | |
| - | * | (__| |_| | _ <| |___ |
| - | * \___|\___/|_| \_\_____| |
| - | * |
| - | * Copyright (C) 1998 - 2022, 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 "curl_setup.h" |
| - | |
| - | #include <curl/curl.h> |
| - | |
| - | #include "dotdot.h" |
| - | #include "curl_memory.h" |
| - | |
| - | /* The last #include file should be: */ |
| - | #include "memdebug.h" |
| - | |
| - | /* |
| - | * "Remove Dot Segments" |
| - | * https://datatracker.ietf.org/doc/html/rfc3986#section-5.2.4 |
| - | */ |
| - | |
| - | /* |
| - | * Curl_dedotdotify() |
| - | * @unittest: 1395 |
| - | * |
| - | * This function gets a null-terminated path with dot and dotdot sequences |
| - | * passed in and strips them off according to the rules in RFC 3986 section |
| - | * 5.2.4. |
| - | * |
| - | * The function handles a query part ('?' + stuff) appended but it expects |
| - | * that fragments ('#' + stuff) have already been cut off. |
| - | * |
| - | * RETURNS |
| - | * |
| - | * an allocated dedotdotified output string |
| - | */ |
| - | char *Curl_dedotdotify(const char *input) |
| - | { |
| - | size_t inlen = strlen(input); |
| - | char *clone; |
| - | size_t clen = inlen; /* the length of the cloned input */ |
| - | char *out = malloc(inlen + 1); |
| - | char *outptr; |
| - | char *orgclone; |
| - | char *queryp; |
| - | if(!out) |
| - | return NULL; /* out of memory */ |
| - | |
| - | *out = 0; /* null-terminates, for inputs like "./" */ |
| - | |
| - | /* get a cloned copy of the input */ |
| - | clone = strdup(input); |
| - | if(!clone) { |
| - | free(out); |
| - | return NULL; |
| - | } |
| - | orgclone = clone; |
| - | outptr = out; |
| - | |
| - | if(!*clone) { |
| - | /* zero length string, return that */ |
| - | free(out); |
| - | return clone; |
| - | } |
| - | |
| - | /* |
| - | * To handle query-parts properly, we must find it and remove it during the |
| - | * dotdot-operation and then append it again at the end to the output |
| - | * string. |
| - | */ |
| - | queryp = strchr(clone, '?'); |
| - | if(queryp) |
| - | *queryp = 0; |
| - | |
| - | do { |
| - | |
| - | /* A. If the input buffer begins with a prefix of "../" or "./", then |
| - | remove that prefix from the input buffer; otherwise, */ |
| - | |
| - | if(!strncmp("./", clone, 2)) { |
| - | clone += 2; |
| - | clen -= 2; |
| - | } |
| - | else if(!strncmp("../", clone, 3)) { |
| - | clone += 3; |
| - | clen -= 3; |
| - | } |
| - | |
| - | /* B. if the input buffer begins with a prefix of "/./" or "/.", where |
| - | "." is a complete path segment, then replace that prefix with "/" in |
| - | the input buffer; otherwise, */ |
| - | else if(!strncmp("/./", clone, 3)) { |
| - | clone += 2; |
| - | clen -= 2; |
| - | } |
| - | else if(!strcmp("/.", clone)) { |
| - | clone[1]='/'; |
| - | clone++; |
| - | clen -= 1; |
| - | } |
| - | |
| - | /* C. if the input buffer begins with a prefix of "/../" or "/..", where |
| - | ".." is a complete path segment, then replace that prefix with "/" in |
| - | the input buffer and remove the last segment and its preceding "/" (if |
| - | any) from the output buffer; otherwise, */ |
| - | |
| - | else if(!strncmp("/../", clone, 4)) { |
| - | clone += 3; |
| - | clen -= 3; |
| - | /* remove the last segment from the output buffer */ |
| - | while(outptr > out) { |
| - | outptr--; |
| - | if(*outptr == '/') |
| - | break; |
| - | } |
| - | *outptr = 0; /* null-terminate where it stops */ |
| - | } |
| - | else if(!strcmp("/..", clone)) { |
| - | clone[2]='/'; |
| - | clone += 2; |
| - | clen -= 2; |
| - | /* remove the last segment from the output buffer */ |
| - | while(outptr > out) { |
| - | outptr--; |
| - | if(*outptr == '/') |
| - | break; |
| - | } |
| - | *outptr = 0; /* null-terminate where it stops */ |
| - | } |
| - | |
| - | /* D. if the input buffer consists only of "." or "..", then remove |
| - | that from the input buffer; otherwise, */ |
| - | |
| - | else if(!strcmp(".", clone) || !strcmp("..", clone)) { |
| - | *clone = 0; |
| - | *out = 0; |
| - | } |
| - | |
| - | else { |
| - | /* E. move the first path segment in the input buffer to the end of |
| - | the output buffer, including the initial "/" character (if any) and |
| - | any subsequent characters up to, but not including, the next "/" |
| - | character or the end of the input buffer. */ |
| - | |
| - | do { |
| - | *outptr++ = *clone++; |
| - | clen--; |
| - | } while(*clone && (*clone != '/')); |
| - | *outptr = 0; |
| - | } |
| - | |
| - | } while(*clone); |
| - | |
| - | if(queryp) { |
| - | size_t qlen; |
| - | /* There was a query part, append that to the output. The 'clone' string |
| - | may now have been altered so we copy from the original input string |
| - | from the correct index. */ |
| - | size_t oindex = queryp - orgclone; |
| - | qlen = strlen(&input[oindex]); |
| - | memcpy(outptr, &input[oindex], qlen + 1); /* include the end zero byte */ |
| - | } |
| - | |
| - | free(orgclone); |
| - | return out; |
| - | } |
| @@ -1,27 +0,0 @@ | |
| - | #ifndef HEADER_CURL_DOTDOT_H |
| - | #define HEADER_CURL_DOTDOT_H |
| - | /*************************************************************************** |
| - | * _ _ ____ _ |
| - | * Project ___| | | | _ \| | |
| - | * / __| | | | |_) | | |
| - | * | (__| |_| | _ <| |___ |
| - | * \___|\___/|_| \_\_____| |
| - | * |
| - | * Copyright (C) 1998 - 2022, 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 |
| - | * |
| - | ***************************************************************************/ |
| - | char *Curl_dedotdotify(const char *input); |
| - | #endif /* HEADER_CURL_DOTDOT_H */ |
| @@ -128,7 +128,6 @@ void Curl_dyn_reset(struct dynbuf *s) | |
| s->leng = 0; | |
| } | |
| - | #ifdef USE_NGTCP2 |
| /* | |
| * Specify the size of the tail to keep (number of bytes from the end of the | |
| * buffer). The rest will be dropped. | |
| @@ -153,7 +152,6 @@ CURLcode Curl_dyn_tail(struct dynbuf *s, size_t trail) | |
| return CURLE_OK; | |
| } | |
| - | #endif |
| /* | |
| * Appends a buffer with length. | |
| @@ -255,3 +253,18 @@ size_t Curl_dyn_len(const struct dynbuf *s) | |
| DEBUGASSERT(!s->leng || s->bufr); | |
| return s->leng; | |
| } | |
| + | |
| + | /* |
| + | * Set a new (smaller) length. |
| + | */ |
| + | CURLcode Curl_dyn_setlen(struct dynbuf *s, size_t set) |
| + | { |
| + | DEBUGASSERT(s); |
| + | DEBUGASSERT(s->init == DYNINIT); |
| + | DEBUGASSERT(!s->leng || s->bufr); |
| + | if(set > s->leng) |
| + | return CURLE_BAD_FUNCTION_ARGUMENT; |
| + | s->leng = set; |
| + | s->bufr[s->leng] = 0; |
| + | return CURLE_OK; |
| + | } |
| @@ -38,6 +38,7 @@ | |
| #define Curl_dyn_len(a) curlx_dyn_len(a) | |
| #define Curl_dyn_reset(a) curlx_dyn_reset(a) | |
| #define Curl_dyn_tail(a,b) curlx_dyn_tail(a,b) | |
| + | #define Curl_dyn_setlen(a,b) curlx_dyn_setlen(a,b) |
| #define curlx_dynbuf dynbuf /* for the struct name */ | |
| #endif | |
| @@ -63,6 +64,7 @@ CURLcode Curl_dyn_vaddf(struct dynbuf *s, const char *fmt, va_list ap) | |
| WARN_UNUSED_RESULT; | |
| void Curl_dyn_reset(struct dynbuf *s); | |
| CURLcode Curl_dyn_tail(struct dynbuf *s, size_t trail); | |
| + | CURLcode Curl_dyn_setlen(struct dynbuf *s, size_t set); |
| char *Curl_dyn_ptr(const struct dynbuf *s); | |
| unsigned char *Curl_dyn_uptr(const struct dynbuf *s); | |
| size_t Curl_dyn_len(const struct dynbuf *s); | |
| @@ -128,7 +128,6 @@ bool curl_win32_idn_to_ascii(const char *in, char **out); | |
| #include "http_proxy.h" | |
| #include "conncache.h" | |
| #include "multihandle.h" | |
| - | #include "dotdot.h" |
| #include "strdup.h" | |
| #include "setopt.h" | |
| #include "altsvc.h" | |
| @@ -25,10 +25,11 @@ | |
| ***************************************************************************/ | |
| #include "curl_setup.h" | |
| - | bool Curl_is_absolute_url(const char *url, char *scheme, size_t buflen); |
| + | size_t Curl_is_absolute_url(const char *url, char *buf, size_t buflen); |
| #ifdef DEBUGBUILD | |
| - | CURLUcode Curl_parse_port(struct Curl_URL *u, char *hostname, bool); |
| + | CURLUcode Curl_parse_port(struct Curl_URL *u, struct dynbuf *host, |
| + | bool has_scheme); |
| #endif | |
| #endif /* HEADER_CURL_URLAPI_INT_H */ | |
| @@ -27,12 +27,12 @@ | |
| #include "urldata.h" | |
| #include "urlapi-int.h" | |
| #include "strcase.h" | |
| - | #include "dotdot.h" |
| #include "url.h" | |
| #include "escape.h" | |
| #include "curl_ctype.h" | |
| #include "inet_pton.h" | |
| #include "inet_ntop.h" | |
| + | #include "strdup.h" |
| /* The last 3 #include files should be in this order */ | |
| #include "curl_printf.h" | |
| @@ -68,9 +68,6 @@ struct Curl_URL { | |
| char *path; | |
| char *query; | |
| char *fragment; | |
| - | |
| - | char *scratch; /* temporary scratch area */ |
| - | char *temppath; /* temporary path pointer */ |
| long portnum; /* the numerical version */ | |
| }; | |
| @@ -88,8 +85,6 @@ static void free_urlhandle(struct Curl_URL *u) | |
| free(u->path); | |
| free(u->query); | |
| free(u->fragment); | |
| - | free(u->scratch); |
| - | free(u->temppath); |
| } | |
| /* | |
| @@ -130,64 +125,19 @@ static bool urlchar_needs_escaping(int c) | |
| return !(ISCNTRL(c) || ISSPACE(c) || ISGRAPH(c)); | |
| } | |
| - | /* |
| - | * strlen_url() returns the length of the given URL if the spaces within the |
| - | * URL were properly URL encoded. |
| - | * URL encoding should be skipped for host names, otherwise IDN resolution |
| - | * will fail. |
| - | */ |
| - | static size_t strlen_url(const char *url, bool relative) |
| - | { |
| - | const unsigned char *ptr; |
| - | size_t newlen = 0; |
| - | bool left = TRUE; /* left side of the ? */ |
| - | const unsigned char *host_sep = (const unsigned char *) url; |
| - | |
| - | if(!relative) |
| - | host_sep = (const unsigned char *) find_host_sep(url); |
| - | |
| - | for(ptr = (unsigned char *)url; *ptr; ptr++) { |
| - | |
| - | if(ptr < host_sep) { |
| - | ++newlen; |
| - | continue; |
| - | } |
| - | |
| - | if(*ptr == ' ') { |
| - | if(left) |
| - | newlen += 3; |
| - | else |
| - | newlen++; |
| - | continue; |
| - | } |
| - | |
| - | if (*ptr == '?') |
| - | left = FALSE; |
| - | |
| - | if(urlchar_needs_escaping(*ptr)) |
| - | newlen += 2; |
| - | |
| - | newlen++; |
| - | } |
| - | |
| - | return newlen; |
| - | } |
| - | |
| - | /* strcpy_url() copies a url to a output buffer and URL-encodes the spaces in |
| - | * the source URL accordingly. |
| + | /* strcpy_url() creates a url in an output dynbuf and URL-encodes the spaces |
| + | * in the source URL accordingly. |
| + | * |
| * URL encoding should be skipped for host names, otherwise IDN resolution | |
| * will fail. | |
| * | |
| - | * Returns TRUE if something was updated. |
| */ | |
| - | static bool strcpy_url(char *output, const char *url, bool relative) |
| + | static CURLUcode strcpy_url(struct dynbuf *o, const char *url, bool relative) |
| { | |
| /* we must add this with whitespace-replacing */ | |
| bool left = TRUE; | |
| const unsigned char *iptr; | |
| - | char *optr = output; |
| const unsigned char *host_sep = (const unsigned char *) url; | |
| - | bool changed = FALSE; |
| if(!relative) | |
| host_sep = (const unsigned char *) find_host_sep(url); | |
| @@ -197,19 +147,20 @@ static bool strcpy_url(char *output, const char *url, bool relative) | |
| iptr++) { | |
| if(iptr < host_sep) { | |
| - | *optr++ = *iptr; |
| + | if(Curl_dyn_addn(o, iptr, 1)) |
| + | return CURLUE_OUT_OF_MEMORY; |
| continue; | |
| } | |
| if(*iptr == ' ') { | |
| if(left) { | |
| - | *optr++='%'; /* add a '%' */ |
| - | *optr++='2'; /* add a '2' */ |
| - | *optr++='0'; /* add a '0' */ |
| + | if(Curl_dyn_addn(o, "%20", 3)) |
| + | return CURLUE_OUT_OF_MEMORY; |
| + | } |
| + | else { |
| + | if(Curl_dyn_addn(o, "+", 1)) |
| + | return CURLUE_OUT_OF_MEMORY; |
| } | |
| - | else |
| - | *optr++='+'; /* add a '+' here */ |
| - | changed = TRUE; |
| continue; | |
| } | |
| @@ -217,24 +168,24 @@ static bool strcpy_url(char *output, const char *url, bool relative) | |
| left = FALSE; | |
| if(urlchar_needs_escaping(*iptr)) { | |
| - | msnprintf(optr, 4, "%%%02x", *iptr); |
| - | changed = TRUE; |
| - | optr += 3; |
| + | if(Curl_dyn_addf(o, "%%%02x", *iptr)) |
| + | return CURLUE_OUT_OF_MEMORY; |
| + | } |
| + | else { |
| + | if(Curl_dyn_addn(o, iptr, 1)) |
| + | return CURLUE_OUT_OF_MEMORY; |
| } | |
| - | else |
| - | *optr++ = *iptr; |
| } | |
| - | *optr = 0; /* null-terminate output buffer */ |
| - | return changed; |
| + | return CURLUE_OK; |
| } | |
| /* | |
| - | * Returns true if the given URL is absolute (as opposed to relative). Returns |
| - | * the scheme in the buffer if TRUE and 'buf' is non-NULL. The buflen must |
| - | * be larger than MAX_SCHEME_LEN if buf is set. |
| + | * Returns the length of the scheme if the given URL is absolute (as opposed |
| + | * to relative). Stores the scheme in the buffer if TRUE and 'buf' is |
| + | * non-NULL. The buflen must be larger than MAX_SCHEME_LEN if buf is set. |
| */ | |
| - | bool Curl_is_absolute_url(const char *url, char *buf, size_t buflen) |
| + | size_t Curl_is_absolute_url(const char *url, char *buf, size_t buflen) |
| { | |
| int i; | |
| DEBUGASSERT(!buf || (buflen > MAX_SCHEME_LEN)); | |
| @@ -243,7 +194,7 @@ bool Curl_is_absolute_url(const char *url, char *buf, size_t buflen) | |
| buf[0] = 0; /* always leave a defined value in buf */ | |
| #ifdef WIN32 | |
| if(STARTS_WITH_DRIVE_PREFIX(url)) | |
| - | return FALSE; |
| + | return 0; |
| #endif | |
| for(i = 0; i < MAX_SCHEME_LEN; ++i) { | |
| char s = url[i]; | |
| @@ -257,15 +208,17 @@ bool Curl_is_absolute_url(const char *url, char *buf, size_t buflen) | |
| } | |
| } | |
| if(i && (url[i] == ':') && (url[i + 1] == '/')) { | |
| + | /* the length of the scheme is the name part only */ |
| + | size_t len = i; |
| if(buf) { | |
| buf[i] = 0; | |
| while(i--) { | |
| buf[i] = Curl_raw_tolower(url[i]); | |
| } | |
| } | |
| - | return TRUE; |
| + | return len; |
| } | |
| - | return FALSE; |
| + | return 0; |
| } | |
| /* | |
| @@ -273,34 +226,26 @@ bool Curl_is_absolute_url(const char *url, char *buf, size_t buflen) | |
| * URL-encodes any spaces. | |
| * The returned pointer must be freed by the caller unless NULL | |
| * (returns NULL on out of memory). | |
| + | * |
| + | * Note that this function destroys the 'base' string. |
| */ | |
| - | static char *concat_url(const char *base, const char *relurl) |
| + | static char *concat_url(char *base, const char *relurl) |
| { | |
| /*** | |
| TRY to append this new path to the old URL | |
| to the right of the host part. Oh crap, this is doomed to cause | |
| problems in the future... | |
| */ | |
| - | char *newest; |
| + | struct dynbuf newest; |
| char *protsep; | |
| char *pathsep; | |
| - | size_t newlen; |
| bool host_changed = FALSE; | |
| - | |
| const char *useurl = relurl; | |
| - | size_t urllen; |
| - | |
| - | /* we must make our own copy of the URL to play with, as it may |
| - | point to read-only data */ |
| - | char *url_clone = strdup(base); |
| - | |
| - | if(!url_clone) |
| - | return NULL; /* skip out of this NOW */ |
| /* protsep points to the start of the host name */ | |
| - | protsep = strstr(url_clone, "//"); |
| + | protsep = strstr(base, "//"); |
| if(!protsep) | |
| - | protsep = url_clone; |
| + | protsep = base; |
| else | |
| protsep += 2; /* pass the slashes */ | |
| @@ -393,38 +338,24 @@ static char *concat_url(const char *base, const char *relurl) | |
| } | |
| } | |
| - | /* If the new part contains a space, this is a mighty stupid redirect |
| - | but we still make an effort to do "right". To the left of a '?' |
| - | letter we replace each space with %20 while it is replaced with '+' |
| - | on the right side of the '?' letter. |
| - | */ |
| - | newlen = strlen_url(useurl, !host_changed); |
| - | |
| - | urllen = strlen(url_clone); |
| - | |
| - | newest = malloc(urllen + 1 + /* possible slash */ |
| - | newlen + 1 /* zero byte */); |
| - | |
| - | if(!newest) { |
| - | free(url_clone); /* don't leak this */ |
| - | return NULL; |
| - | } |
| + | Curl_dyn_init(&newest, CURL_MAX_INPUT_LENGTH); |
| /* copy over the root url part */ | |
| - | memcpy(newest, url_clone, urllen); |
| + | if(Curl_dyn_add(&newest, base)) |
| + | return NULL; |
| /* check if we need to append a slash */ | |
| if(('/' == useurl[0]) || (protsep && !*protsep) || ('?' == useurl[0])) | |
| ; | |
| - | else |
| - | newest[urllen++]='/'; |
| + | else { |
| + | if(Curl_dyn_addn(&newest, "/", 1)) |
| + | return NULL; |
| + | } |
| /* then append the new piece on the right side */ | |
| - | strcpy_url(&newest[urllen], useurl, !host_changed); |
| + | strcpy_url(&newest, useurl, !host_changed); |
| - | free(url_clone); |
| - | |
| - | return newest; |
| + | return Curl_dyn_ptr(&newest); |
| } | |
| /* scan for byte values < 31 or 127 */ | |
| @@ -458,7 +389,7 @@ static bool junkscan(const char *part, unsigned int flags) | |
| * | |
| */ | |
| static CURLUcode parse_hostname_login(struct Curl_URL *u, | |
| - | char **hostname, |
| + | struct dynbuf *host, |
| unsigned int flags) | |
| { | |
| CURLUcode result = CURLUE_OK; | |
| @@ -468,23 +399,27 @@ static CURLUcode parse_hostname_login(struct Curl_URL *u, | |
| char *optionsp = NULL; | |
| const struct Curl_handler *h = NULL; | |
| - | /* At this point, we're hoping all the other special cases have |
| - | * been taken care of, so conn->host.name is at most |
| - | * [user[:password][;options]]@]hostname |
| + | /* At this point, we assume all the other special cases have been taken |
| + | * care of, so the host is at most |
| + | * |
| + | * [user[:password][;options]]@]hostname |
| * | |
| * We need somewhere to put the embedded details, so do that first. | |
| */ | |
| - | char *ptr = strchr(*hostname, '@'); |
| - | char *login = *hostname; |
| + | char *login = Curl_dyn_ptr(host); |
| + | char *ptr; |
| + | |
| + | DEBUGASSERT(login); |
| + | ptr = strchr(login, '@'); |
| if(!ptr) | |
| goto out; | |
| /* We will now try to extract the | |
| * possible login information in a string like: | |
| * ftp://user:[email protected]:8021/README */ | |
| - | *hostname = ++ptr; |
| + | ptr++; |
| /* if this is a known scheme, get some details */ | |
| if(u->scheme) | |
| @@ -530,6 +465,10 @@ static CURLUcode parse_hostname_login(struct Curl_URL *u, | |
| u->options = optionsp; | |
| } | |
| + | /* move the name to the start of the host buffer */ |
| + | if(Curl_dyn_tail(host, strlen(ptr))) |
| + | return CURLUE_OUT_OF_MEMORY; |
| + | |
| return CURLUE_OK; | |
| out: | |
| @@ -543,13 +482,13 @@ static CURLUcode parse_hostname_login(struct Curl_URL *u, | |
| return result; | |
| } | |
| - | UNITTEST CURLUcode Curl_parse_port(struct Curl_URL *u, char *hostname, |
| + | UNITTEST CURLUcode Curl_parse_port(struct Curl_URL *u, struct dynbuf *host, |
| bool has_scheme) | |
| { | |
| char *portptr = NULL; | |
| char endbracket; | |
| int len; | |
| - | |
| + | char *hostname = Curl_dyn_ptr(host); |
| /* | |
| * Find the end of an IPv6 address, either on the ']' ending bracket or | |
| * a percent-encoded zone index. | |
| @@ -586,6 +525,7 @@ UNITTEST CURLUcode Curl_parse_port(struct Curl_URL *u, char *hostname, | |
| char *rest; | |
| long port; | |
| char portbuf[7]; | |
| + | size_t keep = portptr - hostname; |
| /* Browser behavior adaptation. If there's a colon with no digits after, | |
| just cut off the name there which makes us ignore the colon and just | |
| @@ -594,15 +534,15 @@ UNITTEST CURLUcode Curl_parse_port(struct Curl_URL *u, char *hostname, | |
| Don't do it if the URL has no scheme, to make something that looks like | |
| a scheme not work! | |
| */ | |
| - | if(!portptr[1]) { |
| - | *portptr = '\0'; |
| + | Curl_dyn_setlen(host, keep); |
| + | portptr++; |
| + | if(!*portptr) |
| return has_scheme ? CURLUE_OK : CURLUE_BAD_PORT_NUMBER; | |
| - | } |
| - | if(!ISDIGIT(portptr[1])) |
| + | if(!ISDIGIT(*portptr)) |
| return CURLUE_BAD_PORT_NUMBER; | |
| - | port = strtol(portptr + 1, &rest, 10); /* Port number must be decimal */ |
| + | port = strtol(portptr, &rest, 10); /* Port number must be decimal */ |
| if(port > 0xffff) | |
| return CURLUE_BAD_PORT_NUMBER; | |
| @@ -610,7 +550,6 @@ UNITTEST CURLUcode Curl_parse_port(struct Curl_URL *u, char *hostname, | |
| if(rest[0]) | |
| return CURLUE_BAD_PORT_NUMBER; | |
| - | *portptr++ = '\0'; /* cut off the name there */ |
| *rest = 0; | |
| /* generate a new port number string to get rid of leading zeroes etc */ | |
| msnprintf(portbuf, sizeof(portbuf), "%ld", port); | |
| @@ -623,12 +562,15 @@ UNITTEST CURLUcode Curl_parse_port(struct Curl_URL *u, char *hostname, | |
| return CURLUE_OK; | |
| } | |
| - | static CURLUcode hostname_check(struct Curl_URL *u, char *hostname) |
| + | static CURLUcode hostname_check(struct Curl_URL *u, char *hostname, |
| + | size_t hlen) /* length of hostname */ |
| { | |
| size_t len; | |
| - | size_t hlen = strlen(hostname); |
| + | DEBUGASSERT(hostname); |
| - | if(hostname[0] == '[') { |
| + | if(!hostname[0]) |
| + | return CURLUE_NO_HOST; |
| + | else if(hostname[0] == '[') { |
| const char *l = "0123456789abcdefABCDEF:."; | |
| if(hlen < 4) /* '[::]' is the shortest possible valid string */ | |
| return CURLUE_BAD_IPV6; | |
| @@ -692,8 +634,6 @@ static CURLUcode hostname_check(struct Curl_URL *u, char *hostname) | |
| /* hostname with bad content */ | |
| return CURLUE_BAD_HOSTNAME; | |
| } | |
| - | if(!hostname[0]) |
| - | return CURLUE_NO_HOST; |
| return CURLUE_OK; | |
| } | |
| @@ -787,79 +727,231 @@ static bool ipv4_normalize(const char *hostname, char *outp, size_t olen) | |
| return TRUE; | |
| } | |
| - | /* return strdup'ed version in 'outp', possibly percent decoded */ |
| - | static CURLUcode decode_host(char *hostname, char **outp) |
| + | /* if necessary, replace the host content with a URL decoded version */ |
| + | static CURLUcode decode_host(struct dynbuf *host) |
| { | |
| char *per = NULL; | |
| - | if(hostname[0] != '[') |
| + | const char *hostname = Curl_dyn_ptr(host); |
| + | if(hostname[0] == '[') |
| /* only decode if not an ipv6 numerical */ | |
| - | per = strchr(hostname, '%'); |
| - | if(!per) { |
| - | *outp = strdup(hostname); |
| - | if(!*outp) |
| - | return CURLUE_OUT_OF_MEMORY; |
| - | } |
| + | return CURLUE_OK; |
| + | per = strchr(hostname, '%'); |
| + | if(!per) |
| + | /* nothing to decode */ |
| + | return CURLUE_OK; |
| else { | |
| - | /* might be encoded */ |
| + | /* encoded */ |
| size_t dlen; | |
| - | CURLcode result = Curl_urldecode(hostname, 0, outp, &dlen, REJECT_CTRL); |
| + | char *decoded; |
| + | CURLcode result = Curl_urldecode(hostname, 0, &decoded, &dlen, |
| + | REJECT_CTRL); |
| if(result) | |
| return CURLUE_BAD_HOSTNAME; | |
| + | Curl_dyn_reset(host); |
| + | result = Curl_dyn_addn(host, decoded, dlen); |
| + | free(decoded); |
| + | if(result) |
| + | return CURLUE_OUT_OF_MEMORY; |
| } | |
| return CURLUE_OK; | |
| } | |
| - | static CURLUcode seturl(const char *url, CURLU *u, unsigned int flags) |
| + | /* |
| + | * "Remove Dot Segments" |
| + | * https://datatracker.ietf.org/doc/html/rfc3986#section-5.2.4 |
| + | */ |
| + | |
| + | /* |
| + | * dedotdotify() |
| + | * @unittest: 1395 |
| + | * |
| + | * This function gets a null-terminated path with dot and dotdot sequences |
| + | * passed in and strips them off according to the rules in RFC 3986 section |
| + | * 5.2.4. |
| + | * |
| + | * The function handles a query part ('?' + stuff) appended but it expects |
| + | * that fragments ('#' + stuff) have already been cut off. |
| + | * |
| + | * Note that this funciton *writes* a byte into the source buffer during its |
| + | * operation. |
| + | * |
| + | * RETURNS |
| + | * |
| + | * an allocated dedotdotified output string |
| + | */ |
| + | UNITTEST char *dedotdotify(const char *input, size_t clen); |
| + | UNITTEST char *dedotdotify(const char *input, size_t clen) |
| { | |
| - | char *path; |
| - | bool path_alloced = FALSE; |
| + | char *out = malloc(clen + 1); |
| + | char *outptr; |
| + | const char *orginput = input; |
| + | char *queryp; |
| + | if(!out) |
| + | return NULL; /* out of memory */ |
| + | |
| + | *out = 0; /* null-terminates, for inputs like "./" */ |
| + | outptr = out; |
| + | |
| + | if(!*input) |
| + | /* zero length input string, return that */ |
| + | return out; |
| + | |
| + | /* |
| + | * To handle query-parts properly, we must find it and remove it during the |
| + | * dotdot-operation and then append it again at the end to the output |
| + | * string. |
| + | */ |
| + | queryp = strchr(input, '?'); |
| + | |
| + | do { |
| + | bool dotdot = TRUE; |
| + | if(*input == '.') { |
| + | /* A. If the input buffer begins with a prefix of "../" or "./", then |
| + | remove that prefix from the input buffer; otherwise, */ |
| + | |
| + | if(!strncmp("./", input, 2)) { |
| + | input += 2; |
| + | clen -= 2; |
| + | } |
| + | else if(!strncmp("../", input, 3)) { |
| + | input += 3; |
| + | clen -= 3; |
| + | } |
| + | /* D. if the input buffer consists only of "." or "..", then remove |
| + | that from the input buffer; otherwise, */ |
| + | |
| + | else if(!strcmp(".", input) || !strcmp("..", input) || |
| + | !strncmp(".?", input, 2) || !strncmp("..?", input, 3)) { |
| + | *out = 0; |
| + | break; |
| + | } |
| + | else |
| + | dotdot = FALSE; |
| + | } |
| + | else if(*input == '/') { |
| + | /* B. if the input buffer begins with a prefix of "/./" or "/.", where |
| + | "." is a complete path segment, then replace that prefix with "/" in |
| + | the input buffer; otherwise, */ |
| + | if(!strncmp("/./", input, 3)) { |
| + | input += 2; |
| + | clen -= 2; |
| + | } |
| + | else if(!strcmp("/.", input) || !strncmp("/.?", input, 3)) { |
| + | *outptr++ = '/'; |
| + | *outptr = 0; |
| + | break; |
| + | } |
| + | |
| + | /* C. if the input buffer begins with a prefix of "/../" or "/..", |
| + | where ".." is a complete path segment, then replace that prefix with |
| + | "/" in the input buffer and remove the last segment and its |
| + | preceding "/" (if any) from the output buffer; otherwise, */ |
| + | |
| + | else if(!strncmp("/../", input, 4)) { |
| + | input += 3; |
| + | clen -= 3; |
| + | /* remove the last segment from the output buffer */ |
| + | while(outptr > out) { |
| + | outptr--; |
| + | if(*outptr == '/') |
| + | break; |
| + | } |
| + | *outptr = 0; /* null-terminate where it stops */ |
| + | } |
| + | else if(!strcmp("/..", input) || !strncmp("/..?", input, 4)) { |
| + | /* remove the last segment from the output buffer */ |
| + | while(outptr > out) { |
| + | outptr--; |
| + | if(*outptr == '/') |
| + | break; |
| + | } |
| + | *outptr++ = '/'; |
| + | *outptr = 0; /* null-terminate where it stops */ |
| + | break; |
| + | } |
| + | else |
| + | dotdot = FALSE; |
| + | } |
| + | else |
| + | dotdot = FALSE; |
| + | |
| + | if(!dotdot) { |
| + | /* E. move the first path segment in the input buffer to the end of |
| + | the output buffer, including the initial "/" character (if any) and |
| + | any subsequent characters up to, but not including, the next "/" |
| + | character or the end of the input buffer. */ |
| + | |
| + | do { |
| + | *outptr++ = *input++; |
| + | clen--; |
| + | } while(*input && (*input != '/') && (*input != '?')); |
| + | *outptr = 0; |
| + | } |
| + | |
| + | /* continue until end of input string OR, if there is a terminating |
| + | query part, stop there */ |
| + | } while(*input && (!queryp || (input < queryp))); |
| + | |
| + | if(queryp) { |
| + | size_t qlen; |
| + | /* There was a query part, append that to the output. */ |
| + | size_t oindex = queryp - orginput; |
| + | qlen = strlen(&orginput[oindex]); |
| + | memcpy(outptr, &orginput[oindex], qlen + 1); /* include zero byte */ |
| + | } |
| + | |
| + | return out; |
| + | } |
| + | |
| + | static CURLUcode parseurl(const char *url, CURLU *u, unsigned int flags) |
| + | { |
| + | const char *path; |
| + | size_t pathlen; |
| bool uncpath = FALSE; | |
| - | char *hostname; |
| char *query = NULL; | |
| char *fragment = NULL; | |
| - | CURLUcode result; |
| - | bool url_has_scheme = FALSE; |
| char schemebuf[MAX_SCHEME_LEN + 1]; | |
| const char *schemep = NULL; | |
| size_t schemelen = 0; | |
| size_t urllen; | |
| + | CURLUcode result = CURLUE_OK; |
| + | size_t fraglen = 0; |
| + | struct dynbuf host; |
| DEBUGASSERT(url); | |
| + | Curl_dyn_init(&host, CURL_MAX_INPUT_LENGTH); |
| + | |
| /************************************************************* | |
| * Parse the URL. | |
| ************************************************************/ | |
| /* allocate scratch area */ | |
| urllen = strlen(url); | |
| - | if(urllen > CURL_MAX_INPUT_LENGTH) |
| + | if(urllen > CURL_MAX_INPUT_LENGTH) { |
| /* excessive input length */ | |
| - | return CURLUE_MALFORMED_INPUT; |
| - | |
| - | path = u->scratch = malloc(urllen * 2 + 2); |
| - | if(!path) |
| - | return CURLUE_OUT_OF_MEMORY; |
| - | |
| - | hostname = &path[urllen + 1]; |
| - | hostname[0] = 0; |
| - | |
| - | if(Curl_is_absolute_url(url, schemebuf, sizeof(schemebuf))) { |
| - | url_has_scheme = TRUE; |
| - | schemelen = strlen(schemebuf); |
| + | result = CURLUE_MALFORMED_INPUT; |
| + | goto fail; |
| } | |
| + | schemelen = Curl_is_absolute_url(url, schemebuf, sizeof(schemebuf)); |
| + | |
| /* handle the file: scheme */ | |
| - | if(url_has_scheme && !strcmp(schemebuf, "file")) { |
| - | if(urllen <= 6) |
| + | if(schemelen && !strcmp(schemebuf, "file")) { |
| + | if(urllen <= 6) { |
| /* file:/ is not enough to actually be a complete file: URL */ | |
| - | return CURLUE_BAD_FILE_URL; |
| + | result = CURLUE_BAD_FILE_URL; |
| + | goto fail; |
| + | } |
| /* path has been allocated large enough to hold this */ | |
| - | strcpy(path, &url[5]); |
| + | path = (char *)&url[5]; |
| - | u->scheme = strdup("file"); |
| - | if(!u->scheme) |
| - | return CURLUE_OUT_OF_MEMORY; |
| + | schemep = u->scheme = strdup("file"); |
| + | if(!u->scheme) { |
| + | result = CURLUE_OUT_OF_MEMORY; |
| + | goto fail; |
| + | } |
| /* Extra handling URLs with an authority component (i.e. that start with | |
| * "file://") | |
| @@ -869,7 +961,7 @@ static CURLUcode seturl(const char *url, CURLU *u, unsigned int flags) | |
| */ | |
| if(path[0] == '/' && path[1] == '/') { | |
| /* swallow the two slashes */ | |
| - | char *ptr = &path[2]; |
| + | const char *ptr = &path[2]; |
| /* | |
| * According to RFC 8089, a file: URL can be reliably dereferenced if: | |
| @@ -905,13 +997,17 @@ static CURLUcode seturl(const char *url, CURLU *u, unsigned int flags) | |
| chars, and the delimiting slash character must be appended to the | |
| host name */ | |
| path = strpbrk(ptr, "/\\:*?\"<>|"); | |
| - | if(!path || *path != '/') |
| - | return CURLUE_BAD_FILE_URL; |
| + | if(!path || *path != '/') { |
| + | result = CURLUE_BAD_FILE_URL; |
| + | goto fail; |
| + | } |
| len = path - ptr; | |
| if(len) { | |
| - | memcpy(hostname, ptr, len); |
| - | hostname[len] = 0; |
| + | if(Curl_dyn_addn(&host, ptr, len)) { |
| + | result = CURLUE_OUT_OF_MEMORY; |
| + | goto fail; |
| + | } |
| uncpath = TRUE; | |
| } | |
| @@ -919,7 +1015,8 @@ static CURLUcode seturl(const char *url, CURLU *u, unsigned int flags) | |
| #else | |
| /* Invalid file://hostname/, expected localhost or 127.0.0.1 or | |
| none */ | |
| - | return CURLUE_BAD_FILE_URL; |
| + | result = CURLUE_BAD_FILE_URL; |
| + | goto fail; |
| #endif | |
| } | |
| } | |
| @@ -928,7 +1025,8 @@ static CURLUcode seturl(const char *url, CURLU *u, unsigned int flags) | |
| } | |
| if(!uncpath) | |
| - | hostname = NULL; /* no host for file: URLs by default */ |
| + | /* no host for file: URLs by default */ |
| + | Curl_dyn_reset(&host); |
| #if !defined(MSDOS) && !defined(WIN32) && !defined(__CYGWIN__) | |
| /* Don't allow Windows drive letters when not in Windows. | |
| @@ -936,13 +1034,14 @@ static CURLUcode seturl(const char *url, CURLU *u, unsigned int flags) | |
| if(('/' == path[0] && STARTS_WITH_URL_DRIVE_PREFIX(&path[1])) || | |
| STARTS_WITH_URL_DRIVE_PREFIX(path)) { | |
| /* File drive letters are only accepted in MSDOS/Windows */ | |
| - | return CURLUE_BAD_FILE_URL; |
| + | result = CURLUE_BAD_FILE_URL; |
| + | goto fail; |
| } | |
| #else | |
| /* If the path starts with a slash and a drive letter, ditch the slash */ | |
| if('/' == path[0] && STARTS_WITH_URL_DRIVE_PREFIX(&path[1])) { | |
| /* This cannot be done with strcpy, as the memory chunks overlap! */ | |
| - | memmove(path, &path[1], strlen(&path[1]) + 1); |
| + | path++; |
| } | |
| #endif | |
| @@ -952,32 +1051,39 @@ static CURLUcode seturl(const char *url, CURLU *u, unsigned int flags) | |
| const char *p; | |
| const char *hostp; | |
| size_t len; | |
| - | path[0] = 0; |
| - | if(url_has_scheme) { |
| + | if(schemelen) { |
| int i = 0; | |
| p = &url[schemelen + 1]; | |
| while(p && (*p == '/') && (i < 4)) { | |
| p++; | |
| i++; | |
| } | |
| - | if((i < 1) || (i>3)) |
| + | if((i < 1) || (i>3)) { |
| /* less than one or more than three slashes */ | |
| - | return CURLUE_BAD_SLASHES; |
| + | result = CURLUE_BAD_SLASHES; |
| + | goto fail; |
| + | } |
| schemep = schemebuf; | |
| if(!Curl_builtin_scheme(schemep) && | |
| - | !(flags & CURLU_NON_SUPPORT_SCHEME)) |
| - | return CURLUE_UNSUPPORTED_SCHEME; |
| + | !(flags & CURLU_NON_SUPPORT_SCHEME)) { |
| + | result = CURLUE_UNSUPPORTED_SCHEME; |
| + | goto fail; |
| + | } |
| - | if(junkscan(schemep, flags)) |
| - | return CURLUE_BAD_SCHEME; |
| + | if(junkscan(schemep, flags)) { |
| + | result = CURLUE_BAD_SCHEME; |
| + | goto fail; |
| + | } |
| } | |
| else { | |
| /* no scheme! */ | |
| - | if(!(flags & (CURLU_DEFAULT_SCHEME|CURLU_GUESS_SCHEME))) |
| - | return CURLUE_BAD_SCHEME; |
| + | if(!(flags & (CURLU_DEFAULT_SCHEME|CURLU_GUESS_SCHEME))) { |
| + | result = CURLUE_BAD_SCHEME; |
| + | goto fail; |
| + | } |
| if(flags & CURLU_DEFAULT_SCHEME) | |
| schemep = DEFAULT_SCHEME; | |
| @@ -994,122 +1100,156 @@ static CURLUcode seturl(const char *url, CURLU *u, unsigned int flags) | |
| len = p - hostp; | |
| if(len) { | |
| - | memcpy(hostname, hostp, len); |
| - | hostname[len] = 0; |
| + | if(Curl_dyn_addn(&host, hostp, len)) { |
| + | result = CURLUE_OUT_OF_MEMORY; |
| + | goto fail; |
| + | } |
| } | |
| else { | |
| - | if(!(flags & CURLU_NO_AUTHORITY)) |
| - | return CURLUE_NO_HOST; |
| + | if(!(flags & CURLU_NO_AUTHORITY)) { |
| + | result = CURLUE_NO_HOST; |
| + | goto fail; |
| + | } |
| } | |
| - | strcpy(path, p); |
| + | path = (char *)p; |
| if(schemep) { | |
| u->scheme = strdup(schemep); | |
| - | if(!u->scheme) |
| - | return CURLUE_OUT_OF_MEMORY; |
| + | if(!u->scheme) { |
| + | result = CURLUE_OUT_OF_MEMORY; |
| + | goto fail; |
| + | } |
| } | |
| } | |
| - | if((flags & CURLU_URLENCODE) && path[0]) { |
| - | /* worst case output length is 3x the original! */ |
| - | char *newp = malloc(strlen(path) * 3); |
| - | if(!newp) |
| - | return CURLUE_OUT_OF_MEMORY; |
| - | path_alloced = TRUE; |
| - | strcpy_url(newp, path, TRUE); /* consider it relative */ |
| - | u->temppath = path = newp; |
| + | if(*path && (flags & CURLU_URLENCODE)) { |
| + | struct dynbuf enc; |
| + | Curl_dyn_init(&enc, CURL_MAX_INPUT_LENGTH); |
| + | if(strcpy_url(&enc, path, TRUE)) { /* consider it relative */ |
| + | result = CURLUE_OUT_OF_MEMORY; |
| + | goto fail; |
| + | } |
| + | path = u->path = Curl_dyn_ptr(&enc); |
| } | |
| fragment = strchr(path, '#'); | |
| if(fragment) { | |
| - | *fragment++ = 0; |
| - | if(junkscan(fragment, flags)) |
| - | return CURLUE_BAD_FRAGMENT; |
| - | if(fragment[0]) { |
| - | u->fragment = strdup(fragment); |
| - | if(!u->fragment) |
| - | return CURLUE_OUT_OF_MEMORY; |
| + | fraglen = strlen(fragment); |
| + | if(fraglen > 1) { |
| + | /* skip the leading '#' in the copy but include the terminating null */ |
| + | u->fragment = Curl_memdup(fragment + 1, fraglen); |
| + | if(!u->fragment) { |
| + | result = CURLUE_OUT_OF_MEMORY; |
| + | goto fail; |
| + | } |
| + | |
| + | if(junkscan(u->fragment, flags)) { |
| + | result = CURLUE_BAD_FRAGMENT; |
| + | goto fail; |
| + | } |
| } | |
| } | |
| query = strchr(path, '?'); | |
| - | if(query) { |
| - | *query++ = 0; |
| - | if(junkscan(query, flags)) |
| - | return CURLUE_BAD_QUERY; |
| - | /* done even if the query part is a blank string */ |
| - | u->query = strdup(query); |
| - | if(!u->query) |
| - | return CURLUE_OUT_OF_MEMORY; |
| - | } |
| + | if(query && (!fragment || (query < fragment))) { |
| + | size_t qlen = strlen(query) - fraglen; /* includes '?' */ |
| + | pathlen = strlen(path) - qlen - fraglen; |
| + | if(qlen > 1) { |
| + | u->query = Curl_memdup(query + 1, qlen); |
| + | if(!u->query) { |
| + | result = CURLUE_OUT_OF_MEMORY; |
| + | goto fail; |
| + | } |
| + | u->query[qlen - 1] = 0; |
| - | if(junkscan(path, flags)) |
| - | return CURLUE_BAD_PATH; |
| + | if(junkscan(u->query, flags)) { |
| + | result = CURLUE_BAD_QUERY; |
| + | goto fail; |
| + | } |
| + | } |
| + | else { |
| + | /* single byte query */ |
| + | u->query = strdup(""); |
| + | if(!u->query) { |
| + | result = CURLUE_OUT_OF_MEMORY; |
| + | goto fail; |
| + | } |
| + | } |
| + | } |
| + | else |
| + | pathlen = strlen(path) - fraglen; |
| - | if(!path[0]) |
| - | /* if there's no path left set, unset */ |
| + | if(!pathlen) { |
| + | /* there is no path left, unset */ |
| path = NULL; | |
| + | } |
| else { | |
| + | if(!u->path) { |
| + | u->path = Curl_memdup(path, pathlen + 1); |
| + | if(!u->path) { |
| + | result = CURLUE_OUT_OF_MEMORY; |
| + | goto fail; |
| + | } |
| + | u->path[pathlen] = 0; |
| + | path = u->path; |
| + | } |
| + | else if(flags & CURLU_URLENCODE) |
| + | /* it might have encoded more than just the path so cut it */ |
| + | u->path[pathlen] = 0; |
| + | |
| + | if(junkscan(u->path, flags)) { |
| + | result = CURLUE_BAD_PATH; |
| + | goto fail; |
| + | } |
| + | |
| if(!(flags & CURLU_PATH_AS_IS)) { | |
| /* remove ../ and ./ sequences according to RFC3986 */ | |
| - | char *newp = Curl_dedotdotify(path); |
| - | if(!newp) |
| - | return CURLUE_OUT_OF_MEMORY; |
| - | |
| - | if(strcmp(newp, path)) { |
| - | /* if we got a new version */ |
| - | if(path_alloced) |
| - | Curl_safefree(u->temppath); |
| - | u->temppath = path = newp; |
| - | path_alloced = TRUE; |
| + | char *newp = dedotdotify((char *)path, pathlen); |
| + | if(!newp) { |
| + | result = CURLUE_OUT_OF_MEMORY; |
| + | goto fail; |
| } | |
| - | else |
| - | free(newp); |
| + | free(u->path); |
| + | u->path = newp; |
| } | |
| - | |
| - | u->path = path_alloced?path:strdup(path); |
| - | if(!u->path) |
| - | return CURLUE_OUT_OF_MEMORY; |
| - | u->temppath = NULL; /* used now */ |
| } | |
| - | if(hostname) { |
| + | if(Curl_dyn_len(&host)) { |
| char normalized_ipv4[sizeof("255.255.255.255") + 1]; | |
| /* | |
| * Parse the login details and strip them out of the host name. | |
| */ | |
| - | result = parse_hostname_login(u, &hostname, flags); |
| - | if(result) |
| - | return result; |
| - | |
| - | result = Curl_parse_port(u, hostname, url_has_scheme); |
| + | result = parse_hostname_login(u, &host, flags); |
| + | if(!result) |
| + | result = Curl_parse_port(u, &host, schemelen); |
| if(result) | |
| - | return result; |
| + | goto fail; |
| - | if(junkscan(hostname, flags)) |
| - | return CURLUE_BAD_HOSTNAME; |
| + | if(junkscan(Curl_dyn_ptr(&host), flags)) { |
| + | result = CURLUE_BAD_HOSTNAME; |
| + | goto fail; |
| + | } |
| - | if(0 == strlen(hostname) && (flags & CURLU_NO_AUTHORITY)) { |
| - | /* Skip hostname check, it's allowed to be empty. */ |
| - | u->host = strdup(""); |
| + | if(ipv4_normalize(Curl_dyn_ptr(&host), |
| + | normalized_ipv4, sizeof(normalized_ipv4))) { |
| + | Curl_dyn_reset(&host); |
| + | if(Curl_dyn_add(&host, normalized_ipv4)) { |
| + | result = CURLUE_OUT_OF_MEMORY; |
| + | goto fail; |
| + | } |
| } | |
| else { | |
| - | if(ipv4_normalize(hostname, normalized_ipv4, sizeof(normalized_ipv4))) |
| - | u->host = strdup(normalized_ipv4); |
| - | else { |
| - | result = decode_host(hostname, &u->host); |
| - | if(result) |
| - | return result; |
| - | result = hostname_check(u, u->host); |
| - | if(result) |
| - | return result; |
| - | } |
| + | result = decode_host(&host); |
| + | if(!result) |
| + | result = hostname_check(u, Curl_dyn_ptr(&host), Curl_dyn_len(&host)); |
| + | if(result) |
| + | goto fail; |
| } | |
| - | if(!u->host) |
| - | return CURLUE_OUT_OF_MEMORY; |
| + | |
| if((flags & CURLU_GUESS_SCHEME) && !schemep) { | |
| + | const char *hostname = Curl_dyn_ptr(&host); |
| /* legacy curl-style guess based on host name */ | |
| if(checkprefix("ftp.", hostname)) | |
| schemep = "ftp"; | |
| @@ -1127,27 +1267,26 @@ static CURLUcode seturl(const char *url, CURLU *u, unsigned int flags) | |
| schemep = "http"; | |
| u->scheme = strdup(schemep); | |
| - | if(!u->scheme) |
| - | return CURLUE_OUT_OF_MEMORY; |
| + | if(!u->scheme) { |
| + | result = CURLUE_OUT_OF_MEMORY; |
| + | goto fail; |
| + | } |
| + | } |
| + | } |
| + | else if(flags & CURLU_NO_AUTHORITY) { |
| + | /* allowed to be empty. */ |
| + | if(Curl_dyn_add(&host, "")) { |
| + | result = CURLUE_OUT_OF_MEMORY; |
| + | goto fail; |
| } | |
| } | |
| - | Curl_safefree(u->scratch); |
| - | Curl_safefree(u->temppath); |
| + | u->host = Curl_dyn_ptr(&host); |
| - | return CURLUE_OK; |
| - | } |
| - | |
| - | /* |
| - | * Parse the URL and set the relevant members of the Curl_URL struct. |
| - | */ |
| - | static CURLUcode parseurl(const char *url, CURLU *u, unsigned int flags) |
| - | { |
| - | CURLUcode result = seturl(url, u, flags); |
| - | if(result) { |
| - | free_urlhandle(u); |
| - | memset(u, 0, sizeof(struct Curl_URL)); |
| - | } |
| + | return result; |
| + | fail: |
| + | Curl_dyn_free(&host); |
| + | free_urlhandle(u); |
| return result; | |
| } | |
| @@ -1165,8 +1304,6 @@ static CURLUcode parseurl_and_replace(const char *url, CURLU *u, | |
| free_urlhandle(u); | |
| *u = tmpurl; | |
| } | |
| - | else |
| - | free_urlhandle(&tmpurl); |
| return result; | |
| } | |
| @@ -1344,14 +1481,13 @@ CURLUcode curl_url_get(CURLU *u, CURLUPart what, | |
| if(u->host[0] == '[') { | |
| if(u->zoneid) { | |
| /* make it '[ host %25 zoneid ]' */ | |
| + | struct dynbuf enc; |
| size_t hostlen = strlen(u->host); | |
| - | size_t alen = hostlen + 3 + strlen(u->zoneid) + 1; |
| - | allochost = malloc(alen); |
| - | if(!allochost) |
| + | Curl_dyn_init(&enc, CURL_MAX_INPUT_LENGTH); |
| + | if(Curl_dyn_addf(&enc, "%.*s%%25%s]", (int)hostlen - 1, u->host, |
| + | u->zoneid)) |
| return CURLUE_OUT_OF_MEMORY; | |
| - | memcpy(allochost, u->host, hostlen - 1); |
| - | msnprintf(&allochost[hostlen - 1], alen - hostlen + 1, |
| - | "%%25%s]", u->zoneid); |
| + | allochost = Curl_dyn_ptr(&enc); |
| } | |
| } | |
| else if(urlencode) { | |
| @@ -1362,32 +1498,32 @@ CURLUcode curl_url_get(CURLU *u, CURLUPart what, | |
| else { | |
| /* only encode '%' in output host name */ | |
| char *host = u->host; | |
| - | size_t pcount = 0; |
| + | bool percent = FALSE; |
| /* first, count number of percents present in the name */ | |
| while(*host) { | |
| - | if(*host == '%') |
| - | pcount++; |
| + | if(*host == '%') { |
| + | percent = TRUE; |
| + | break; |
| + | } |
| host++; | |
| } | |
| - | /* if there were percents, encode the host name */ |
| - | if(pcount) { |
| - | size_t hostlen = strlen(u->host); |
| - | size_t alen = hostlen + 2 * pcount + 1; |
| - | char *o = allochost = malloc(alen); |
| - | if(!allochost) |
| - | return CURLUE_OUT_OF_MEMORY; |
| - | |
| + | /* if there were percent(s), encode the host name */ |
| + | if(percent) { |
| + | struct dynbuf enc; |
| + | CURLcode result; |
| + | Curl_dyn_init(&enc, CURL_MAX_INPUT_LENGTH); |
| host = u->host; | |
| while(*host) { | |
| - | if(*host == '%') { |
| - | memcpy(o, "%25", 3); |
| - | o += 3; |
| - | host++; |
| - | continue; |
| - | } |
| - | *o++ = *host++; |
| + | if(*host == '%') |
| + | result = Curl_dyn_addn(&enc, "%25", 3); |
| + | else |
| + | result = Curl_dyn_addn(&enc, host, 1); |
| + | if(result) |
| + | return CURLUE_OUT_OF_MEMORY; |
| + | host++; |
| } | |
| - | *o = '\0'; |
| + | free(u->host); |
| + | u->host = Curl_dyn_ptr(&enc); |
| } | |
| } | |
| @@ -1445,16 +1581,12 @@ CURLUcode curl_url_get(CURLU *u, CURLUPart what, | |
| *part = decoded; | |
| } | |
| if(urlencode) { | |
| - | /* worst case output length is 3x the original! */ |
| - | char *newp = malloc(strlen(*part) * 3); |
| - | if(!newp) |
| + | struct dynbuf enc; |
| + | Curl_dyn_init(&enc, CURL_MAX_INPUT_LENGTH); |
| + | if(strcpy_url(&enc, *part, TRUE)) /* consider it relative */ |
| return CURLUE_OUT_OF_MEMORY; | |
| - | if(strcpy_url(newp, *part, TRUE)) { /* consider it relative */ |
| - | free(*part); |
| - | *part = newp; |
| - | } |
| - | else |
| - | free(newp); |
| + | free(*part); |
| + | *part = Curl_dyn_ptr(&enc); |
| } | |
| return CURLUE_OK; | |
| @@ -1628,14 +1760,16 @@ CURLUcode curl_url_set(CURLU *u, CURLUPart what, | |
| if(urlencode) { | |
| const unsigned char *i; | |
| - | char *o; |
| - | char *enc = malloc(nalloc * 3 + 1); /* for worst case! */ |
| - | if(!enc) |
| - | return CURLUE_OUT_OF_MEMORY; |
| - | for(i = (const unsigned char *)part, o = enc; *i; i++) { |
| + | struct dynbuf enc; |
| + | |
| + | Curl_dyn_init(&enc, nalloc * 3 + 1); |
| + | |
| + | for(i = (const unsigned char *)part; *i; i++) { |
| + | CURLcode result; |
| if((*i == ' ') && plusencode) { | |
| - | *o = '+'; |
| - | o++; |
| + | result = Curl_dyn_addn(&enc, "+", 1); |
| + | if(result) |
| + | return CURLUE_OUT_OF_MEMORY; |
| } | |
| else if(Curl_isunreserved(*i) || | |
| ((*i == '/') && urlskipslash) || | |
| @@ -1643,16 +1777,17 @@ CURLUcode curl_url_set(CURLU *u, CURLUPart what, | |
| if((*i == '=') && equalsencode) | |
| /* only skip the first equals sign */ | |
| equalsencode = FALSE; | |
| - | *o = *i; |
| - | o++; |
| + | result = Curl_dyn_addn(&enc, i, 1); |
| + | if(result) |
| + | return CURLUE_OUT_OF_MEMORY; |
| } | |
| else { | |
| - | msnprintf(o, 4, "%%%02x", *i); |
| - | o += 3; |
| + | result = Curl_dyn_addf(&enc, "%%%02x", *i); |
| + | if(result) |
| + | return CURLUE_OUT_OF_MEMORY; |
| } | |
| } | |
| - | *o = 0; /* null-terminate */ |
| - | newp = enc; |
| + | newp = Curl_dyn_ptr(&enc); |
| } | |
| else { | |
| char *p; | |
| @@ -1674,34 +1809,41 @@ CURLUcode curl_url_set(CURLU *u, CURLUPart what, | |
| } | |
| if(appendquery) { | |
| - | /* Append the string onto the old query. Add a '&' separator if none is |
| - | present at the end of the existing query already */ |
| + | /* Append the 'newp' string onto the old query. Add a '&' separator if |
| + | none is present at the end of the existing query already */ |
| + | |
| size_t querylen = u->query ? strlen(u->query) : 0; | |
| bool addamperand = querylen && (u->query[querylen -1] != '&'); | |
| if(querylen) { | |
| - | size_t newplen = strlen(newp); |
| - | char *p = malloc(querylen + addamperand + newplen + 1); |
| - | if(!p) { |
| - | free((char *)newp); |
| - | return CURLUE_OUT_OF_MEMORY; |
| + | struct dynbuf enc; |
| + | Curl_dyn_init(&enc, CURL_MAX_INPUT_LENGTH); |
| + | |
| + | if(Curl_dyn_addn(&enc, u->query, querylen)) /* add original query */ |
| + | goto nomem; |
| + | |
| + | if(addamperand) { |
| + | if(Curl_dyn_addn(&enc, "&", 1)) |
| + | goto nomem; |
| } | |
| - | strcpy(p, u->query); /* original query */ |
| - | if(addamperand) |
| - | p[querylen] = '&'; /* ampersand */ |
| - | strcpy(&p[querylen + addamperand], newp); /* new suffix */ |
| + | if(Curl_dyn_add(&enc, newp)) |
| + | goto nomem; |
| free((char *)newp); | |
| free(*storep); | |
| - | *storep = p; |
| + | *storep = Curl_dyn_ptr(&enc); |
| return CURLUE_OK; | |
| + | nomem: |
| + | free((char *)newp); |
| + | return CURLUE_OUT_OF_MEMORY; |
| } | |
| } | |
| if(what == CURLUPART_HOST) { | |
| - | if(0 == strlen(newp) && (flags & CURLU_NO_AUTHORITY)) { |
| + | size_t n = strlen(newp); |
| + | if(!n && (flags & CURLU_NO_AUTHORITY)) { |
| /* Skip hostname check, it's allowed to be empty. */ | |
| } | |
| else { | |
| - | if(hostname_check(u, (char *)newp)) { |
| + | if(hostname_check(u, (char *)newp, n)) { |
| free((char *)newp); | |
| return CURLUE_BAD_HOSTNAME; | |
| } | |
| @@ -23,7 +23,8 @@ | |
| ***************************************************************************/ | |
| #include "curlcheck.h" | |
| - | #include "dotdot.h" |
| + | /* copied from urlapi.c */ |
| + | extern char *dedotdotify(const char *input, size_t clen); |
| #include "memdebug.h" | |
| @@ -77,7 +78,7 @@ UNITTEST_START | |
| }; | |
| for(i = 0; i < sizeof(pairs)/sizeof(pairs[0]); i++) { | |
| - | char *out = Curl_dedotdotify(pairs[i].input); |
| + | char *out = dedotdotify(pairs[i].input, strlen(pairs[i].input)); |
| abort_unless(out != NULL, "returned NULL!"); | |
| if(strcmp(out, pairs[i].output)) { | |
| @@ -44,6 +44,19 @@ unit_stop(void) | |
| #define free_and_clear(x) free(x); x = NULL | |
| + | static CURLUcode parse_port(CURLU *url, |
| + | char *h, bool has_scheme) |
| + | { |
| + | struct dynbuf host; |
| + | CURLUcode ret; |
| + | Curl_dyn_init(&host, 10000); |
| + | if(Curl_dyn_add(&host, h)) |
| + | return CURLUE_OUT_OF_MEMORY; |
| + | ret = Curl_parse_port(url, &host, has_scheme); |
| + | Curl_dyn_free(&host); |
| + | return ret; |
| + | } |
| + | |
| UNITTEST_START | |
| { | |
| CURLUcode ret; | |
| @@ -57,8 +70,8 @@ UNITTEST_START | |
| ipv6port = strdup("[fe80::250:56ff:fea7:da15]"); | |
| if(!ipv6port) | |
| goto fail; | |
| - | ret = Curl_parse_port(u, ipv6port, FALSE); |
| - | fail_unless(ret == CURLUE_OK, "Curl_parse_port returned error"); |
| + | ret = parse_port(u, ipv6port, FALSE); |
| + | fail_unless(ret == CURLUE_OK, "parse_port returned error"); |
| ret = curl_url_get(u, CURLUPART_PORT, &portnum, CURLU_NO_DEFAULT_PORT); | |
| fail_unless(ret != CURLUE_OK, "curl_url_get portnum returned something"); | |
| free_and_clear(ipv6port); | |
| @@ -71,8 +84,8 @@ UNITTEST_START | |
| ipv6port = strdup("[fe80::250:56ff:fea7:da15|"); | |
| if(!ipv6port) | |
| goto fail; | |
| - | ret = Curl_parse_port(u, ipv6port, FALSE); |
| - | fail_unless(ret != CURLUE_OK, "Curl_parse_port true on error"); |
| + | ret = parse_port(u, ipv6port, FALSE); |
| + | fail_unless(ret != CURLUE_OK, "parse_port true on error"); |
| free_and_clear(ipv6port); | |
| curl_url_cleanup(u); | |
| @@ -82,8 +95,8 @@ UNITTEST_START | |
| ipv6port = strdup("[fe80::250:56ff;fea7:da15]:80"); | |
| if(!ipv6port) | |
| goto fail; | |
| - | ret = Curl_parse_port(u, ipv6port, FALSE); |
| - | fail_unless(ret != CURLUE_OK, "Curl_parse_port true on error"); |
| + | ret = parse_port(u, ipv6port, FALSE); |
| + | fail_unless(ret != CURLUE_OK, "parse_port true on error"); |
| free_and_clear(ipv6port); | |
| curl_url_cleanup(u); | |
| @@ -94,8 +107,8 @@ UNITTEST_START | |
| ipv6port = strdup("[fe80::250:56ff:fea7:da15%25eth3]:80"); | |
| if(!ipv6port) | |
| goto fail; | |
| - | ret = Curl_parse_port(u, ipv6port, FALSE); |
| - | fail_unless(ret == CURLUE_OK, "Curl_parse_port returned error"); |
| + | ret = parse_port(u, ipv6port, FALSE); |
| + | fail_unless(ret == CURLUE_OK, "parse_port returned error"); |
| ret = curl_url_get(u, CURLUPART_PORT, &portnum, 0); | |
| fail_unless(ret == CURLUE_OK, "curl_url_get portnum returned error"); | |
| fail_unless(portnum && !strcmp(portnum, "80"), "Check portnumber"); | |
| @@ -110,8 +123,8 @@ UNITTEST_START | |
| ipv6port = strdup("[fe80::250:56ff:fea7:da15%25eth3]"); | |
| if(!ipv6port) | |
| goto fail; | |
| - | ret = Curl_parse_port(u, ipv6port, FALSE); |
| - | fail_unless(ret == CURLUE_OK, "Curl_parse_port returned error"); |
| + | ret = parse_port(u, ipv6port, FALSE); |
| + | fail_unless(ret == CURLUE_OK, "parse_port returned error"); |
| free_and_clear(ipv6port); | |
| curl_url_cleanup(u); | |
| @@ -122,8 +135,8 @@ UNITTEST_START | |
| ipv6port = strdup("[fe80::250:56ff:fea7:da15]:81"); | |
| if(!ipv6port) | |
| goto fail; | |
| - | ret = Curl_parse_port(u, ipv6port, FALSE); |
| - | fail_unless(ret == CURLUE_OK, "Curl_parse_port returned error"); |
| + | ret = parse_port(u, ipv6port, FALSE); |
| + | fail_unless(ret == CURLUE_OK, "parse_port returned error"); |
| ret = curl_url_get(u, CURLUPART_PORT, &portnum, 0); | |
| fail_unless(ret == CURLUE_OK, "curl_url_get portnum returned error"); | |
| fail_unless(portnum && !strcmp(portnum, "81"), "Check portnumber"); | |
| @@ -138,8 +151,8 @@ UNITTEST_START | |
| ipv6port = strdup("[fe80::250:56ff:fea7:da15];81"); | |
| if(!ipv6port) | |
| goto fail; | |
| - | ret = Curl_parse_port(u, ipv6port, FALSE); |
| - | fail_unless(ret != CURLUE_OK, "Curl_parse_port true on error"); |
| + | ret = parse_port(u, ipv6port, FALSE); |
| + | fail_unless(ret != CURLUE_OK, "parse_port true on error"); |
| free_and_clear(ipv6port); | |
| curl_url_cleanup(u); | |
| @@ -149,8 +162,8 @@ UNITTEST_START | |
| ipv6port = strdup("[fe80::250:56ff:fea7:da15]80"); | |
| if(!ipv6port) | |
| goto fail; | |
| - | ret = Curl_parse_port(u, ipv6port, FALSE); |
| - | fail_unless(ret != CURLUE_OK, "Curl_parse_port true on error"); |
| + | ret = parse_port(u, ipv6port, FALSE); |
| + | fail_unless(ret != CURLUE_OK, "parse_port true on error"); |
| free_and_clear(ipv6port); | |
| curl_url_cleanup(u); | |
| @@ -162,8 +175,8 @@ UNITTEST_START | |
| ipv6port = strdup("[fe80::250:56ff:fea7:da15]:"); | |
| if(!ipv6port) | |
| goto fail; | |
| - | ret = Curl_parse_port(u, ipv6port, TRUE); |
| - | fail_unless(ret == CURLUE_OK, "Curl_parse_port returned error"); |
| + | ret = parse_port(u, ipv6port, TRUE); |
| + | fail_unless(ret == CURLUE_OK, "parse_port returned error"); |
| free_and_clear(ipv6port); | |
| curl_url_cleanup(u); | |
| @@ -174,8 +187,8 @@ UNITTEST_START | |
| ipv6port = strdup("[fe80::250:56ff:fea7:da15!25eth3]:80"); | |
| if(!ipv6port) | |
| goto fail; | |
| - | ret = Curl_parse_port(u, ipv6port, FALSE); |
| - | fail_unless(ret != CURLUE_OK, "Curl_parse_port returned non-error"); |
| + | ret = parse_port(u, ipv6port, FALSE); |
| + | fail_unless(ret != CURLUE_OK, "parse_port returned non-error"); |
| free_and_clear(ipv6port); | |
| curl_url_cleanup(u); | |
| @@ -186,8 +199,8 @@ UNITTEST_START | |
| ipv6port = strdup("[fe80::250:56ff:fea7:da15%eth3]:80"); | |
| if(!ipv6port) | |
| goto fail; | |
| - | ret = Curl_parse_port(u, ipv6port, FALSE); |
| - | fail_unless(ret == CURLUE_OK, "Curl_parse_port returned error"); |
| + | ret = parse_port(u, ipv6port, FALSE); |
| + | fail_unless(ret == CURLUE_OK, "parse_port returned error"); |
| free_and_clear(ipv6port); | |
| curl_url_cleanup(u); | |
| @@ -200,8 +213,8 @@ UNITTEST_START | |
| "aaaaaaaaaaaaaaaaaaaaaa:"); | |
| if(!ipv6port) | |
| goto fail; | |
| - | ret = Curl_parse_port(u, ipv6port, FALSE); |
| - | fail_unless(ret == CURLUE_BAD_PORT_NUMBER, "Curl_parse_port did wrong"); |
| + | ret = parse_port(u, ipv6port, FALSE); |
| + | fail_unless(ret == CURLUE_BAD_PORT_NUMBER, "parse_port did wrong"); |
| fail: | |
| free(ipv6port); | |
| curl_url_cleanup(u); | |