cookie: overhaul and cleanup
—
$ git checkout -f be39ed19a5124a900626ab377e2afe5f41839830
Previous HEAD position was d0377f5a86 multi: convert Curl_follow to static multi_follow
HEAD is now at be39ed19a5 cookie: overhaul and cleanup
$ git clean -fdx
Removing Makefile
Removing Makefile.in
Removing aclocal.m4
Removing autom4te.cache/
Removing buildinfo.txt
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/examples/.deps/
Removing docs/examples/Makefile
Removing docs/examples/Makefile.in
Removing docs/libcurl/Makefile
Removing docs/libcurl/Makefile.in
Removing docs/libcurl/opts/Makefile
Removing docs/libcurl/opts/Makefile.in
Removing include/Makefile
Removing include/Makefile.in
Removing include/curl/Makefile
Removing include/curl/Makefile.in
Removing install-sh
Removing lib/.deps/
Removing lib/.dirstamp
Removing lib/.libs/
Removing lib/Makefile
Removing lib/Makefile.in
Removing lib/base64.o
Removing lib/curl_config.h
Removing lib/curl_config.h.in
Removing lib/curl_multibyte.o
Removing lib/dynbuf.o
Removing lib/libcurl.la
Removing lib/libcurl.vers
Removing lib/libcurl_la-altsvc.lo
Removing lib/libcurl_la-altsvc.o
Removing lib/libcurl_la-amigaos.lo
Removing lib/libcurl_la-amigaos.o
Removing lib/libcurl_la-asyn-ares.lo
Removing lib/libcurl_la-asyn-ares.o
Removing lib/libcurl_la-asyn-thread.lo
Removing lib/libcurl_la-asyn-thread.o
Removing lib/libcurl_la-base64.lo
Removing lib/libcurl_la-base64.o
Removing lib/libcurl_la-bufq.lo
Removing lib/libcurl_la-bufq.o
Removing lib/libcurl_la-bufref.lo
Removing lib/libcurl_la-bufref.o
Removing lib/libcurl_la-c-hyper.lo
Removing lib/libcurl_la-c-hyper.o
Removing lib/libcurl_la-cf-h1-proxy.lo
Removing lib/libcurl_la-cf-h1-proxy.o
Removing lib/libcurl_la-cf-h2-proxy.lo
Removing lib/libcurl_la-cf-h2-proxy.o
Removing lib/libcurl_la-cf-haproxy.lo
Removing lib/libcurl_la-cf-haproxy.o
Removing lib/libcurl_la-cf-https-connect.lo
Removing lib/libcurl_la-cf-https-connect.o
Removing lib/libcurl_la-cf-socket.lo
Removing lib/libcurl_la-cf-socket.o
Removing lib/libcurl_la-cfilters.lo
Removing lib/libcurl_la-cfilters.o
Removing lib/libcurl_la-conncache.lo
Removing lib/libcurl_la-conncache.o
Removing lib/libcurl_la-connect.lo
Removing lib/libcurl_la-connect.o
Removing lib/libcurl_la-content_encoding.lo
Removing lib/libcurl_la-content_encoding.o
Removing lib/libcurl_la-cookie.lo
Removing lib/libcurl_la-cookie.o
Removing lib/libcurl_la-curl_addrinfo.lo
Removing lib/libcurl_la-curl_addrinfo.o
Removing lib/libcurl_la-curl_des.lo
Removing lib/libcurl_la-curl_des.o
Removing lib/libcurl_la-curl_endian.lo
Removing lib/libcurl_la-curl_endian.o
Removing lib/libcurl_la-curl_fnmatch.lo
Removing lib/libcurl_la-curl_fnmatch.o
Removing lib/libcurl_la-curl_get_line.lo
Removing lib/libcurl_la-curl_get_line.o
Removing lib/libcurl_la-curl_gethostname.lo
Removing lib/libcurl_la-curl_gethostname.o
Removing lib/libcurl_la-curl_gssapi.lo
Removing lib/libcurl_la-curl_gssapi.o
Removing lib/libcurl_la-curl_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_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_sha512_256.lo
Removing lib/libcurl_la-curl_sha512_256.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-curl_trc.lo
Removing lib/libcurl_la-curl_trc.o
Removing lib/libcurl_la-cw-out.lo
Removing lib/libcurl_la-cw-out.o
Removing lib/libcurl_la-dict.lo
Removing lib/libcurl_la-dict.o
Removing lib/libcurl_la-dllmain.lo
Removing lib/libcurl_la-dllmain.o
Removing lib/libcurl_la-doh.lo
Removing lib/libcurl_la-doh.o
Removing lib/libcurl_la-dynbuf.lo
Removing lib/libcurl_la-dynbuf.o
Removing lib/libcurl_la-dynhds.lo
Removing lib/libcurl_la-dynhds.o
Removing lib/libcurl_la-easy.lo
Removing lib/libcurl_la-easy.o
Removing lib/libcurl_la-easygetopt.lo
Removing lib/libcurl_la-easygetopt.o
Removing lib/libcurl_la-easyoptions.lo
Removing lib/libcurl_la-easyoptions.o
Removing lib/libcurl_la-escape.lo
Removing lib/libcurl_la-escape.o
Removing lib/libcurl_la-file.lo
Removing lib/libcurl_la-file.o
Removing lib/libcurl_la-fileinfo.lo
Removing lib/libcurl_la-fileinfo.o
Removing lib/libcurl_la-fopen.lo
Removing lib/libcurl_la-fopen.o
Removing lib/libcurl_la-formdata.lo
Removing lib/libcurl_la-formdata.o
Removing lib/libcurl_la-ftp.lo
Removing lib/libcurl_la-ftp.o
Removing lib/libcurl_la-ftplistparser.lo
Removing lib/libcurl_la-ftplistparser.o
Removing lib/libcurl_la-getenv.lo
Removing lib/libcurl_la-getenv.o
Removing lib/libcurl_la-getinfo.lo
Removing lib/libcurl_la-getinfo.o
Removing lib/libcurl_la-gopher.lo
Removing lib/libcurl_la-gopher.o
Removing lib/libcurl_la-hash.lo
Removing lib/libcurl_la-hash.o
Removing lib/libcurl_la-headers.lo
Removing lib/libcurl_la-headers.o
Removing lib/libcurl_la-hmac.lo
Removing lib/libcurl_la-hmac.o
Removing lib/libcurl_la-hostasyn.lo
Removing lib/libcurl_la-hostasyn.o
Removing lib/libcurl_la-hostip.lo
Removing lib/libcurl_la-hostip.o
Removing lib/libcurl_la-hostip4.lo
Removing lib/libcurl_la-hostip4.o
Removing lib/libcurl_la-hostip6.lo
Removing lib/libcurl_la-hostip6.o
Removing lib/libcurl_la-hostsyn.lo
Removing lib/libcurl_la-hostsyn.o
Removing lib/libcurl_la-hsts.lo
Removing lib/libcurl_la-hsts.o
Removing lib/libcurl_la-http.lo
Removing lib/libcurl_la-http.o
Removing lib/libcurl_la-http1.lo
Removing lib/libcurl_la-http1.o
Removing lib/libcurl_la-http2.lo
Removing lib/libcurl_la-http2.o
Removing lib/libcurl_la-http_aws_sigv4.lo
Removing lib/libcurl_la-http_aws_sigv4.o
Removing lib/libcurl_la-http_chunks.lo
Removing lib/libcurl_la-http_chunks.o
Removing lib/libcurl_la-http_digest.lo
Removing lib/libcurl_la-http_digest.o
Removing lib/libcurl_la-http_negotiate.lo
Removing lib/libcurl_la-http_negotiate.o
Removing lib/libcurl_la-http_ntlm.lo
Removing lib/libcurl_la-http_ntlm.o
Removing lib/libcurl_la-http_proxy.lo
Removing lib/libcurl_la-http_proxy.o
Removing lib/libcurl_la-idn.lo
Removing lib/libcurl_la-idn.o
Removing lib/libcurl_la-if2ip.lo
Removing lib/libcurl_la-if2ip.o
Removing lib/libcurl_la-imap.lo
Removing lib/libcurl_la-imap.o
Removing lib/libcurl_la-inet_ntop.lo
Removing lib/libcurl_la-inet_ntop.o
Removing lib/libcurl_la-inet_pton.lo
Removing lib/libcurl_la-inet_pton.o
Removing lib/libcurl_la-krb5.lo
Removing lib/libcurl_la-krb5.o
Removing lib/libcurl_la-ldap.lo
Removing lib/libcurl_la-ldap.o
Removing lib/libcurl_la-llist.lo
Removing lib/libcurl_la-llist.o
Removing lib/libcurl_la-macos.lo
Removing lib/libcurl_la-macos.o
Removing lib/libcurl_la-md4.lo
Removing lib/libcurl_la-md4.o
Removing lib/libcurl_la-md5.lo
Removing lib/libcurl_la-md5.o
Removing lib/libcurl_la-memdebug.lo
Removing lib/libcurl_la-memdebug.o
Removing lib/libcurl_la-mime.lo
Removing lib/libcurl_la-mime.o
Removing lib/libcurl_la-mprintf.lo
Removing lib/libcurl_la-mprintf.o
Removing lib/libcurl_la-mqtt.lo
Removing lib/libcurl_la-mqtt.o
Removing lib/libcurl_la-multi.lo
Removing lib/libcurl_la-multi.o
Removing lib/libcurl_la-netrc.lo
Removing lib/libcurl_la-netrc.o
Removing lib/libcurl_la-nonblock.lo
Removing lib/libcurl_la-nonblock.o
Removing lib/libcurl_la-noproxy.lo
Removing lib/libcurl_la-noproxy.o
Removing lib/libcurl_la-openldap.lo
Removing lib/libcurl_la-openldap.o
Removing lib/libcurl_la-parsedate.lo
Removing lib/libcurl_la-parsedate.o
Removing lib/libcurl_la-pingpong.lo
Removing lib/libcurl_la-pingpong.o
Removing lib/libcurl_la-pop3.lo
Removing lib/libcurl_la-pop3.o
Removing lib/libcurl_la-progress.lo
Removing lib/libcurl_la-progress.o
Removing lib/libcurl_la-psl.lo
Removing lib/libcurl_la-psl.o
Removing lib/libcurl_la-rand.lo
Removing lib/libcurl_la-rand.o
Removing lib/libcurl_la-rename.lo
Removing lib/libcurl_la-rename.o
Removing lib/libcurl_la-request.lo
Removing lib/libcurl_la-request.o
Removing lib/libcurl_la-rtsp.lo
Removing lib/libcurl_la-rtsp.o
Removing lib/libcurl_la-select.lo
Removing lib/libcurl_la-select.o
Removing lib/libcurl_la-sendf.lo
Removing lib/libcurl_la-sendf.o
Removing lib/libcurl_la-setopt.lo
Removing lib/libcurl_la-setopt.o
Removing lib/libcurl_la-sha256.lo
Removing lib/libcurl_la-sha256.o
Removing lib/libcurl_la-share.lo
Removing lib/libcurl_la-share.o
Removing lib/libcurl_la-slist.lo
Removing lib/libcurl_la-slist.o
Removing lib/libcurl_la-smb.lo
Removing lib/libcurl_la-smb.o
Removing lib/libcurl_la-smtp.lo
Removing lib/libcurl_la-smtp.o
Removing lib/libcurl_la-socketpair.lo
Removing lib/libcurl_la-socketpair.o
Removing lib/libcurl_la-socks.lo
Removing lib/libcurl_la-socks.o
Removing lib/libcurl_la-socks_gssapi.lo
Removing lib/libcurl_la-socks_gssapi.o
Removing lib/libcurl_la-socks_sspi.lo
Removing lib/libcurl_la-socks_sspi.o
Removing lib/libcurl_la-speedcheck.lo
Removing lib/libcurl_la-speedcheck.o
Removing lib/libcurl_la-splay.lo
Removing lib/libcurl_la-splay.o
Removing lib/libcurl_la-strcase.lo
Removing lib/libcurl_la-strcase.o
Removing lib/libcurl_la-strdup.lo
Removing lib/libcurl_la-strdup.o
Removing lib/libcurl_la-strerror.lo
Removing lib/libcurl_la-strerror.o
Removing lib/libcurl_la-strtok.lo
Removing lib/libcurl_la-strtok.o
Removing lib/libcurl_la-strtoofft.lo
Removing lib/libcurl_la-strtoofft.o
Removing lib/libcurl_la-system_win32.lo
Removing lib/libcurl_la-system_win32.o
Removing lib/libcurl_la-telnet.lo
Removing lib/libcurl_la-telnet.o
Removing lib/libcurl_la-tftp.lo
Removing lib/libcurl_la-tftp.o
Removing lib/libcurl_la-timediff.lo
Removing lib/libcurl_la-timediff.o
Removing lib/libcurl_la-timeval.lo
Removing lib/libcurl_la-timeval.o
Removing lib/libcurl_la-transfer.lo
Removing lib/libcurl_la-transfer.o
Removing lib/libcurl_la-url.lo
Removing lib/libcurl_la-url.o
Removing lib/libcurl_la-urlapi.lo
Removing lib/libcurl_la-urlapi.o
Removing lib/libcurl_la-version.lo
Removing lib/libcurl_la-version.o
Removing lib/libcurl_la-version_win32.lo
Removing lib/libcurl_la-version_win32.o
Removing lib/libcurl_la-warnless.lo
Removing lib/libcurl_la-warnless.o
Removing lib/libcurl_la-ws.lo
Removing lib/libcurl_la-ws.o
Removing lib/nonblock.o
Removing lib/stamp-h1
Removing lib/strtoofft.o
Removing lib/timediff.o
Removing lib/vauth/.deps/
Removing lib/vauth/.dirstamp
Removing lib/vauth/libcurl_la-cleartext.lo
Removing lib/vauth/libcurl_la-cleartext.o
Removing lib/vauth/libcurl_la-cram.lo
Removing lib/vauth/libcurl_la-cram.o
Removing lib/vauth/libcurl_la-digest.lo
Removing lib/vauth/libcurl_la-digest.o
Removing lib/vauth/libcurl_la-digest_sspi.lo
Removing lib/vauth/libcurl_la-digest_sspi.o
Removing lib/vauth/libcurl_la-gsasl.lo
Removing lib/vauth/libcurl_la-gsasl.o
Removing lib/vauth/libcurl_la-krb5_gssapi.lo
Removing lib/vauth/libcurl_la-krb5_gssapi.o
Removing lib/vauth/libcurl_la-krb5_sspi.lo
Removing lib/vauth/libcurl_la-krb5_sspi.o
Removing lib/vauth/libcurl_la-ntlm.lo
Removing lib/vauth/libcurl_la-ntlm.o
Removing lib/vauth/libcurl_la-ntlm_sspi.lo
Removing lib/vauth/libcurl_la-ntlm_sspi.o
Removing lib/vauth/libcurl_la-oauth2.lo
Removing lib/vauth/libcurl_la-oauth2.o
Removing lib/vauth/libcurl_la-spnego_gssapi.lo
Removing lib/vauth/libcurl_la-spnego_gssapi.o
Removing lib/vauth/libcurl_la-spnego_sspi.lo
Removing lib/vauth/libcurl_la-spnego_sspi.o
Removing lib/vauth/libcurl_la-vauth.lo
Removing lib/vauth/libcurl_la-vauth.o
Removing lib/version_win32.o
Removing lib/vquic/.deps/
Removing lib/vquic/.dirstamp
Removing lib/vquic/libcurl_la-curl_msh3.lo
Removing lib/vquic/libcurl_la-curl_msh3.o
Removing lib/vquic/libcurl_la-curl_ngtcp2.lo
Removing lib/vquic/libcurl_la-curl_ngtcp2.o
Removing lib/vquic/libcurl_la-curl_osslq.lo
Removing lib/vquic/libcurl_la-curl_osslq.o
Removing lib/vquic/libcurl_la-curl_quiche.lo
Removing lib/vquic/libcurl_la-curl_quiche.o
Removing lib/vquic/libcurl_la-vquic-tls.lo
Removing lib/vquic/libcurl_la-vquic-tls.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-cipher_suite.lo
Removing lib/vtls/libcurl_la-cipher_suite.o
Removing lib/vtls/libcurl_la-gtls.lo
Removing lib/vtls/libcurl_la-gtls.o
Removing lib/vtls/libcurl_la-hostcheck.lo
Removing lib/vtls/libcurl_la-hostcheck.o
Removing lib/vtls/libcurl_la-keylog.lo
Removing lib/vtls/libcurl_la-keylog.o
Removing lib/vtls/libcurl_la-mbedtls.lo
Removing lib/vtls/libcurl_la-mbedtls.o
Removing lib/vtls/libcurl_la-mbedtls_threadlock.lo
Removing lib/vtls/libcurl_la-mbedtls_threadlock.o
Removing lib/vtls/libcurl_la-openssl.lo
Removing lib/vtls/libcurl_la-openssl.o
Removing lib/vtls/libcurl_la-rustls.lo
Removing lib/vtls/libcurl_la-rustls.o
Removing lib/vtls/libcurl_la-schannel.lo
Removing lib/vtls/libcurl_la-schannel.o
Removing lib/vtls/libcurl_la-schannel_verify.lo
Removing lib/vtls/libcurl_la-schannel_verify.o
Removing lib/vtls/libcurl_la-sectransp.lo
Removing lib/vtls/libcurl_la-sectransp.o
Removing lib/vtls/libcurl_la-vtls.lo
Removing lib/vtls/libcurl_la-vtls.o
Removing lib/vtls/libcurl_la-wolfssl.lo
Removing lib/vtls/libcurl_la-wolfssl.o
Removing lib/vtls/libcurl_la-x509asn1.lo
Removing lib/vtls/libcurl_la-x509asn1.o
Removing lib/warnless.o
Removing libcurl.pc
Removing libtool
Removing ltmain.sh
Removing m4/libtool.m4
Removing m4/ltoptions.m4
Removing m4/ltsugar.m4
Removing m4/ltversion.m4
Removing m4/lt~obsolete.m4
Removing missing
Removing packages/Makefile
Removing packages/Makefile.in
Removing packages/vms/Makefile
Removing packages/vms/Makefile.in
Removing scripts/Makefile
Removing scripts/Makefile.in
Removing src/.deps/
Removing src/.libs/
Removing src/Makefile
Removing src/Makefile.in
Removing src/curl
Removing src/slist_wc.o
Removing src/terminal.o
Removing src/tool_binmode.o
Removing src/tool_bname.o
Removing src/tool_ca_embed.c
Removing src/tool_ca_embed.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_soc.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_ipfs.o
Removing src/tool_libinfo.o
Removing src/tool_listhelp.o
Removing src/tool_main.o
Removing src/tool_msgs.o
Removing src/tool_operate.o
Removing src/tool_operhlp.o
Removing src/tool_paramhlp.o
Removing src/tool_parsecfg.o
Removing src/tool_progress.o
Removing src/tool_setopt.o
Removing src/tool_sleep.o
Removing src/tool_stderr.o
Removing src/tool_strdup.o
Removing src/tool_urlglob.o
Removing src/tool_util.o
Removing src/tool_vms.o
Removing src/tool_writeout.o
Removing src/tool_writeout_json.o
Removing src/tool_xattr.o
Removing src/var.o
Removing tests/Makefile
Removing tests/Makefile.in
Removing tests/certs/Makefile
Removing tests/certs/Makefile.in
Removing tests/certs/scripts/Makefile
Removing tests/certs/scripts/Makefile.in
Removing tests/config
Removing tests/configurehelp.pm
Removing tests/data/Makefile
Removing tests/data/Makefile.in
Removing tests/http/Makefile
Removing tests/http/Makefile.in
Removing tests/http/clients/.deps/
Removing tests/http/clients/Makefile
Removing tests/http/clients/Makefile.in
Removing tests/http/config.ini
Removing tests/libtest/.deps/
Removing tests/libtest/Makefile
Removing tests/libtest/Makefile.in
Removing tests/server/.deps/
Removing tests/server/Makefile
Removing tests/server/Makefile.in
Removing tests/unit/.deps/
Removing tests/unit/Makefile
Removing tests/unit/Makefile.in
$ autoreconf -fi
libtoolize: putting auxiliary files in '.'.
libtoolize: copying file './ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
libtoolize: copying file 'm4/libtool.m4'
libtoolize: copying file 'm4/ltoptions.m4'
libtoolize: copying file 'm4/ltsugar.m4'
libtoolize: copying file 'm4/ltversion.m4'
libtoolize: copying file 'm4/lt~obsolete.m4'
libtoolize: Remember to add 'LT_INIT' to configure.ac.
configure.ac:125: installing './compile'
configure.ac:437: installing './config.guess'
configure.ac:437: installing './config.sub'
configure.ac:125: installing './install-sh'
configure.ac:131: installing './missing'
docs/examples/Makefile.am: installing './depcomp'
$ 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 HTTPSRR support... no
checking whether to enable ECH support... no
checking for path separator... :
checking for sed... /usr/bin/sed
checking for grep... /usr/bin/grep
checking that grep -E works... yes
checking for ar... /usr/bin/ar
checking for a BSD-compatible install... /usr/bin/install -c
checking for gcc... ccache gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether the compiler supports GNU C... yes
checking whether ccache gcc accepts -g... yes
checking for ccache gcc option to enable C11 features... none needed
checking whether ccache gcc understands -c and -o together... yes
checking how to run the C preprocessor... ccache gcc -E
checking for stdio.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for strings.h... yes
checking for sys/stat.h... yes
checking for sys/types.h... yes
checking for unistd.h... yes
checking for stdatomic.h... yes
checking if _Atomic is available... yes
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for code coverage support... no
checking whether build environment is sane... yes
checking for a race-free mkdir -p... /usr/bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking whether make supports the include directive... yes (GNU style)
checking dependency style of ccache gcc... gcc3
checking curl version... 8.11.0-DEV
checking for httpd... no
checking for apache2... no
checking for apachectl... no
checking for apxs... no
configure: httpd/apache2 not in PATH, http tests disabled
configure: apxs not in PATH, http tests disabled
checking for nghttpx... no
checking for caddy... /usr/bin/caddy
checking build system type... x86_64-pc-linux-gnu
checking host system type... x86_64-pc-linux-gnu
checking for grep that handles long lines and -e... (cached) /usr/bin/grep
checking for egrep... /usr/bin/grep -E
checking if OS is AIX (to define _ALL_SOURCE)... no
checking if _THREAD_SAFE is already defined... no
checking if _THREAD_SAFE is actually needed... no
checking if _THREAD_SAFE is onwards defined... no
checking if _REENTRANT is already defined... no
checking if _REENTRANT is actually needed... no
checking if _REENTRANT is onwards defined... no
checking for special C compiler options needed for large files... no
checking for _FILE_OFFSET_BITS value needed for large files... no
checking how to print strings... printf
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for fgrep... /usr/bin/grep -F
checking for ld used by ccache gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu format... func_convert_file_noop
checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for dlltool... no
checking how to associate runtime and link libraries... printf %s\n
checking for archiver @FILE support... @
checking for strip... strip
checking for ranlib... ranlib
checking command to parse /usr/bin/nm -B output from ccache gcc object... ok
checking for sysroot... no
checking for a working dd... /usr/bin/dd
checking how to truncate binary pipes... /usr/bin/dd bs=4096 count=1
checking for mt... mt
checking if mt is a manifest tool... no
checking for dlfcn.h... yes
checking for objdir... .libs
checking if ccache gcc supports -fno-rtti -fno-exceptions... no
checking for ccache gcc option to produce PIC... -fPIC -DPIC
checking if ccache gcc PIC flag -fPIC -DPIC works... yes
checking if ccache gcc static flag -static works... yes
checking if ccache gcc supports -c -o file.o... yes
checking if ccache gcc supports -c -o file.o... (cached) yes
checking whether the ccache gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... no
checking whether to build static libraries... yes
checking whether to build shared libraries with -version-info... yes
checking whether to build shared libraries with -no-undefined... no
checking whether to build shared libraries with -mimpure-text... no
checking whether to build shared libraries with PIC... yes
checking whether to build static libraries with PIC... yes
checking whether to build shared libraries only... no
checking whether to build static libraries only... yes
checking for windres... no
checking 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 compiler version... gcc '1100' (raw: '11')
checking if compiler is SunPro C... no
checking if compiler is Tiny C... no
checking whether build target is a native Windows one... 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 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 build libcurl and curl in "unity" mode... no
checking whether to build tests into single-binary bundles... no
checking whether to support http... yes
checking whether to support ftp... yes
checking whether to support file... yes
checking whether to support IPFS... 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 build documentation... no
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 whether build target is a native Windows one... (cached) no
checking for proto/bsdsocket.h... no
checking for connect in libraries... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... yes
checking for monotonic clock_gettime... yes
checking for clock_gettime in libraries... no additional lib required
checking if monotonic clock_gettime works... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for raw monotonic clock_gettime... yes
checking for pkg-config... /usr/bin/pkg-config
checking for zlib options with pkg-config... found
checking for zlib.h... yes
configure: found both libz and libz.h header
checking for BrotliDecoderDecompress in -lbrotlidec... no
checking for brotli/decode.h... no
checking for ZSTD_createDStream in -lzstd... no
checking for zstd.h... no
checking for lber.h... no
checking for ldap.h... no
checking for ldap_ssl.h... no
checking for LDAP libraries... cannot find LDAP libraries
checking whether to enable IPv6... yes
checking if struct sockaddr_in6 has sin6_scope_id member... yes
checking if argv can be written to... yes
checking if GSS-API support is requested... no
checking whether to enable Windows native SSL/TLS... no
checking whether to enable Secure Transport... no
checking whether to enable Amiga native SSL/TLS (AmiSSL v5)... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libpsl options with pkg-config... found
checking for psl_builtin in -lpsl... yes
checking for libpsl.h... yes
checking for library containing gsasl_init... no
checking for RTMP_Init in -lrtmp... no
checking whether versioned symbols are wanted... no
checking whether to build with libidn2... (assumed) yes
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libidn2 options with pkg-config... no
configure: IDN_LIBS: "-lidn2"
configure: IDN_LDFLAGS: ""
configure: IDN_CPPFLAGS: ""
configure: IDN_DIR: ""
checking if idn2_lookup_ul can be linked... no
checking for idn2.h... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libnghttp2 options with pkg-config... no
checking for nghttp2_session_get_stream_local_window_size in -lnghttp2... no
checking for 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 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 sys/resource.h... yes
checking for libgen.h... yes
checking for locale.h... yes
checking for stdbool.h... yes
checking for sys/filio.h... no
checking for sys/wait.h... yes
checking for sys/eventfd.h... yes
checking for setjmp.h... yes
checking for an ANSI C-conforming const... yes
checking for size_t... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for struct timeval... yes
checking run-time libs availability... fine
checking size of size_t... 8
checking size of long... 8
checking size of int... 4
checking size of time_t... 8
checking size of off_t... 8
checking size of curl_off_t... 8
checking size of curl_socket_t... 4
checking for long long... yes
checking for ssize_t... yes
checking for bool... yes
checking for sa_family_t... yes
checking for suseconds_t... yes
checking if time_t is unsigned... no
checking for in_addr_t... yes
checking for struct sockaddr_storage... yes
checking for sys/select.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for select... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for recv... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for send... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for MSG_NOSIGNAL... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking if alarm can be linked... yes
checking if alarm is prototyped... yes
checking if alarm is compilable... yes
checking if alarm usage allowed... yes
checking if alarm might be used... yes
checking for sys/types.h... (cached) yes
checking for 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 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 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 whether build target is a native Windows one... (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 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 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 for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for sys/ioctl.h... (cached) yes
checking for stropts.h... no
checking if ioctl can be linked... yes
checking if ioctl is prototyped... yes
checking if ioctl is compilable... yes
checking if ioctl usage allowed... yes
checking if ioctl might be used... yes
checking if ioctl FIONBIO is compilable... yes
checking if ioctl FIONBIO usage allowed... yes
checking if ioctl FIONBIO might be used... yes
checking if ioctl SIOCGIFADDR is compilable... yes
checking if ioctl SIOCGIFADDR usage allowed... yes
checking if ioctl SIOCGIFADDR 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... yes
checking if memrchr is compilable... yes
checking if memrchr usage allowed... yes
checking if memrchr might be used... yes
checking for sys/types.h... (cached) 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 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... 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 _fseeki64... no
checking for eventfd... yes
checking for fnmatch... yes
checking for geteuid... yes
checking for getpass_r... 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 for pipe... yes
checking for poll... yes
checking for sched_yield... yes
checking for sendmsg... yes
checking for sendmmsg... yes
checking for setlocale... yes
checking for setmode... no
checking for setrlimit... yes
checking for snprintf... yes
checking for utime... yes
checking for utimes... yes
checking for arc4random... no
checking for fseeko... yes
checking whether fseeko is declared... yes
checking how to set a socket into non-blocking mode... fcntl O_NONBLOCK
checking whether to enable the threaded resolver... yes
checking whether to link macOS CoreFoundation, CoreServices, and SystemConfiguration frameworks... no
checking whether to use POSIX threads for threaded resolver... auto
checking for pthread.h... yes
checking for pthread_create... yes
checking for dirent.h... yes
checking for opendir... 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 basic authentication method... yes
checking whether to enable bearer authentication method... yes
checking whether to enable digest authentication method... yes
checking whether to enable kerberos authentication method... yes
checking whether to enable negotiate authentication method... yes
checking whether to enable aws sig methods... yes
checking whether to support NTLM... yes
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 binding connections locally... yes
checking whether to support the form API... yes
checking whether to support date parsing... yes
checking whether to support netrc parsing... yes
checking whether to support progress-meter... yes
checking whether to support the SHA-512/256 hash algorithm... yes
checking whether to support DNS shuffling... yes
checking whether to support curl_easy_option*... yes
checking whether to support alt-svc... yes
checking whether to support headers-api... yes
configure: disables HSTS due to lack of SSL
checking whether to support WebSockets... yes
checking whether hiding of library internal symbols will actually happen... yes
checking if this build supports HTTPS-proxy... no
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 tests/Makefile
config.status: creating tests/config
config.status: creating tests/configurehelp.pm
config.status: creating tests/certs/Makefile
config.status: creating tests/certs/scripts/Makefile
config.status: creating tests/data/Makefile
config.status: creating tests/server/Makefile
config.status: creating tests/libtest/Makefile
config.status: creating tests/unit/Makefile
config.status: creating tests/http/config.ini
config.status: creating tests/http/Makefile
config.status: creating tests/http/clients/Makefile
config.status: creating packages/Makefile
config.status: creating packages/vms/Makefile
config.status: creating curl-config
config.status: creating libcurl.pc
config.status: creating lib/curl_config.h
config.status: executing depfiles commands
config.status: executing libtool commands
configure: Configured to build curl/libcurl:
Host setup: x86_64-pc-linux-gnu
Install prefix: /usr/local
Compiler: ccache gcc
CFLAGS: -Werror-implicit-function-declaration -O2 -Wno-system-headers
CFLAGS extras:
CPPFLAGS: -D_GNU_SOURCE
LDFLAGS:
LIBS: -lpsl -lz
curl version: 8.11.0-DEV
SSL: no (--with-{openssl,gnutls,mbedtls,wolfssl,schannel,secure-transport,amissl,bearssl,rustls} )
SSH: no (--with-{libssh,libssh2})
zlib: enabled
brotli: no (--with-brotli)
zstd: no (--with-zstd)
GSS-API: no (--with-gssapi)
GSASL: no (libgsasl not found)
TLS-SRP: no (--enable-tls-srp)
resolver: POSIX threaded
IPv6: enabled
Unix sockets: enabled
IDN: no (--with-{libidn2,winidn})
Build docs: no
Build libcurl: Shared=no, Static=yes
Built-in manual: no (--enable-manual)
--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 cert embed: no
ca fallback:
LDAP: no (--enable-ldap / --with-ldap-lib / --with-lber-lib)
LDAPS: no (--enable-ldaps)
IPFS/IPNS: enabled
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)
HTTP3: no (--with-ngtcp2 --with-nghttp3, --with-quiche, --with-openssl-quic, --with-msh3)
ECH: no (--enable-ech)
Protocols: dict file ftp gopher http imap ipfs ipns mqtt pop3 rtsp smtp telnet tftp ws
Features: alt-svc AsynchDNS IPv6 Largefile libz PSL threadsafe UnixSockets
configure: WARNING: Cannot find libraries for LDAP support: LDAP disabled
configure: WARNING: libgsasl was not found
configure: WARNING: Cannot find libidn2
$ make -j3
Making all in lib
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make all-am
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
CC libcurl_la-altsvc.lo
CC libcurl_la-amigaos.lo
CC libcurl_la-asyn-ares.lo
CC libcurl_la-asyn-thread.lo
CC libcurl_la-base64.lo
CC libcurl_la-bufq.lo
CC libcurl_la-bufref.lo
CC libcurl_la-c-hyper.lo
CC libcurl_la-cf-h1-proxy.lo
CC libcurl_la-cf-haproxy.lo
CC libcurl_la-cf-h2-proxy.lo
CC libcurl_la-cf-https-connect.lo
CC libcurl_la-cf-socket.lo
CC libcurl_la-cfilters.lo
CC libcurl_la-conncache.lo
CC libcurl_la-connect.lo
CC libcurl_la-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_path.lo
CC libcurl_la-curl_range.lo
CC libcurl_la-curl_rtmp.lo
CC libcurl_la-curl_sasl.lo
CC libcurl_la-curl_sha512_256.lo
CC libcurl_la-curl_sspi.lo
CC libcurl_la-curl_threads.lo
CC libcurl_la-curl_trc.lo
CC libcurl_la-cw-out.lo
CC libcurl_la-dict.lo
CC libcurl_la-dllmain.lo
CC libcurl_la-doh.lo
CC libcurl_la-dynbuf.lo
CC libcurl_la-dynhds.lo
CC libcurl_la-easy.lo
CC libcurl_la-easygetopt.lo
CC libcurl_la-easyoptions.lo
CC libcurl_la-escape.lo
CC libcurl_la-file.lo
CC libcurl_la-fileinfo.lo
CC libcurl_la-fopen.lo
CC libcurl_la-formdata.lo
CC libcurl_la-ftp.lo
CC libcurl_la-ftplistparser.lo
CC libcurl_la-getenv.lo
CC libcurl_la-getinfo.lo
CC libcurl_la-gopher.lo
CC libcurl_la-hash.lo
CC libcurl_la-headers.lo
CC libcurl_la-hmac.lo
CC libcurl_la-hostasyn.lo
CC libcurl_la-hostip.lo
CC libcurl_la-hostip4.lo
CC libcurl_la-hostip6.lo
CC libcurl_la-hostsyn.lo
CC libcurl_la-hsts.lo
CC libcurl_la-http.lo
CC libcurl_la-http1.lo
CC libcurl_la-http2.lo
CC libcurl_la-http_aws_sigv4.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-idn.lo
CC libcurl_la-if2ip.lo
CC libcurl_la-imap.lo
CC libcurl_la-inet_ntop.lo
CC libcurl_la-inet_pton.lo
CC libcurl_la-krb5.lo
CC libcurl_la-ldap.lo
CC libcurl_la-llist.lo
CC libcurl_la-macos.lo
CC libcurl_la-md4.lo
CC libcurl_la-md5.lo
CC libcurl_la-memdebug.lo
CC libcurl_la-mime.lo
CC libcurl_la-mprintf.lo
CC libcurl_la-mqtt.lo
CC libcurl_la-multi.lo
CC libcurl_la-netrc.lo
CC libcurl_la-nonblock.lo
CC libcurl_la-noproxy.lo
CC libcurl_la-openldap.lo
CC libcurl_la-parsedate.lo
CC libcurl_la-pingpong.lo
CC libcurl_la-pop3.lo
CC libcurl_la-progress.lo
CC libcurl_la-psl.lo
CC libcurl_la-rand.lo
CC libcurl_la-rename.lo
CC libcurl_la-request.lo
CC libcurl_la-rtsp.lo
CC libcurl_la-select.lo
CC libcurl_la-sendf.lo
CC libcurl_la-setopt.lo
CC libcurl_la-sha256.lo
CC libcurl_la-share.lo
CC libcurl_la-slist.lo
CC libcurl_la-smb.lo
CC libcurl_la-smtp.lo
CC libcurl_la-socketpair.lo
CC libcurl_la-socks.lo
CC libcurl_la-socks_gssapi.lo
CC libcurl_la-socks_sspi.lo
CC libcurl_la-speedcheck.lo
CC libcurl_la-splay.lo
CC libcurl_la-strcase.lo
CC libcurl_la-strdup.lo
CC libcurl_la-strerror.lo
CC libcurl_la-strtok.lo
CC libcurl_la-strtoofft.lo
CC libcurl_la-system_win32.lo
CC libcurl_la-telnet.lo
CC libcurl_la-tftp.lo
CC libcurl_la-timediff.lo
CC libcurl_la-timeval.lo
CC libcurl_la-transfer.lo
CC libcurl_la-url.lo
CC libcurl_la-urlapi.lo
CC libcurl_la-version.lo
CC libcurl_la-version_win32.lo
CC libcurl_la-warnless.lo
CC libcurl_la-ws.lo
CC vauth/libcurl_la-cleartext.lo
CC vauth/libcurl_la-cram.lo
CC vauth/libcurl_la-digest.lo
CC vauth/libcurl_la-digest_sspi.lo
CC vauth/libcurl_la-gsasl.lo
CC vauth/libcurl_la-krb5_gssapi.lo
CC vauth/libcurl_la-krb5_sspi.lo
CC vauth/libcurl_la-ntlm.lo
CC vauth/libcurl_la-ntlm_sspi.lo
CC vauth/libcurl_la-oauth2.lo
CC vauth/libcurl_la-spnego_gssapi.lo
CC vauth/libcurl_la-spnego_sspi.lo
CC vauth/libcurl_la-vauth.lo
CC vtls/libcurl_la-bearssl.lo
CC vtls/libcurl_la-cipher_suite.lo
CC vtls/libcurl_la-gtls.lo
CC vtls/libcurl_la-hostcheck.lo
CC vtls/libcurl_la-keylog.lo
CC vtls/libcurl_la-mbedtls.lo
CC vtls/libcurl_la-mbedtls_threadlock.lo
CC vtls/libcurl_la-openssl.lo
CC vtls/libcurl_la-rustls.lo
CC vtls/libcurl_la-schannel.lo
CC vtls/libcurl_la-schannel_verify.lo
CC vtls/libcurl_la-sectransp.lo
CC vtls/libcurl_la-vtls.lo
CC vtls/libcurl_la-wolfssl.lo
CC vtls/libcurl_la-x509asn1.lo
CC vquic/libcurl_la-curl_msh3.lo
CC vquic/libcurl_la-curl_ngtcp2.lo
CC vquic/libcurl_la-curl_osslq.lo
CC vquic/libcurl_la-curl_quiche.lo
CC vquic/libcurl_la-vquic.lo
CC vquic/libcurl_la-vquic-tls.lo
CC vssh/libcurl_la-libssh.lo
CC vssh/libcurl_la-libssh2.lo
CC vssh/libcurl_la-wolfssh.lo
CCLD libcurl.la
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
Making all in docs
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in .
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
make[2]: Nothing to be done for 'all-am'.
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in cmdline-opts
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[2]: Nothing to be done for 'all'.
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
Making all in libcurl
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
Making all in opts
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
make[3]: Nothing to be done for 'all'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[3]: Nothing to be done for 'all-am'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in src
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
CC slist_wc.o
CC terminal.o
CC tool_binmode.o
CC tool_bname.o
CC tool_cb_dbg.o
CC tool_cb_hdr.o
CC tool_cb_rea.o
CC tool_cb_prg.o
CC tool_cb_see.o
CC tool_cb_soc.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
echo '#include "tool_hugehelp.h"' >> tool_hugehelp.c
CC tool_ipfs.o
CC tool_libinfo.o
CC tool_listhelp.o
CC tool_main.o
CC tool_msgs.o
CC tool_operate.o
CC tool_operhlp.o
CC tool_parsecfg.o
CC tool_paramhlp.o
CC tool_progress.o
CC tool_setopt.o
CC tool_sleep.o
CC tool_strdup.o
CC tool_stderr.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
echo 'extern const void *curl_ca_embed; const void *curl_ca_embed;' > tool_ca_embed.c
CC var.o
CC tool_hugehelp.o
CC tool_ca_embed.o
CC ../lib/base64.o
CC ../lib/curl_multibyte.o
CC ../lib/dynbuf.o
CC ../lib/nonblock.o
CC ../lib/strtoofft.o
CC ../lib/timediff.o
CC ../lib/version_win32.o
CC ../lib/warnless.o
CCLD curl
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
Making all in scripts
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/scripts'
make[1]: Nothing to be done for 'all'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/scripts'
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'
| @@ -28,33 +28,20 @@ | |
| RECEIVING COOKIE INFORMATION | |
| ============================ | |
| - | struct CookieInfo *Curl_cookie_init(struct Curl_easy *data, |
| - | const char *file, struct CookieInfo *inc, bool newsession); |
| + | Curl_cookie_init() |
| Inits a cookie struct to store data in a local file. This is always | |
| called before any cookies are set. | |
| - | struct Cookie *Curl_cookie_add(struct Curl_easy *data, |
| - | struct CookieInfo *c, bool httpheader, bool noexpire, |
| - | char *lineptr, const char *domain, const char *path, |
| - | bool secure); |
| - | |
| - | The 'lineptr' parameter is a full "Set-cookie:" line as |
| - | received from a server. |
| - | |
| - | The function need to replace previously stored lines that this new |
| - | line supersedes. |
| + | Curl_cookie_add() |
| - | It may remove lines that are expired. |
| - | |
| - | It should return an indication of success/error. |
| + | Adds a cookie to the in-memory cookie jar. |
| SENDING COOKIE INFORMATION | |
| ========================== | |
| - | struct Cookies *Curl_cookie_getlist(struct CookieInfo *cookie, |
| - | char *host, char *path, bool secure); |
| + | Curl_cookie_getlist() |
| For a given host and path, return a linked list of cookies that | |
| the client should send to the server if used now. The secure | |
| @@ -63,7 +50,6 @@ struct Cookies *Curl_cookie_getlist(struct CookieInfo *cookie, | |
| It shall only return cookies that have not expired. | |
| - | |
| Example set of cookies: | |
| Set-cookie: PRODUCTINFO=webxpress; domain=.fidelity.com; path=/; secure | |
| @@ -102,6 +88,7 @@ Example set of cookies: | |
| #include "rename.h" | |
| #include "fopen.h" | |
| #include "strdup.h" | |
| + | #include "llist.h" |
| /* The last 3 #include files should be in this order */ | |
| #include "curl_printf.h" | |
| @@ -335,17 +322,17 @@ void Curl_cookie_loadfiles(struct Curl_easy *data) | |
| if(list) { | |
| Curl_share_lock(data, CURL_LOCK_DATA_COOKIE, CURL_LOCK_ACCESS_SINGLE); | |
| while(list) { | |
| - | struct CookieInfo *newcookies = |
| + | struct CookieInfo *ci = |
| Curl_cookie_init(data, list->data, data->cookies, | |
| data->set.cookiesession); | |
| - | if(!newcookies) |
| + | if(!ci) |
| /* | |
| * Failure may be due to OOM or a bad cookie; both are ignored | |
| * but only the first should be | |
| */ | |
| infof(data, "ignoring failed cookie_init for %s", list->data); | |
| else | |
| - | data->cookies = newcookies; |
| + | data->cookies = ci; |
| list = list->next; | |
| } | |
| Curl_share_unlock(data, CURL_LOCK_DATA_COOKIE); | |
| @@ -378,9 +365,9 @@ static void strstore(char **str, const char *newstr, size_t len) | |
| * more cookies expire, then processing will exit early in case this timestamp | |
| * is in the future. | |
| */ | |
| - | static void remove_expired(struct CookieInfo *cookies) |
| + | static void remove_expired(struct CookieInfo *ci) |
| { | |
| - | struct Cookie *co, *nx; |
| + | struct Cookie *co; |
| curl_off_t now = (curl_off_t)time(NULL); | |
| unsigned int i; | |
| @@ -392,37 +379,32 @@ static void remove_expired(struct CookieInfo *cookies) | |
| * recorded first expiration is the max offset, then perform the safe | |
| * fallback of checking all cookies. | |
| */ | |
| - | if(now < cookies->next_expiration && |
| - | cookies->next_expiration != CURL_OFF_T_MAX) |
| + | if(now < ci->next_expiration && |
| + | ci->next_expiration != CURL_OFF_T_MAX) |
| return; | |
| else | |
| - | cookies->next_expiration = CURL_OFF_T_MAX; |
| + | ci->next_expiration = CURL_OFF_T_MAX; |
| for(i = 0; i < COOKIE_HASH_SIZE; i++) { | |
| - | struct Cookie *pv = NULL; |
| - | co = cookies->cookies[i]; |
| - | while(co) { |
| - | nx = co->next; |
| + | struct Curl_llist_node *n; |
| + | struct Curl_llist_node *e = NULL; |
| + | |
| + | for(n = Curl_llist_head(&ci->cookielist[i]); n; n = e) { |
| + | co = Curl_node_elem(n); |
| + | e = Curl_node_next(n); |
| if(co->expires && co->expires < now) { | |
| - | if(!pv) { |
| - | cookies->cookies[i] = co->next; |
| - | } |
| - | else { |
| - | pv->next = co->next; |
| - | } |
| - | cookies->numcookies--; |
| + | Curl_node_remove(n); |
| freecookie(co); | |
| + | ci->numcookies--; |
| } | |
| else { | |
| /* | |
| - | * If this cookie has an expiration timestamp earlier than what we have |
| - | * seen so far then record it for the next round of expirations. |
| + | * If this cookie has an expiration timestamp earlier than what we |
| + | * have seen so far then record it for the next round of expirations. |
| */ | |
| - | if(co->expires && co->expires < cookies->next_expiration) |
| - | cookies->next_expiration = co->expires; |
| - | pv = co; |
| + | if(co->expires && co->expires < ci->next_expiration) |
| + | ci->next_expiration = co->expires; |
| } | |
| - | co = nx; |
| } | |
| } | |
| } | |
| @@ -470,558 +452,487 @@ static int invalid_octets(const char *p) | |
| return (p[len] != '\0'); | |
| } | |
| - | /* |
| - | * Curl_cookie_add |
| - | * |
| - | * Add a single cookie line to the cookie keeping object. Be aware that |
| - | * sometimes we get an IP-only hostname, and that might also be a numerical |
| - | * IPv6 address. |
| - | * |
| - | * Returns NULL on out of memory or invalid cookie. This is suboptimal, |
| - | * as they should be treated separately. |
| - | */ |
| - | struct Cookie * |
| - | Curl_cookie_add(struct Curl_easy *data, |
| - | struct CookieInfo *c, |
| - | bool httpheader, /* TRUE if HTTP header-style line */ |
| - | bool noexpire, /* if TRUE, skip remove_expired() */ |
| - | const char *lineptr, /* first character of the line */ |
| - | const char *domain, /* default domain */ |
| - | const char *path, /* full path used when this cookie is set, |
| - | used to get default path for the cookie |
| - | unless set */ |
| - | bool secure) /* TRUE if connection is over secure origin */ |
| + | #define CERR_OK 0 |
| + | #define CERR_TOO_LONG 1 /* input line too long */ |
| + | #define CERR_TAB 2 /* in a wrong place */ |
| + | #define CERR_TOO_BIG 3 /* name/value too large */ |
| + | #define CERR_BAD 4 /* deemed incorrect */ |
| + | #define CERR_NO_SEP 5 /* semicolon problem */ |
| + | #define CERR_NO_NAME_VALUE 6 /* name or value problem */ |
| + | #define CERR_INVALID_OCTET 7 /* bad content */ |
| + | #define CERR_BAD_SECURE 8 /* secure in a bad place */ |
| + | #define CERR_OUT_OF_MEMORY 9 |
| + | #define CERR_NO_TAILMATCH 10 |
| + | #define CERR_COMMENT 11 /* a commented line */ |
| + | #define CERR_RANGE 12 /* expire range problem */ |
| + | #define CERR_FIELDS 13 /* incomplete netscape line */ |
| + | #define CERR_PSL 14 /* a public suffix */ |
| + | #define CERR_LIVE_WINS 15 |
| + | |
| + | static int |
| + | parse_cookie_header(struct Curl_easy *data, |
| + | struct Cookie *co, |
| + | struct CookieInfo *ci, |
| + | const char *ptr, |
| + | const char *domain, /* default domain */ |
| + | const char *path, /* full path used when this cookie is |
| + | set, used to get default path for |
| + | the cookie unless set */ |
| + | bool secure) /* TRUE if connection is over secure |
| + | origin */ |
| { | |
| - | struct Cookie *clist; |
| - | struct Cookie *co; |
| - | struct Cookie *lastc = NULL; |
| - | struct Cookie *replace_co = NULL; |
| - | struct Cookie *replace_clist = NULL; |
| - | time_t now = time(NULL); |
| - | bool replace_old = FALSE; |
| - | bool badcookie = FALSE; /* cookies are good by default. mmmmm yummy */ |
| - | size_t myhash; |
| - | |
| - | DEBUGASSERT(data); |
| - | DEBUGASSERT(MAX_SET_COOKIE_AMOUNT <= 255); /* counter is an unsigned char */ |
| - | if(data->req.setcookies >= MAX_SET_COOKIE_AMOUNT) |
| - | return NULL; |
| - | |
| - | /* First, alloc and init a new struct for it */ |
| - | co = calloc(1, sizeof(struct Cookie)); |
| - | if(!co) |
| - | return NULL; /* bail out if we are this low on memory */ |
| - | |
| - | if(httpheader) { |
| - | /* This line was read off an HTTP-header */ |
| - | const char *ptr; |
| + | /* This line was read off an HTTP-header */ |
| + | time_t now; |
| + | size_t linelength = strlen(ptr); |
| + | if(linelength > MAX_COOKIE_LINE) |
| + | /* discard overly long lines at once */ |
| + | return CERR_TOO_LONG; |
| + | |
| + | now = time(NULL); |
| + | do { |
| + | size_t vlen; |
| + | size_t nlen; |
| + | |
| + | while(*ptr && ISBLANK(*ptr)) |
| + | ptr++; |
| + | |
| + | /* we have a <name>=<value> pair or a stand-alone word here */ |
| + | nlen = strcspn(ptr, ";\t\r\n="); |
| + | if(nlen) { |
| + | bool done = FALSE; |
| + | bool sep = FALSE; |
| + | const char *namep = ptr; |
| + | const char *valuep; |
| + | |
| + | ptr += nlen; |
| + | |
| + | /* trim trailing spaces and tabs after name */ |
| + | while(nlen && ISBLANK(namep[nlen - 1])) |
| + | nlen--; |
| + | |
| + | if(*ptr == '=') { |
| + | vlen = strcspn(++ptr, ";\r\n"); |
| + | valuep = ptr; |
| + | sep = TRUE; |
| + | ptr = &valuep[vlen]; |
| + | |
| + | /* Strip off trailing whitespace from the value */ |
| + | while(vlen && ISBLANK(valuep[vlen-1])) |
| + | vlen--; |
| + | |
| + | /* Skip leading whitespace from the value */ |
| + | while(vlen && ISBLANK(*valuep)) { |
| + | valuep++; |
| + | vlen--; |
| + | } |
| - | size_t linelength = strlen(lineptr); |
| - | if(linelength > MAX_COOKIE_LINE) { |
| - | /* discard overly long lines at once */ |
| - | free(co); |
| - | return NULL; |
| - | } |
| + | /* Reject cookies with a TAB inside the value */ |
| + | if(memchr(valuep, '\t', vlen)) { |
| + | infof(data, "cookie contains TAB, dropping"); |
| + | return CERR_TAB; |
| + | } |
| + | } |
| + | else { |
| + | valuep = NULL; |
| + | vlen = 0; |
| + | } |
| - | ptr = lineptr; |
| - | do { |
| - | size_t vlen; |
| - | size_t nlen; |
| + | /* |
| + | * Check for too long individual name or contents, or too long |
| + | * combination of name + contents. Chrome and Firefox support 4095 or |
| + | * 4096 bytes combo |
| + | */ |
| + | if(nlen >= (MAX_NAME-1) || vlen >= (MAX_NAME-1) || |
| + | ((nlen + vlen) > MAX_NAME)) { |
| + | infof(data, "oversized cookie dropped, name/val %zu + %zu bytes", |
| + | nlen, vlen); |
| + | return CERR_TOO_BIG; |
| + | } |
| - | while(*ptr && ISBLANK(*ptr)) |
| - | ptr++; |
| + | /* |
| + | * Check if we have a reserved prefix set before anything else, as we |
| + | * otherwise have to test for the prefix in both the cookie name and |
| + | * "the rest". Prefixes must start with '__' and end with a '-', so |
| + | * only test for names where that can possibly be true. |
| + | */ |
| + | if(nlen >= 7 && namep[0] == '_' && namep[1] == '_') { |
| + | if(strncasecompare("__Secure-", namep, 9)) |
| + | co->prefix_secure = TRUE; |
| + | else if(strncasecompare("__Host-", namep, 7)) |
| + | co->prefix_host = TRUE; |
| + | } |
| - | /* we have a <name>=<value> pair or a stand-alone word here */ |
| - | nlen = strcspn(ptr, ";\t\r\n="); |
| - | if(nlen) { |
| - | bool done = FALSE; |
| - | bool sep = FALSE; |
| - | const char *namep = ptr; |
| - | const char *valuep; |
| - | |
| - | ptr += nlen; |
| - | |
| - | /* trim trailing spaces and tabs after name */ |
| - | while(nlen && ISBLANK(namep[nlen - 1])) |
| - | nlen--; |
| - | |
| - | if(*ptr == '=') { |
| - | vlen = strcspn(++ptr, ";\r\n"); |
| - | valuep = ptr; |
| - | sep = TRUE; |
| - | ptr = &valuep[vlen]; |
| - | |
| - | /* Strip off trailing whitespace from the value */ |
| - | while(vlen && ISBLANK(valuep[vlen-1])) |
| - | vlen--; |
| - | |
| - | /* Skip leading whitespace from the value */ |
| - | while(vlen && ISBLANK(*valuep)) { |
| - | valuep++; |
| - | vlen--; |
| - | } |
| + | /* |
| + | * Use strstore() below to properly deal with received cookie |
| + | * headers that have the same string property set more than once, |
| + | * and then we use the last one. |
| + | */ |
| - | /* Reject cookies with a TAB inside the value */ |
| - | if(memchr(valuep, '\t', vlen)) { |
| - | freecookie(co); |
| - | infof(data, "cookie contains TAB, dropping"); |
| - | return NULL; |
| - | } |
| + | if(!co->name) { |
| + | /* The very first name/value pair is the actual cookie name */ |
| + | if(!sep) |
| + | /* Bad name/value pair. */ |
| + | return CERR_NO_SEP; |
| + | |
| + | strstore(&co->name, namep, nlen); |
| + | strstore(&co->value, valuep, vlen); |
| + | done = TRUE; |
| + | if(!co->name || !co->value) |
| + | return CERR_NO_NAME_VALUE; |
| + | |
| + | if(invalid_octets(co->value) || invalid_octets(co->name)) { |
| + | infof(data, "invalid octets in name/value, cookie dropped"); |
| + | return CERR_INVALID_OCTET; |
| } | |
| - | else { |
| - | valuep = NULL; |
| - | vlen = 0; |
| - | } |
| - | |
| + | } |
| + | else if(!vlen) { |
| + | /* |
| + | * this was a "<name>=" with no content, and we must allow |
| + | * 'secure' and 'httponly' specified this weirdly |
| + | */ |
| + | done = TRUE; |
| /* | |
| - | * Check for too long individual name or contents, or too long |
| - | * combination of name + contents. Chrome and Firefox support 4095 or |
| - | * 4096 bytes combo |
| + | * secure cookies are only allowed to be set when the connection is |
| + | * using a secure protocol, or when the cookie is being set by |
| + | * reading from file |
| */ | |
| - | if(nlen >= (MAX_NAME-1) || vlen >= (MAX_NAME-1) || |
| - | ((nlen + vlen) > MAX_NAME)) { |
| - | freecookie(co); |
| - | infof(data, "oversized cookie dropped, name/val %zu + %zu bytes", |
| - | nlen, vlen); |
| - | return NULL; |
| + | if((nlen == 6) && strncasecompare("secure", namep, 6)) { |
| + | if(secure || !ci->running) { |
| + | co->secure = TRUE; |
| + | } |
| + | else { |
| + | return CERR_BAD_SECURE; |
| + | } |
| } | |
| + | else if((nlen == 8) && strncasecompare("httponly", namep, 8)) |
| + | co->httponly = TRUE; |
| + | else if(sep) |
| + | /* there was a '=' so we are not done parsing this field */ |
| + | done = FALSE; |
| + | } |
| + | if(done) |
| + | ; |
| + | else if((nlen == 4) && strncasecompare("path", namep, 4)) { |
| + | strstore(&co->path, valuep, vlen); |
| + | if(!co->path) |
| + | return CERR_OUT_OF_MEMORY; |
| + | free(co->spath); /* if this is set again */ |
| + | co->spath = sanitize_cookie_path(co->path); |
| + | if(!co->spath) |
| + | return CERR_OUT_OF_MEMORY; |
| + | } |
| + | else if((nlen == 6) && |
| + | strncasecompare("domain", namep, 6) && vlen) { |
| + | bool is_ip; |
| /* | |
| - | * Check if we have a reserved prefix set before anything else, as we |
| - | * otherwise have to test for the prefix in both the cookie name and |
| - | * "the rest". Prefixes must start with '__' and end with a '-', so |
| - | * only test for names where that can possibly be true. |
| + | * Now, we make sure that our host is within the given domain, or |
| + | * the given domain is not valid and thus cannot be set. |
| */ | |
| - | if(nlen >= 7 && namep[0] == '_' && namep[1] == '_') { |
| - | if(strncasecompare("__Secure-", namep, 9)) |
| - | co->prefix |= COOKIE_PREFIX__SECURE; |
| - | else if(strncasecompare("__Host-", namep, 7)) |
| - | co->prefix |= COOKIE_PREFIX__HOST; |
| + | |
| + | if('.' == valuep[0]) { |
| + | valuep++; /* ignore preceding dot */ |
| + | vlen--; |
| } | |
| + | #ifndef USE_LIBPSL |
| /* | |
| - | * Use strstore() below to properly deal with received cookie |
| - | * headers that have the same string property set more than once, |
| - | * and then we use the last one. |
| + | * Without PSL we do not know when the incoming cookie is set on a |
| + | * TLD or otherwise "protected" suffix. To reduce risk, we require a |
| + | * dot OR the exact hostname being "localhost". |
| */ | |
| + | if(bad_domain(valuep, vlen)) |
| + | domain = ":"; |
| + | #endif |
| - | if(!co->name) { |
| - | /* The very first name/value pair is the actual cookie name */ |
| - | if(!sep) { |
| - | /* Bad name/value pair. */ |
| - | badcookie = TRUE; |
| - | break; |
| - | } |
| - | strstore(&co->name, namep, nlen); |
| - | strstore(&co->value, valuep, vlen); |
| - | done = TRUE; |
| - | if(!co->name || !co->value) { |
| - | badcookie = TRUE; |
| - | break; |
| - | } |
| - | if(invalid_octets(co->value) || invalid_octets(co->name)) { |
| - | infof(data, "invalid octets in name/value, cookie dropped"); |
| - | badcookie = TRUE; |
| - | break; |
| - | } |
| + | is_ip = Curl_host_is_ipnum(domain ? domain : valuep); |
| + | |
| + | if(!domain |
| + | || (is_ip && !strncmp(valuep, domain, vlen) && |
| + | (vlen == strlen(domain))) |
| + | || (!is_ip && cookie_tailmatch(valuep, vlen, domain))) { |
| + | strstore(&co->domain, valuep, vlen); |
| + | if(!co->domain) |
| + | return CERR_OUT_OF_MEMORY; |
| + | |
| + | if(!is_ip) |
| + | co->tailmatch = TRUE; /* we always do that if the domain name was |
| + | given */ |
| } | |
| - | else if(!vlen) { |
| - | /* |
| - | * this was a "<name>=" with no content, and we must allow |
| - | * 'secure' and 'httponly' specified this weirdly |
| - | */ |
| - | done = TRUE; |
| + | else { |
| /* | |
| - | * secure cookies are only allowed to be set when the connection is |
| - | * using a secure protocol, or when the cookie is being set by |
| - | * reading from file |
| + | * We did not get a tailmatch and then the attempted set domain is |
| + | * not a domain to which the current host belongs. Mark as bad. |
| */ | |
| - | if((nlen == 6) && strncasecompare("secure", namep, 6)) { |
| - | if(secure || !c->running) { |
| - | co->secure = TRUE; |
| - | } |
| - | else { |
| - | badcookie = TRUE; |
| - | break; |
| - | } |
| - | } |
| - | else if((nlen == 8) && strncasecompare("httponly", namep, 8)) |
| - | co->httponly = TRUE; |
| - | else if(sep) |
| - | /* there was a '=' so we are not done parsing this field */ |
| - | done = FALSE; |
| + | infof(data, "skipped cookie with bad tailmatch domain: %s", |
| + | valuep); |
| + | return CERR_NO_TAILMATCH; |
| } | |
| - | if(done) |
| - | ; |
| - | else if((nlen == 4) && strncasecompare("path", namep, 4)) { |
| - | strstore(&co->path, valuep, vlen); |
| - | if(!co->path) { |
| - | badcookie = TRUE; /* out of memory bad */ |
| - | break; |
| - | } |
| - | free(co->spath); /* if this is set again */ |
| - | co->spath = sanitize_cookie_path(co->path); |
| - | if(!co->spath) { |
| - | badcookie = TRUE; /* out of memory bad */ |
| - | break; |
| - | } |
| + | } |
| + | else if((nlen == 7) && strncasecompare("version", namep, 7)) { |
| + | /* just ignore */ |
| + | } |
| + | else if((nlen == 7) && strncasecompare("max-age", namep, 7)) { |
| + | /* |
| + | * Defined in RFC2109: |
| + | * |
| + | * Optional. The Max-Age attribute defines the lifetime of the |
| + | * cookie, in seconds. The delta-seconds value is a decimal non- |
| + | * negative integer. After delta-seconds seconds elapse, the |
| + | * client should discard the cookie. A value of zero means the |
| + | * cookie should be discarded immediately. |
| + | */ |
| + | CURLofft offt; |
| + | const char *maxage = valuep; |
| + | offt = curlx_strtoofft((*maxage == '\"') ? |
| + | &maxage[1] : &maxage[0], NULL, 10, |
| + | &co->expires); |
| + | switch(offt) { |
| + | case CURL_OFFT_FLOW: |
| + | /* overflow, used max value */ |
| + | co->expires = CURL_OFF_T_MAX; |
| + | break; |
| + | case CURL_OFFT_INVAL: |
| + | /* negative or otherwise bad, expire */ |
| + | co->expires = 1; |
| + | break; |
| + | case CURL_OFFT_OK: |
| + | if(!co->expires) |
| + | /* already expired */ |
| + | co->expires = 1; |
| + | else if(CURL_OFF_T_MAX - now < co->expires) |
| + | /* would overflow */ |
| + | co->expires = CURL_OFF_T_MAX; |
| + | else |
| + | co->expires += now; |
| + | break; |
| } | |
| - | else if((nlen == 6) && |
| - | strncasecompare("domain", namep, 6) && vlen) { |
| - | bool is_ip; |
| - | |
| - | /* |
| - | * Now, we make sure that our host is within the given domain, or |
| - | * the given domain is not valid and thus cannot be set. |
| - | */ |
| - | |
| - | if('.' == valuep[0]) { |
| - | valuep++; /* ignore preceding dot */ |
| - | vlen--; |
| - | } |
| - | |
| - | #ifndef USE_LIBPSL |
| + | } |
| + | else if((nlen == 7) && strncasecompare("expires", namep, 7)) { |
| + | if(!co->expires) { |
| /* | |
| - | * Without PSL we do not know when the incoming cookie is set on a |
| - | * TLD or otherwise "protected" suffix. To reduce risk, we require a |
| - | * dot OR the exact hostname being "localhost". |
| + | * Let max-age have priority. |
| + | * |
| + | * If the date cannot get parsed for whatever reason, the cookie |
| + | * will be treated as a session cookie |
| */ | |
| - | if(bad_domain(valuep, vlen)) |
| - | domain = ":"; |
| - | #endif |
| + | co->expires = Curl_getdate_capped(valuep); |
| - | is_ip = Curl_host_is_ipnum(domain ? domain : valuep); |
| - | |
| - | if(!domain |
| - | || (is_ip && !strncmp(valuep, domain, vlen) && |
| - | (vlen == strlen(domain))) |
| - | || (!is_ip && cookie_tailmatch(valuep, vlen, domain))) { |
| - | strstore(&co->domain, valuep, vlen); |
| - | if(!co->domain) { |
| - | badcookie = TRUE; |
| - | break; |
| - | } |
| - | if(!is_ip) |
| - | co->tailmatch = TRUE; /* we always do that if the domain name was |
| - | given */ |
| - | } |
| - | else { |
| - | /* |
| - | * We did not get a tailmatch and then the attempted set domain is |
| - | * not a domain to which the current host belongs. Mark as bad. |
| - | */ |
| - | badcookie = TRUE; |
| - | infof(data, "skipped cookie with bad tailmatch domain: %s", |
| - | valuep); |
| - | } |
| - | } |
| - | else if((nlen == 7) && strncasecompare("version", namep, 7)) { |
| - | /* just ignore */ |
| - | } |
| - | else if((nlen == 7) && strncasecompare("max-age", namep, 7)) { |
| /* | |
| - | * Defined in RFC2109: |
| - | * |
| - | * Optional. The Max-Age attribute defines the lifetime of the |
| - | * cookie, in seconds. The delta-seconds value is a decimal non- |
| - | * negative integer. After delta-seconds seconds elapse, the |
| - | * client should discard the cookie. A value of zero means the |
| - | * cookie should be discarded immediately. |
| + | * Session cookies have expires set to 0 so if we get that back |
| + | * from the date parser let's add a second to make it a |
| + | * non-session cookie |
| */ | |
| - | CURLofft offt; |
| - | const char *maxage = valuep; |
| - | offt = curlx_strtoofft((*maxage == '\"') ? |
| - | &maxage[1] : &maxage[0], NULL, 10, |
| - | &co->expires); |
| - | switch(offt) { |
| - | case CURL_OFFT_FLOW: |
| - | /* overflow, used max value */ |
| - | co->expires = CURL_OFF_T_MAX; |
| - | break; |
| - | case CURL_OFFT_INVAL: |
| - | /* negative or otherwise bad, expire */ |
| + | if(co->expires == 0) |
| co->expires = 1; | |
| - | break; |
| - | case CURL_OFFT_OK: |
| - | if(!co->expires) |
| - | /* already expired */ |
| - | co->expires = 1; |
| - | else if(CURL_OFF_T_MAX - now < co->expires) |
| - | /* would overflow */ |
| - | co->expires = CURL_OFF_T_MAX; |
| - | else |
| - | co->expires += now; |
| - | break; |
| - | } |
| + | else if(co->expires < 0) |
| + | co->expires = 0; |
| } | |
| - | else if((nlen == 7) && strncasecompare("expires", namep, 7)) { |
| - | char date[128]; |
| - | if(!co->expires && (vlen < sizeof(date))) { |
| - | /* copy the date so that it can be null terminated */ |
| - | memcpy(date, valuep, vlen); |
| - | date[vlen] = 0; |
| - | /* |
| - | * Let max-age have priority. |
| - | * |
| - | * If the date cannot get parsed for whatever reason, the cookie |
| - | * will be treated as a session cookie |
| - | */ |
| - | co->expires = Curl_getdate_capped(date); |
| - | |
| - | /* |
| - | * Session cookies have expires set to 0 so if we get that back |
| - | * from the date parser let's add a second to make it a |
| - | * non-session cookie |
| - | */ |
| - | if(co->expires == 0) |
| - | co->expires = 1; |
| - | else if(co->expires < 0) |
| - | co->expires = 0; |
| - | } |
| - | } |
| - | |
| - | /* |
| - | * Else, this is the second (or more) name we do not know about! |
| - | */ |
| - | } |
| - | else { |
| - | /* this is an "illegal" <what>=<this> pair */ |
| } | |
| - | while(*ptr && ISBLANK(*ptr)) |
| - | ptr++; |
| - | if(*ptr == ';') |
| - | ptr++; |
| - | else |
| - | break; |
| - | } while(1); |
| - | |
| - | if(!badcookie && !co->domain) { |
| - | if(domain) { |
| - | /* no domain was given in the header line, set the default */ |
| - | co->domain = strdup(domain); |
| - | if(!co->domain) |
| - | badcookie = TRUE; |
| - | } |
| - | } |
| - | |
| - | if(!badcookie && !co->path && path) { |
| - | /* |
| - | * No path was given in the header line, set the default. Note that the |
| - | * passed-in path to this function MAY have a '?' and following part that |
| - | * MUST NOT be stored as part of the path. |
| - | */ |
| - | char *queryp = strchr(path, '?'); |
| - | |
| /* | |
| - | * queryp is where the interesting part of the path ends, so now we |
| - | * want to the find the last |
| + | * Else, this is the second (or more) name we do not know about! |
| */ | |
| - | char *endslash; |
| - | if(!queryp) |
| - | endslash = strrchr(path, '/'); |
| - | else |
| - | endslash = memrchr(path, '/', (queryp - path)); |
| - | if(endslash) { |
| - | size_t pathlen = (endslash-path + 1); /* include end slash */ |
| - | co->path = Curl_memdup0(path, pathlen); |
| - | if(co->path) { |
| - | co->spath = sanitize_cookie_path(co->path); |
| - | if(!co->spath) |
| - | badcookie = TRUE; /* out of memory bad */ |
| - | } |
| - | else |
| - | badcookie = TRUE; |
| - | } |
| } | |
| - | |
| - | /* |
| - | * If we did not get a cookie name, or a bad one, the this is an illegal |
| - | * line so bail out. |
| - | */ |
| - | if(badcookie || !co->name) { |
| - | freecookie(co); |
| - | return NULL; |
| + | else { |
| + | /* this is an "illegal" <what>=<this> pair */ |
| } | |
| - | data->req.setcookies++; |
| + | |
| + | while(*ptr && ISBLANK(*ptr)) |
| + | ptr++; |
| + | if(*ptr == ';') |
| + | ptr++; |
| + | else |
| + | break; |
| + | } while(1); |
| + | |
| + | if(!co->domain && domain) { |
| + | /* no domain was given in the header line, set the default */ |
| + | co->domain = strdup(domain); |
| + | if(!co->domain) |
| + | return CERR_OUT_OF_MEMORY; |
| } | |
| - | else { |
| - | /* |
| - | * This line is NOT an HTTP header style line, we do offer support for |
| - | * reading the odd netscape cookies-file format here |
| - | */ |
| - | char *ptr; |
| - | char *firstptr; |
| - | char *tok_buf = NULL; |
| - | int fields; |
| + | if(!co->path && path) { |
| /* | |
| - | * IE introduced HTTP-only cookies to prevent XSS attacks. Cookies marked |
| - | * with httpOnly after the domain name are not accessible from javascripts, |
| - | * but since curl does not operate at javascript level, we include them |
| - | * anyway. In Firefox's cookie files, these lines are preceded with |
| - | * #HttpOnly_ and then everything is as usual, so we skip 10 characters of |
| - | * the line.. |
| + | * No path was given in the header line, set the default. Note that the |
| + | * passed-in path to this function MAY have a '?' and following part that |
| + | * MUST NOT be stored as part of the path. |
| */ | |
| - | if(strncmp(lineptr, "#HttpOnly_", 10) == 0) { |
| - | lineptr += 10; |
| - | co->httponly = TRUE; |
| - | } |
| - | |
| - | if(lineptr[0]=='#') { |
| - | /* do not even try the comments */ |
| - | free(co); |
| - | return NULL; |
| - | } |
| - | /* strip off the possible end-of-line characters */ |
| - | ptr = strchr(lineptr, '\r'); |
| - | if(ptr) |
| - | *ptr = 0; /* clear it */ |
| - | ptr = strchr(lineptr, '\n'); |
| - | if(ptr) |
| - | *ptr = 0; /* clear it */ |
| - | |
| - | firstptr = strtok_r((char *)lineptr, "\t", &tok_buf); /* tokenize on TAB */ |
| + | char *queryp = strchr(path, '?'); |
| /* | |
| - | * Now loop through the fields and init the struct we already have |
| - | * allocated |
| + | * queryp is where the interesting part of the path ends, so now we |
| + | * want to the find the last |
| */ | |
| - | fields = 0; |
| - | for(ptr = firstptr; ptr && !badcookie; |
| - | ptr = strtok_r(NULL, "\t", &tok_buf), fields++) { |
| - | switch(fields) { |
| - | case 0: |
| - | if(ptr[0]=='.') /* skip preceding dots */ |
| - | ptr++; |
| - | co->domain = strdup(ptr); |
| - | if(!co->domain) |
| - | badcookie = TRUE; |
| - | break; |
| - | case 1: |
| - | /* |
| - | * flag: A TRUE/FALSE value indicating if all machines within a given |
| - | * domain can access the variable. Set TRUE when the cookie says |
| - | * .domain.com and to false when the domain is complete www.domain.com |
| - | */ |
| - | co->tailmatch = strcasecompare(ptr, "TRUE") ? TRUE : FALSE; |
| - | break; |
| - | case 2: |
| - | /* The file format allows the path field to remain not filled in */ |
| - | if(strcmp("TRUE", ptr) && strcmp("FALSE", ptr)) { |
| - | /* only if the path does not look like a boolean option! */ |
| - | co->path = strdup(ptr); |
| - | if(!co->path) |
| - | badcookie = TRUE; |
| - | else { |
| - | co->spath = sanitize_cookie_path(co->path); |
| - | if(!co->spath) { |
| - | badcookie = TRUE; /* out of memory bad */ |
| - | } |
| - | } |
| - | break; |
| - | } |
| - | /* this does not look like a path, make one up! */ |
| - | co->path = strdup("/"); |
| - | if(!co->path) |
| - | badcookie = TRUE; |
| - | co->spath = strdup("/"); |
| + | char *endslash; |
| + | if(!queryp) |
| + | endslash = strrchr(path, '/'); |
| + | else |
| + | endslash = memrchr(path, '/', (queryp - path)); |
| + | if(endslash) { |
| + | size_t pathlen = (endslash-path + 1); /* include end slash */ |
| + | co->path = Curl_memdup0(path, pathlen); |
| + | if(co->path) { |
| + | co->spath = sanitize_cookie_path(co->path); |
| if(!co->spath) | |
| - | badcookie = TRUE; |
| - | fields++; /* add a field and fall down to secure */ |
| - | FALLTHROUGH(); |
| - | case 3: |
| - | co->secure = FALSE; |
| - | if(strcasecompare(ptr, "TRUE")) { |
| - | if(secure || c->running) |
| - | co->secure = TRUE; |
| - | else |
| - | badcookie = TRUE; |
| - | } |
| - | break; |
| - | case 4: |
| - | if(curlx_strtoofft(ptr, NULL, 10, &co->expires)) |
| - | badcookie = TRUE; |
| - | break; |
| - | case 5: |
| - | co->name = strdup(ptr); |
| - | if(!co->name) |
| - | badcookie = TRUE; |
| - | else { |
| - | /* For Netscape file format cookies we check prefix on the name */ |
| - | if(strncasecompare("__Secure-", co->name, 9)) |
| - | co->prefix |= COOKIE_PREFIX__SECURE; |
| - | else if(strncasecompare("__Host-", co->name, 7)) |
| - | co->prefix |= COOKIE_PREFIX__HOST; |
| - | } |
| - | break; |
| - | case 6: |
| - | co->value = strdup(ptr); |
| - | if(!co->value) |
| - | badcookie = TRUE; |
| - | break; |
| + | return CERR_OUT_OF_MEMORY; |
| } | |
| - | } |
| - | if(6 == fields) { |
| - | /* we got a cookie with blank contents, fix it */ |
| - | co->value = strdup(""); |
| - | if(!co->value) |
| - | badcookie = TRUE; |
| else | |
| - | fields++; |
| + | return CERR_OUT_OF_MEMORY; |
| } | |
| + | } |
| - | if(!badcookie && (7 != fields)) |
| - | /* we did not find the sufficient number of fields */ |
| - | badcookie = TRUE; |
| + | /* |
| + | * If we did not get a cookie name, or a bad one, the this is an illegal |
| + | * line so bail out. |
| + | */ |
| + | if(!co->name) |
| + | return CERR_BAD; |
| - | if(badcookie) { |
| - | freecookie(co); |
| - | return NULL; |
| - | } |
| + | data->req.setcookies++; |
| + | return CERR_OK; |
| + | } |
| - | } |
| + | static int |
| + | parse_netscape(struct Cookie *co, |
| + | struct CookieInfo *ci, |
| + | const char *lineptr, |
| + | bool secure) /* TRUE if connection is over secure |
| + | origin */ |
| + | { |
| + | /* |
| + | * This line is NOT an HTTP header style line, we do offer support for |
| + | * reading the odd netscape cookies-file format here |
| + | */ |
| + | char *ptr; |
| + | char *firstptr; |
| + | char *tok_buf = NULL; |
| + | int fields; |
| - | if(co->prefix & COOKIE_PREFIX__SECURE) { |
| - | /* The __Secure- prefix only requires that the cookie be set secure */ |
| - | if(!co->secure) { |
| - | freecookie(co); |
| - | return NULL; |
| - | } |
| - | } |
| - | if(co->prefix & COOKIE_PREFIX__HOST) { |
| - | /* |
| - | * The __Host- prefix requires the cookie to be secure, have a "/" path |
| - | * and not have a domain set. |
| - | */ |
| - | if(co->secure && co->path && strcmp(co->path, "/") == 0 && !co->tailmatch) |
| - | ; |
| - | else { |
| - | freecookie(co); |
| - | return NULL; |
| - | } |
| + | /* |
| + | * In 2008, Internet Explorer introduced HTTP-only cookies to prevent XSS |
| + | * attacks. Cookies marked httpOnly are not accessible to JavaScript. In |
| + | * Firefox's cookie files, they are prefixed #HttpOnly_ and the rest |
| + | * remains as usual, so we skip 10 characters of the line. |
| + | */ |
| + | if(strncmp(lineptr, "#HttpOnly_", 10) == 0) { |
| + | lineptr += 10; |
| + | co->httponly = TRUE; |
| } | |
| - | if(!c->running && /* read from a file */ |
| - | c->newsession && /* clean session cookies */ |
| - | !co->expires) { /* this is a session cookie since it does not expire! */ |
| - | freecookie(co); |
| - | return NULL; |
| - | } |
| + | if(lineptr[0]=='#') |
| + | /* do not even try the comments */ |
| + | return CERR_COMMENT; |
| + | |
| + | /* strip off the possible end-of-line characters */ |
| + | ptr = strchr(lineptr, '\r'); |
| + | if(ptr) |
| + | *ptr = 0; /* clear it */ |
| + | ptr = strchr(lineptr, '\n'); |
| + | if(ptr) |
| + | *ptr = 0; /* clear it */ |
| - | co->livecookie = c->running; |
| - | co->creationtime = ++c->lastct; |
| + | firstptr = strtok_r((char *)lineptr, "\t", &tok_buf); /* tokenize on TAB */ |
| /* | |
| - | * Now we have parsed the incoming line, we must now check if this supersedes |
| - | * an already existing cookie, which it may if the previous have the same |
| - | * domain and path as this. |
| + | * Now loop through the fields and init the struct we already have |
| + | * allocated |
| */ | |
| + | fields = 0; |
| + | for(ptr = firstptr; ptr; ptr = strtok_r(NULL, "\t", &tok_buf), fields++) { |
| + | switch(fields) { |
| + | case 0: |
| + | if(ptr[0]=='.') /* skip preceding dots */ |
| + | ptr++; |
| + | co->domain = strdup(ptr); |
| + | if(!co->domain) |
| + | return CERR_OUT_OF_MEMORY; |
| + | break; |
| + | case 1: |
| + | /* |
| + | * flag: A TRUE/FALSE value indicating if all machines within a given |
| + | * domain can access the variable. Set TRUE when the cookie says |
| + | * .domain.com and to false when the domain is complete www.domain.com |
| + | */ |
| + | co->tailmatch = strcasecompare(ptr, "TRUE") ? TRUE : FALSE; |
| + | break; |
| + | case 2: |
| + | /* The file format allows the path field to remain not filled in */ |
| + | if(strcmp("TRUE", ptr) && strcmp("FALSE", ptr)) { |
| + | /* only if the path does not look like a boolean option! */ |
| + | co->path = strdup(ptr); |
| + | if(!co->path) |
| + | return CERR_OUT_OF_MEMORY; |
| + | else { |
| + | co->spath = sanitize_cookie_path(co->path); |
| + | if(!co->spath) |
| + | return CERR_OUT_OF_MEMORY; |
| + | } |
| + | break; |
| + | } |
| + | /* this does not look like a path, make one up! */ |
| + | co->path = strdup("/"); |
| + | if(!co->path) |
| + | return CERR_OUT_OF_MEMORY; |
| + | co->spath = strdup("/"); |
| + | if(!co->spath) |
| + | return CERR_OUT_OF_MEMORY; |
| + | fields++; /* add a field and fall down to secure */ |
| + | FALLTHROUGH(); |
| + | case 3: |
| + | co->secure = FALSE; |
| + | if(strcasecompare(ptr, "TRUE")) { |
| + | if(secure || ci->running) |
| + | co->secure = TRUE; |
| + | else |
| + | return CERR_BAD_SECURE; |
| + | } |
| + | break; |
| + | case 4: |
| + | if(curlx_strtoofft(ptr, NULL, 10, &co->expires)) |
| + | return CERR_RANGE; |
| + | break; |
| + | case 5: |
| + | co->name = strdup(ptr); |
| + | if(!co->name) |
| + | return CERR_OUT_OF_MEMORY; |
| + | else { |
| + | /* For Netscape file format cookies we check prefix on the name */ |
| + | if(strncasecompare("__Secure-", co->name, 9)) |
| + | co->prefix_secure = TRUE; |
| + | else if(strncasecompare("__Host-", co->name, 7)) |
| + | co->prefix_host = TRUE; |
| + | } |
| + | break; |
| + | case 6: |
| + | co->value = strdup(ptr); |
| + | if(!co->value) |
| + | return CERR_OUT_OF_MEMORY; |
| + | break; |
| + | } |
| + | } |
| + | if(6 == fields) { |
| + | /* we got a cookie with blank contents, fix it */ |
| + | co->value = strdup(""); |
| + | if(!co->value) |
| + | return CERR_OUT_OF_MEMORY; |
| + | else |
| + | fields++; |
| + | } |
| - | /* at first, remove expired cookies */ |
| - | if(!noexpire) |
| - | remove_expired(c); |
| + | if(7 != fields) |
| + | /* we did not find the sufficient number of fields */ |
| + | return CERR_FIELDS; |
| + | |
| + | return CERR_OK; |
| + | } |
| + | static int |
| + | is_public_suffix(struct Curl_easy *data, |
| + | struct Cookie *co, |
| + | const char *domain) |
| + | { |
| #ifdef USE_LIBPSL | |
| /* | |
| * Check if the domain is a Public Suffix and if yes, ignore the cookie. We | |
| @@ -1051,20 +962,33 @@ Curl_cookie_add(struct Curl_easy *data, | |
| if(!acceptable) { | |
| infof(data, "cookie '%s' dropped, domain '%s' must not " | |
| - | "set cookies for '%s'", co->name, domain, co->domain); |
| - | freecookie(co); |
| - | return NULL; |
| + | "set cookies for '%s'", co->name, domain, co->domain); |
| + | return CERR_PSL; |
| } | |
| } | |
| #else | |
| + | (void)data; |
| + | (void)co; |
| + | (void)domain; |
| DEBUGF(infof(data, "NO PSL to check set-cookie '%s' for domain=%s in %s", | |
| co->name, co->domain, domain)); | |
| #endif | |
| + | return CERR_OK; |
| + | } |
| - | /* A non-secure cookie may not overlay an existing secure cookie. */ |
| - | myhash = cookiehash(co->domain); |
| - | clist = c->cookies[myhash]; |
| - | while(clist) { |
| + | static int |
| + | replace_existing(struct Curl_easy *data, |
| + | struct Cookie *co, |
| + | struct CookieInfo *ci, |
| + | bool secure, |
| + | bool *replacep) |
| + | { |
| + | bool replace_old = FALSE; |
| + | struct Curl_llist_node *replace_n = NULL; |
| + | struct Curl_llist_node *n; |
| + | size_t myhash = cookiehash(co->domain); |
| + | for(n = Curl_llist_head(&ci->cookielist[myhash]); n; n = Curl_node_next(n)) { |
| + | struct Cookie *clist = Curl_node_elem(n); |
| if(strcasecompare(clist->name, co->name)) { | |
| /* the names are identical */ | |
| bool matching_domains = FALSE; | |
| @@ -1100,13 +1024,12 @@ Curl_cookie_add(struct Curl_easy *data, | |
| if(strncasecompare(clist->spath, co->spath, cllen)) { | |
| infof(data, "cookie '%s' for domain '%s' dropped, would " | |
| "overlay an existing cookie", co->name, co->domain); | |
| - | freecookie(co); |
| - | return NULL; |
| + | return CERR_BAD_SECURE; |
| } | |
| } | |
| } | |
| - | if(!replace_co && strcasecompare(clist->name, co->name)) { |
| + | if(!replace_n && strcasecompare(clist->name, co->name)) { |
| /* the names are identical */ | |
| if(clist->domain && co->domain) { | |
| @@ -1135,62 +1058,137 @@ Curl_cookie_add(struct Curl_easy *data, | |
| * was read from a file and thus is not "live". "live" cookies are | |
| * preferred so the new cookie is freed. | |
| */ | |
| - | freecookie(co); |
| - | return NULL; |
| - | } |
| - | if(replace_old) { |
| - | replace_co = co; |
| - | replace_clist = clist; |
| + | return CERR_LIVE_WINS; |
| } | |
| + | if(replace_old) |
| + | replace_n = n; |
| } | |
| - | lastc = clist; |
| - | clist = clist->next; |
| } | |
| - | if(replace_co) { |
| - | co = replace_co; |
| - | clist = replace_clist; |
| - | co->next = clist->next; /* get the next-pointer first */ |
| + | if(replace_n) { |
| + | struct Cookie *repl = Curl_node_elem(replace_n); |
| /* when replacing, creationtime is kept from old */ | |
| - | co->creationtime = clist->creationtime; |
| + | co->creationtime = repl->creationtime; |
| + | |
| + | /* unlink the old */ |
| + | Curl_node_remove(replace_n); |
| + | |
| + | /* free the old cookie */ |
| + | freecookie(repl); |
| + | } |
| + | *replacep = replace_old; |
| + | return CERR_OK; |
| + | } |
| + | |
| + | /* |
| + | * Curl_cookie_add |
| + | * |
| + | * Add a single cookie line to the cookie keeping object. Be aware that |
| + | * sometimes we get an IP-only hostname, and that might also be a numerical |
| + | * IPv6 address. |
| + | * |
| + | * Returns NULL on out of memory or invalid cookie. This is suboptimal, |
| + | * as they should be treated separately. |
| + | */ |
| + | struct Cookie * |
| + | Curl_cookie_add(struct Curl_easy *data, |
| + | struct CookieInfo *ci, |
| + | bool httpheader, /* TRUE if HTTP header-style line */ |
| + | bool noexpire, /* if TRUE, skip remove_expired() */ |
| + | const char *lineptr, /* first character of the line */ |
| + | const char *domain, /* default domain */ |
| + | const char *path, /* full path used when this cookie is set, |
| + | used to get default path for the cookie |
| + | unless set */ |
| + | bool secure) /* TRUE if connection is over secure origin */ |
| + | { |
| + | struct Cookie *co; |
| + | size_t myhash; |
| + | int rc; |
| + | bool replaces = FALSE; |
| + | |
| + | DEBUGASSERT(data); |
| + | DEBUGASSERT(MAX_SET_COOKIE_AMOUNT <= 255); /* counter is an unsigned char */ |
| + | if(data->req.setcookies >= MAX_SET_COOKIE_AMOUNT) |
| + | return NULL; |
| + | |
| + | /* First, alloc and init a new struct for it */ |
| + | co = calloc(1, sizeof(struct Cookie)); |
| + | if(!co) |
| + | return NULL; /* bail out if we are this low on memory */ |
| + | |
| + | if(httpheader) |
| + | rc = parse_cookie_header(data, co, ci, lineptr, domain, path, secure); |
| + | else |
| + | rc = parse_netscape(co, ci, lineptr, secure); |
| - | /* then free all the old pointers */ |
| - | free(clist->name); |
| - | free(clist->value); |
| - | free(clist->domain); |
| - | free(clist->path); |
| - | free(clist->spath); |
| + | if(rc) |
| + | goto fail; |
| - | *clist = *co; /* then store all the new data */ |
| + | if(co->prefix_secure && !co->secure) |
| + | /* The __Secure- prefix only requires that the cookie be set secure */ |
| + | goto fail; |
| - | free(co); /* free the newly allocated memory */ |
| - | co = clist; |
| + | if(co->prefix_host) { |
| + | /* |
| + | * The __Host- prefix requires the cookie to be secure, have a "/" path |
| + | * and not have a domain set. |
| + | */ |
| + | if(co->secure && co->path && strcmp(co->path, "/") == 0 && !co->tailmatch) |
| + | ; |
| + | else |
| + | goto fail; |
| } | |
| - | if(c->running) |
| + | if(!ci->running && /* read from a file */ |
| + | ci->newsession && /* clean session cookies */ |
| + | !co->expires) /* this is a session cookie since it does not expire */ |
| + | goto fail; |
| + | |
| + | co->livecookie = ci->running; |
| + | co->creationtime = ++ci->lastct; |
| + | |
| + | /* |
| + | * Now we have parsed the incoming line, we must now check if this supersedes |
| + | * an already existing cookie, which it may if the previous have the same |
| + | * domain and path as this. |
| + | */ |
| + | |
| + | /* remove expired cookies */ |
| + | if(!noexpire) |
| + | remove_expired(ci); |
| + | |
| + | if(is_public_suffix(data, co, domain)) |
| + | goto fail; |
| + | |
| + | if(replace_existing(data, co, ci, secure, &replaces)) |
| + | goto fail; |
| + | |
| + | /* add this cookie to the list */ |
| + | myhash = cookiehash(co->domain); |
| + | Curl_llist_append(&ci->cookielist[myhash], co, &co->node); |
| + | |
| + | if(ci->running) |
| /* Only show this when NOT reading the cookies from a file */ | |
| infof(data, "%s cookie %s=\"%s\" for domain %s, path %s, " | |
| "expire %" FMT_OFF_T, | |
| - | replace_old ? "Replaced":"Added", co->name, co->value, |
| + | replaces ? "Replaced":"Added", co->name, co->value, |
| co->domain, co->path, co->expires); | |
| - | if(!replace_old) { |
| - | /* then make the last item point on this new one */ |
| - | if(lastc) |
| - | lastc->next = co; |
| - | else |
| - | c->cookies[myhash] = co; |
| - | c->numcookies++; /* one more cookie in the jar */ |
| - | } |
| + | if(!replaces) |
| + | ci->numcookies++; /* one more cookie in the jar */ |
| /* | |
| * Now that we have added a new cookie to the jar, update the expiration | |
| * tracker in case it is the next one to expire. | |
| */ | |
| - | if(co->expires && (co->expires < c->next_expiration)) |
| - | c->next_expiration = co->expires; |
| + | if(co->expires && (co->expires < ci->next_expiration)) |
| + | ci->next_expiration = co->expires; |
| return co; | |
| + | fail: |
| + | freecookie(co); |
| + | return NULL; |
| } | |
| @@ -1210,28 +1208,30 @@ Curl_cookie_add(struct Curl_easy *data, | |
| */ | |
| struct CookieInfo *Curl_cookie_init(struct Curl_easy *data, | |
| const char *file, | |
| - | struct CookieInfo *inc, |
| + | struct CookieInfo *ci, |
| bool newsession) | |
| { | |
| - | struct CookieInfo *c; |
| FILE *handle = NULL; | |
| - | if(!inc) { |
| + | if(!ci) { |
| + | int i; |
| + | |
| /* we did not get a struct, create one */ | |
| - | c = calloc(1, sizeof(struct CookieInfo)); |
| - | if(!c) |
| + | ci = calloc(1, sizeof(struct CookieInfo)); |
| + | if(!ci) |
| return NULL; /* failed to get memory */ | |
| + | |
| + | /* This does not use the destructor callback since we want to add |
| + | and remove to lists while keeping the cookie struct intact */ |
| + | for(i = 0; i < COOKIE_HASH_SIZE; i++) |
| + | Curl_llist_init(&ci->cookielist[i], NULL); |
| /* | |
| * Initialize the next_expiration time to signal that we do not have enough | |
| * information yet. | |
| */ | |
| - | c->next_expiration = CURL_OFF_T_MAX; |
| + | ci->next_expiration = CURL_OFF_T_MAX; |
| } | |
| - | else { |
| - | /* we got an already existing one, use that */ |
| - | c = inc; |
| - | } |
| - | c->newsession = newsession; /* new session? */ |
| + | ci->newsession = newsession; /* new session? */ |
| if(data) { | |
| FILE *fp = NULL; | |
| @@ -1247,7 +1247,7 @@ struct CookieInfo *Curl_cookie_init(struct Curl_easy *data, | |
| } | |
| } | |
| - | c->running = FALSE; /* this is not running, this is init */ |
| + | ci->running = FALSE; /* this is not running, this is init */ |
| if(fp) { | |
| struct dynbuf buf; | |
| Curl_dyn_init(&buf, MAX_COOKIE_LINE); | |
| @@ -1262,7 +1262,7 @@ struct CookieInfo *Curl_cookie_init(struct Curl_easy *data, | |
| lineptr++; | |
| } | |
| - | Curl_cookie_add(data, c, headerline, TRUE, lineptr, NULL, NULL, TRUE); |
| + | Curl_cookie_add(data, ci, headerline, TRUE, lineptr, NULL, NULL, TRUE); |
| } | |
| Curl_dyn_free(&buf); /* free the line buffer */ | |
| @@ -1270,16 +1270,16 @@ struct CookieInfo *Curl_cookie_init(struct Curl_easy *data, | |
| * Remove expired cookies from the hash. We must make sure to run this | |
| * after reading the file, and not on every cookie. | |
| */ | |
| - | remove_expired(c); |
| + | remove_expired(ci); |
| if(handle) | |
| fclose(handle); | |
| } | |
| data->state.cookie_engine = TRUE; | |
| } | |
| - | c->running = TRUE; /* now, we are running */ |
| + | ci->running = TRUE; /* now, we are running */ |
| - | return c; |
| + | return ci; |
| } | |
| /* | |
| @@ -1334,38 +1334,6 @@ static int cookie_sort_ct(const void *p1, const void *p2) | |
| return (c2->creationtime > c1->creationtime) ? 1 : -1; | |
| } | |
| - | #define CLONE(field) \ |
| - | do { \ |
| - | if(src->field) { \ |
| - | d->field = strdup(src->field); \ |
| - | if(!d->field) \ |
| - | goto fail; \ |
| - | } \ |
| - | } while(0) |
| - | |
| - | static struct Cookie *dup_cookie(struct Cookie *src) |
| - | { |
| - | struct Cookie *d = calloc(1, sizeof(struct Cookie)); |
| - | if(d) { |
| - | CLONE(domain); |
| - | CLONE(path); |
| - | CLONE(spath); |
| - | CLONE(name); |
| - | CLONE(value); |
| - | d->expires = src->expires; |
| - | d->tailmatch = src->tailmatch; |
| - | d->secure = src->secure; |
| - | d->livecookie = src->livecookie; |
| - | d->httponly = src->httponly; |
| - | d->creationtime = src->creationtime; |
| - | } |
| - | return d; |
| - | |
| - | fail: |
| - | freecookie(d); |
| - | return NULL; |
| - | } |
| - | |
| /* | |
| * Curl_cookie_getlist | |
| * | |
| @@ -1374,31 +1342,35 @@ fail: | |
| * if a secure connection is achieved or not. | |
| * | |
| * It shall only return cookies that have not expired. | |
| + | * |
| + | * Returns 0 when there is a list returned. Otherwise non-zero. |
| */ | |
| - | struct Cookie *Curl_cookie_getlist(struct Curl_easy *data, |
| - | struct CookieInfo *c, |
| - | const char *host, const char *path, |
| - | bool secure) |
| + | int Curl_cookie_getlist(struct Curl_easy *data, |
| + | struct CookieInfo *ci, |
| + | const char *host, const char *path, |
| + | bool secure, |
| + | struct Curl_llist *list) |
| { | |
| - | struct Cookie *newco; |
| - | struct Cookie *co; |
| - | struct Cookie *mainco = NULL; |
| size_t matches = 0; | |
| bool is_ip; | |
| const size_t myhash = cookiehash(host); | |
| + | struct Curl_llist_node *n; |
| - | if(!c || !c->cookies[myhash]) |
| - | return NULL; /* no cookie struct or no cookies in the struct */ |
| + | Curl_llist_init(list, NULL); |
| + | |
| + | if(!ci || !Curl_llist_count(&ci->cookielist[myhash])) |
| + | return 1; /* no cookie struct or no cookies in the struct */ |
| /* at first, remove expired cookies */ | |
| - | remove_expired(c); |
| + | remove_expired(ci); |
| /* check if host is an IP(v4|v6) address */ | |
| is_ip = Curl_host_is_ipnum(host); | |
| - | co = c->cookies[myhash]; |
| + | for(n = Curl_llist_head(&ci->cookielist[myhash]); |
| + | n; n = Curl_node_next(n)) { |
| + | struct Cookie *co = Curl_node_elem(n); |
| - | while(co) { |
| /* if the cookie requires we are secure we must only continue if we are! */ | |
| if(co->secure ? secure : TRUE) { | |
| @@ -1419,31 +1391,18 @@ struct Cookie *Curl_cookie_getlist(struct Curl_easy *data, | |
| if(!co->spath || pathmatch(co->spath, path) ) { | |
| /* | |
| - | * and now, we know this is a match and we should create an |
| - | * entry for the return-linked-list |
| + | * This is a match and we add it to the return-linked-list |
| */ | |
| - | |
| - | newco = dup_cookie(co); |
| - | if(newco) { |
| - | /* then modify our next */ |
| - | newco->next = mainco; |
| - | |
| - | /* point the main to us */ |
| - | mainco = newco; |
| - | |
| - | matches++; |
| - | if(matches >= MAX_COOKIE_SEND_AMOUNT) { |
| - | infof(data, "Included max number of cookies (%zu) in request!", |
| - | matches); |
| - | break; |
| - | } |
| + | Curl_llist_append(list, co, &co->getnode); |
| + | matches++; |
| + | if(matches >= MAX_COOKIE_SEND_AMOUNT) { |
| + | infof(data, "Included max number of cookies (%zu) in request!", |
| + | matches); |
| + | break; |
| } | |
| - | else |
| - | goto fail; |
| } | |
| } | |
| } | |
| - | co = co->next; |
| } | |
| if(matches) { | |
| @@ -1460,30 +1419,29 @@ struct Cookie *Curl_cookie_getlist(struct Curl_easy *data, | |
| if(!array) | |
| goto fail; | |
| - | co = mainco; |
| + | n = Curl_llist_head(list); |
| - | for(i = 0; co; co = co->next) |
| - | array[i++] = co; |
| + | for(i = 0; n; n = Curl_node_next(n)) |
| + | array[i++] = Curl_node_elem(n); |
| /* now sort the cookie pointers in path length order */ | |
| qsort(array, matches, sizeof(struct Cookie *), cookie_sort); | |
| /* remake the linked list order according to the new order */ | |
| + | Curl_llist_destroy(list, NULL); |
| - | mainco = array[0]; /* start here */ |
| - | for(i = 0; i < matches-1; i++) |
| - | array[i]->next = array[i + 1]; |
| - | array[matches-1]->next = NULL; /* terminate the list */ |
| + | for(i = 0; i < matches; i++) |
| + | Curl_llist_append(list, array[i], &array[i]->getnode); |
| free(array); /* remove the temporary data again */ | |
| } | |
| - | return mainco; /* return the new list */ |
| + | return 0; /* success */ |
| fail: | |
| /* failure, clear up the allocated chain and return NULL */ | |
| - | Curl_cookie_freelist(mainco); |
| - | return NULL; |
| + | Curl_llist_destroy(list, NULL); |
| + | return 2; /* error */ |
| } | |
| /* | |
| @@ -1491,30 +1449,21 @@ fail: | |
| * | |
| * Clear all existing cookies and reset the counter. | |
| */ | |
| - | void Curl_cookie_clearall(struct CookieInfo *cookies) |
| + | void Curl_cookie_clearall(struct CookieInfo *ci) |
| { | |
| - | if(cookies) { |
| + | if(ci) { |
| unsigned int i; | |
| for(i = 0; i < COOKIE_HASH_SIZE; i++) { | |
| - | Curl_cookie_freelist(cookies->cookies[i]); |
| - | cookies->cookies[i] = NULL; |
| + | struct Curl_llist_node *n; |
| + | for(n = Curl_llist_head(&ci->cookielist[i]); n;) { |
| + | struct Cookie *c = Curl_node_elem(n); |
| + | struct Curl_llist_node *e = Curl_node_next(n); |
| + | Curl_node_remove(n); |
| + | freecookie(c); |
| + | n = e; |
| + | } |
| } | |
| - | cookies->numcookies = 0; |
| - | } |
| - | } |
| - | |
| - | /* |
| - | * Curl_cookie_freelist |
| - | * |
| - | * Free a list of cookies previously returned by Curl_cookie_getlist(); |
| - | */ |
| - | void Curl_cookie_freelist(struct Cookie *co) |
| - | { |
| - | struct Cookie *next; |
| - | while(co) { |
| - | next = co->next; |
| - | freecookie(co); |
| - | co = next; |
| + | ci->numcookies = 0; |
| } | |
| } | |
| @@ -1523,39 +1472,26 @@ void Curl_cookie_freelist(struct Cookie *co) | |
| * | |
| * Free all session cookies in the cookies list. | |
| */ | |
| - | void Curl_cookie_clearsess(struct CookieInfo *cookies) |
| + | void Curl_cookie_clearsess(struct CookieInfo *ci) |
| { | |
| - | struct Cookie *first, *curr, *next, *prev = NULL; |
| unsigned int i; | |
| - | if(!cookies) |
| + | if(!ci) |
| return; | |
| for(i = 0; i < COOKIE_HASH_SIZE; i++) { | |
| - | if(!cookies->cookies[i]) |
| - | continue; |
| - | |
| - | first = curr = prev = cookies->cookies[i]; |
| + | struct Curl_llist_node *n = Curl_llist_head(&ci->cookielist[i]); |
| + | struct Curl_llist_node *e = NULL; |
| - | for(; curr; curr = next) { |
| - | next = curr->next; |
| + | for(; n; n = e) { |
| + | struct Cookie *curr = Curl_node_elem(n); |
| + | e = Curl_node_next(n); /* in case the node is removed, get it early */ |
| if(!curr->expires) { | |
| - | if(first == curr) |
| - | first = next; |
| - | |
| - | if(prev == curr) |
| - | prev = next; |
| - | else |
| - | prev->next = next; |
| - | |
| + | Curl_node_remove(n); |
| freecookie(curr); | |
| - | cookies->numcookies--; |
| + | ci->numcookies--; |
| } | |
| - | else |
| - | prev = curr; |
| } | |
| - | |
| - | cookies->cookies[i] = first; |
| } | |
| } | |
| @@ -1564,13 +1500,11 @@ void Curl_cookie_clearsess(struct CookieInfo *cookies) | |
| * | |
| * Free a "cookie object" previous created with Curl_cookie_init(). | |
| */ | |
| - | void Curl_cookie_cleanup(struct CookieInfo *c) |
| + | void Curl_cookie_cleanup(struct CookieInfo *ci) |
| { | |
| - | if(c) { |
| - | unsigned int i; |
| - | for(i = 0; i < COOKIE_HASH_SIZE; i++) |
| - | Curl_cookie_freelist(c->cookies[i]); |
| - | free(c); /* free the base struct as well */ |
| + | if(ci) { |
| + | Curl_cookie_clearall(ci); |
| + | free(ci); /* free the base struct as well */ |
| } | |
| } | |
| @@ -1616,20 +1550,20 @@ static char *get_netscape_format(const struct Cookie *co) | |
| * The function returns non-zero on write failure. | |
| */ | |
| static CURLcode cookie_output(struct Curl_easy *data, | |
| - | struct CookieInfo *c, const char *filename) |
| + | struct CookieInfo *ci, |
| + | const char *filename) |
| { | |
| - | struct Cookie *co; |
| FILE *out = NULL; | |
| bool use_stdout = FALSE; | |
| char *tempstore = NULL; | |
| CURLcode error = CURLE_OK; | |
| - | if(!c) |
| + | if(!ci) |
| /* no cookie engine alive */ | |
| return CURLE_OK; | |
| /* at first, remove expired cookies */ | |
| - | remove_expired(c); |
| + | remove_expired(ci); |
| if(!strcmp("-", filename)) { | |
| /* use stdout */ | |
| @@ -1647,12 +1581,13 @@ static CURLcode cookie_output(struct Curl_easy *data, | |
| "# This file was generated by libcurl! Edit at your own risk.\n\n", | |
| out); | |
| - | if(c->numcookies) { |
| + | if(ci->numcookies) { |
| unsigned int i; | |
| size_t nvalid = 0; | |
| struct Cookie **array; | |
| + | struct Curl_llist_node *n; |
| - | array = calloc(1, sizeof(struct Cookie *) * c->numcookies); |
| + | array = calloc(1, sizeof(struct Cookie *) * ci->numcookies); |
| if(!array) { | |
| error = CURLE_OUT_OF_MEMORY; | |
| goto error; | |
| @@ -1660,7 +1595,9 @@ static CURLcode cookie_output(struct Curl_easy *data, | |
| /* only sort the cookies with a domain property */ | |
| for(i = 0; i < COOKIE_HASH_SIZE; i++) { | |
| - | for(co = c->cookies[i]; co; co = co->next) { |
| + | for(n = Curl_llist_head(&ci->cookielist[i]); n; |
| + | n = Curl_node_next(n)) { |
| + | struct Cookie *co = Curl_node_elem(n); |
| if(!co->domain) | |
| continue; | |
| array[nvalid++] = co; | |
| @@ -1712,15 +1649,17 @@ static struct curl_slist *cookie_list(struct Curl_easy *data) | |
| { | |
| struct curl_slist *list = NULL; | |
| struct curl_slist *beg; | |
| - | struct Cookie *c; |
| - | char *line; |
| unsigned int i; | |
| + | struct Curl_llist_node *n; |
| if(!data->cookies || (data->cookies->numcookies == 0)) | |
| return NULL; | |
| for(i = 0; i < COOKIE_HASH_SIZE; i++) { | |
| - | for(c = data->cookies->cookies[i]; c; c = c->next) { |
| + | for(n = Curl_llist_head(&data->cookies->cookielist[i]); n; |
| + | n = Curl_node_next(n)) { |
| + | struct Cookie *c = Curl_node_elem(n); |
| + | char *line; |
| if(!c->domain) | |
| continue; | |
| line = get_netscape_format(c); | |
| @@ -27,20 +27,24 @@ | |
| #include <curl/curl.h> | |
| + | #include "llist.h" |
| + | |
| struct Cookie { | |
| - | struct Cookie *next; /* next in the chain */ |
| - | char *name; /* <this> = value */ |
| - | char *value; /* name = <this> */ |
| + | struct Curl_llist_node node; /* for the main cookie list */ |
| + | struct Curl_llist_node getnode; /* for getlist */ |
| + | char *name; /* <this> = value */ |
| + | char *value; /* name = <this> */ |
| char *path; /* path = <this> which is in Set-Cookie: */ | |
| char *spath; /* sanitized cookie path */ | |
| - | char *domain; /* domain = <this> */ |
| - | curl_off_t expires; /* expires = <this> */ |
| - | bool tailmatch; /* whether we do tail-matching of the domain name */ |
| - | bool secure; /* whether the 'secure' keyword was used */ |
| - | bool livecookie; /* updated from a server, not a stored file */ |
| - | bool httponly; /* true if the httponly directive is present */ |
| - | int creationtime; /* time when the cookie was written */ |
| - | unsigned char prefix; /* bitmap fields indicating which prefix are set */ |
| + | char *domain; /* domain = <this> */ |
| + | curl_off_t expires; /* expires = <this> */ |
| + | int creationtime; /* time when the cookie was written */ |
| + | BIT(tailmatch); /* tail-match the domain name */ |
| + | BIT(secure); /* the 'secure' keyword was used */ |
| + | BIT(livecookie); /* updated from a server, not a stored file */ |
| + | BIT(httponly); /* the httponly directive is present */ |
| + | BIT(prefix_secure); /* secure prefix is set */ |
| + | BIT(prefix_host); /* host prefix is set */ |
| }; | |
| /* | |
| @@ -53,8 +57,8 @@ struct Cookie { | |
| #define COOKIE_HASH_SIZE 63 | |
| struct CookieInfo { | |
| - | /* linked list of cookies we know of */ |
| - | struct Cookie *cookies[COOKIE_HASH_SIZE]; |
| + | /* linked lists of cookies we know of */ |
| + | struct Curl_llist cookielist[COOKIE_HASH_SIZE]; |
| curl_off_t next_expiration; /* the next time at which expiration happens */ | |
| int numcookies; /* number of cookies in the "jar" */ | |
| int lastct; /* last creation-time used in the jar */ | |
| @@ -112,10 +116,10 @@ struct Cookie *Curl_cookie_add(struct Curl_easy *data, | |
| const char *domain, const char *path, | |
| bool secure); | |
| - | struct Cookie *Curl_cookie_getlist(struct Curl_easy *data, |
| - | struct CookieInfo *c, const char *host, |
| - | const char *path, bool secure); |
| - | void Curl_cookie_freelist(struct Cookie *cookies); |
| + | int Curl_cookie_getlist(struct Curl_easy *data, |
| + | struct CookieInfo *c, const char *host, |
| + | const char *path, bool secure, |
| + | struct Curl_llist *list); |
| void Curl_cookie_clearall(struct CookieInfo *cookies); | |
| void Curl_cookie_clearsess(struct CookieInfo *cookies); | |
| @@ -2248,8 +2248,9 @@ CURLcode Curl_http_cookies(struct Curl_easy *data, | |
| addcookies = data->set.str[STRING_COOKIE]; | |
| if(data->cookies || addcookies) { | |
| - | struct Cookie *co = NULL; /* no cookies from start */ |
| + | struct Curl_llist list; |
| int count = 0; | |
| + | int rc = 1; |
| if(data->cookies && data->state.cookie_engine) { | |
| const char *host = data->state.aptr.cookiehost ? | |
| @@ -2260,15 +2261,17 @@ CURLcode Curl_http_cookies(struct Curl_easy *data, | |
| !strcmp(host, "127.0.0.1") || | |
| !strcmp(host, "::1") ? TRUE : FALSE; | |
| Curl_share_lock(data, CURL_LOCK_DATA_COOKIE, CURL_LOCK_ACCESS_SINGLE); | |
| - | co = Curl_cookie_getlist(data, data->cookies, host, data->state.up.path, |
| - | secure_context); |
| + | rc = Curl_cookie_getlist(data, data->cookies, host, data->state.up.path, |
| + | secure_context, &list); |
| Curl_share_unlock(data, CURL_LOCK_DATA_COOKIE); | |
| } | |
| - | if(co) { |
| - | struct Cookie *store = co; |
| + | if(!rc) { |
| + | struct Curl_llist_node *n; |
| size_t clen = 8; /* hold the size of the generated Cookie: header */ | |
| - | /* now loop through all cookies that matched */ |
| - | while(co) { |
| + | |
| + | /* loop through all cookies that matched */ |
| + | for(n = Curl_llist_head(&list); n; n = Curl_node_next(n)) { |
| + | struct Cookie *co = Curl_node_elem(n); |
| if(co->value) { | |
| size_t add; | |
| if(!count) { | |
| @@ -2290,9 +2293,8 @@ CURLcode Curl_http_cookies(struct Curl_easy *data, | |
| clen += add + (count ? 2 : 0); | |
| count++; | |
| } | |
| - | co = co->next; /* next cookie please */ |
| } | |
| - | Curl_cookie_freelist(store); |
| + | Curl_llist_destroy(&list, NULL); |
| } | |
| if(addcookies && !result && !linecap) { | |
| if(!count) | |