http: expect 100 rework
No binary (build failed)
—
$ git checkout -f 80a3b830ccf7d40864bdabd16bbaff8cb4c9703b
Previous HEAD position was b6006381fb curl_sha512_256: work around a NetBSD bug
HEAD is now at 80a3b830cc http: expect 100 rework
$ git clean -fdx
Removing Makefile
Removing Makefile.in
Removing aclocal.m4
Removing autom4te.cache/
Removing compile
Removing config.guess
Removing config.log
Removing config.status
Removing config.sub
Removing configure
Removing curl-config
Removing depcomp
Removing docs/Makefile
Removing docs/Makefile.in
Removing docs/cmdline-opts/Makefile
Removing docs/cmdline-opts/Makefile.in
Removing docs/cmdline-opts/curl.1
Removing docs/curl-config.1
Removing docs/examples/.deps/
Removing docs/examples/Makefile
Removing docs/examples/Makefile.in
Removing docs/libcurl/Makefile
Removing docs/libcurl/Makefile.in
Removing docs/libcurl/opts/Makefile
Removing docs/libcurl/opts/Makefile.in
Removing include/Makefile
Removing include/Makefile.in
Removing include/curl/Makefile
Removing include/curl/Makefile.in
Removing install-sh
Removing lib/.deps/
Removing lib/.dirstamp
Removing lib/.libs/
Removing lib/Makefile
Removing lib/Makefile.in
Removing lib/base64.o
Removing lib/curl_config.h
Removing lib/curl_config.h.in
Removing lib/curl_multibyte.o
Removing lib/dynbuf.o
Removing lib/libcurl.la
Removing lib/libcurl.plist
Removing lib/libcurl.vers
Removing lib/libcurl_la-altsvc.lo
Removing lib/libcurl_la-altsvc.o
Removing lib/libcurl_la-amigaos.lo
Removing lib/libcurl_la-amigaos.o
Removing lib/libcurl_la-asyn-ares.lo
Removing lib/libcurl_la-asyn-ares.o
Removing lib/libcurl_la-asyn-thread.lo
Removing lib/libcurl_la-asyn-thread.o
Removing lib/libcurl_la-base64.lo
Removing lib/libcurl_la-base64.o
Removing lib/libcurl_la-bufq.lo
Removing lib/libcurl_la-bufq.o
Removing lib/libcurl_la-bufref.lo
Removing lib/libcurl_la-bufref.o
Removing lib/libcurl_la-c-hyper.lo
Removing lib/libcurl_la-c-hyper.o
Removing lib/libcurl_la-cf-h1-proxy.lo
Removing lib/libcurl_la-cf-h1-proxy.o
Removing lib/libcurl_la-cf-h2-proxy.lo
Removing lib/libcurl_la-cf-h2-proxy.o
Removing lib/libcurl_la-cf-haproxy.lo
Removing lib/libcurl_la-cf-haproxy.o
Removing lib/libcurl_la-cf-https-connect.lo
Removing lib/libcurl_la-cf-https-connect.o
Removing lib/libcurl_la-cf-socket.lo
Removing lib/libcurl_la-cf-socket.o
Removing lib/libcurl_la-cfilters.lo
Removing lib/libcurl_la-cfilters.o
Removing lib/libcurl_la-conncache.lo
Removing lib/libcurl_la-conncache.o
Removing lib/libcurl_la-connect.lo
Removing lib/libcurl_la-connect.o
Removing lib/libcurl_la-content_encoding.lo
Removing lib/libcurl_la-content_encoding.o
Removing lib/libcurl_la-cookie.lo
Removing lib/libcurl_la-cookie.o
Removing lib/libcurl_la-curl_addrinfo.lo
Removing lib/libcurl_la-curl_addrinfo.o
Removing lib/libcurl_la-curl_des.lo
Removing lib/libcurl_la-curl_des.o
Removing lib/libcurl_la-curl_endian.lo
Removing lib/libcurl_la-curl_endian.o
Removing lib/libcurl_la-curl_fnmatch.lo
Removing lib/libcurl_la-curl_fnmatch.o
Removing lib/libcurl_la-curl_get_line.lo
Removing lib/libcurl_la-curl_get_line.o
Removing lib/libcurl_la-curl_gethostname.lo
Removing lib/libcurl_la-curl_gethostname.o
Removing lib/libcurl_la-curl_gssapi.lo
Removing lib/libcurl_la-curl_gssapi.o
Removing lib/libcurl_la-curl_memrchr.lo
Removing lib/libcurl_la-curl_memrchr.o
Removing lib/libcurl_la-curl_multibyte.lo
Removing lib/libcurl_la-curl_multibyte.o
Removing lib/libcurl_la-curl_ntlm_core.lo
Removing lib/libcurl_la-curl_ntlm_core.o
Removing lib/libcurl_la-curl_ntlm_wb.lo
Removing lib/libcurl_la-curl_ntlm_wb.o
Removing lib/libcurl_la-curl_path.lo
Removing lib/libcurl_la-curl_path.o
Removing lib/libcurl_la-curl_range.lo
Removing lib/libcurl_la-curl_range.o
Removing lib/libcurl_la-curl_rtmp.lo
Removing lib/libcurl_la-curl_rtmp.o
Removing lib/libcurl_la-curl_sasl.lo
Removing lib/libcurl_la-curl_sasl.o
Removing lib/libcurl_la-curl_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-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-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/slist_wc.o
Removing src/tool_binmode.o
Removing src/tool_bname.o
Removing src/tool_cb_dbg.o
Removing src/tool_cb_hdr.o
Removing src/tool_cb_prg.o
Removing src/tool_cb_rea.o
Removing src/tool_cb_see.o
Removing src/tool_cb_wrt.o
Removing src/tool_cfgable.o
Removing src/tool_dirhie.o
Removing src/tool_doswin.o
Removing src/tool_easysrc.o
Removing src/tool_filetime.o
Removing src/tool_findfile.o
Removing src/tool_formparse.o
Removing src/tool_getparam.o
Removing src/tool_getpass.o
Removing src/tool_help.o
Removing src/tool_helpers.o
Removing src/tool_hugehelp.c
Removing src/tool_hugehelp.o
Removing src/tool_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:123: installing './compile'
configure.ac:425: installing './config.guess'
configure.ac:425: installing './config.sub'
configure.ac:123: installing './install-sh'
configure.ac:129: 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 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.7.0-DEV
checking for httpd... no
checking for apache2... no
checking for apachectl... no
checking for apxs... no
configure: httpd/apache2 not in PATH, http tests disabled
configure: apxs not in PATH, http tests disabled
checking for nghttpx... no
checking for caddy... no
checking build system type... x86_64-pc-linux-gnu
checking host system type... x86_64-pc-linux-gnu
checking for grep that handles long lines and -e... (cached) /usr/bin/grep
checking for egrep... /usr/bin/grep -E
checking if OS is AIX (to define _ALL_SOURCE)... no
checking if _THREAD_SAFE is already defined... no
checking if _THREAD_SAFE is actually needed... no
checking if _THREAD_SAFE is onwards defined... no
checking if _REENTRANT is already defined... no
checking if _REENTRANT is actually needed... no
checking if _REENTRANT is onwards defined... no
checking for special C compiler options needed for large files... no
checking for _FILE_OFFSET_BITS value needed for large files... no
checking how to print strings... printf
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for fgrep... /usr/bin/grep -F
checking for ld used by ccache gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu format... func_convert_file_noop
checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for dlltool... no
checking how to associate runtime and link libraries... printf %s\n
checking for archiver @FILE support... @
checking for strip... strip
checking for ranlib... ranlib
checking command to parse /usr/bin/nm -B output from ccache gcc object... ok
checking for sysroot... no
checking for a working dd... /usr/bin/dd
checking how to truncate binary pipes... /usr/bin/dd bs=4096 count=1
checking for mt... mt
checking if mt is a manifest tool... no
checking for dlfcn.h... yes
checking for objdir... .libs
checking if ccache gcc supports -fno-rtti -fno-exceptions... no
checking for ccache gcc option to produce PIC... -fPIC -DPIC
checking if ccache gcc PIC flag -fPIC -DPIC works... yes
checking if ccache gcc static flag -static works... yes
checking if ccache gcc supports -c -o file.o... yes
checking if ccache gcc supports -c -o file.o... (cached) yes
checking whether the ccache gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... no
checking whether to build static libraries... yes
checking whether to build shared libraries with -version-info... yes
checking whether to build shared libraries with -no-undefined... no
checking whether to build shared libraries with -mimpure-text... no
checking whether to build shared libraries with PIC... yes
checking whether to build static libraries with PIC... yes
checking whether to build shared libraries only... no
checking whether to build static libraries only... yes
checking for windres... no
checking for inline... inline
checking if cpp -P is needed... yes
checking if cpp -P works... yes
checking if compiler is DEC/Compaq/HP C... no
checking if compiler is HP-UX C... no
checking if compiler is IBM C... no
checking if compiler is Intel C... no
checking if compiler is clang... no
checking if compiler is GNU C... yes
checking compiler version... gcc '1100' (raw: '11')
checking if compiler is SGI MIPSpro C... no
checking if compiler is SGI MIPS C... no
checking if compiler is SunPro C... no
checking if compiler is Tiny C... no
checking 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 link macOS CoreFoundation, CoreServices, and SystemConfiguration frameworks... no
checking to see if the compiler supports __builtin_available()... no
checking whether to support http... yes
checking whether to support ftp... yes
checking whether to support file... yes
checking whether to support ldap... yes
checking whether to support ldaps... yes
checking whether to support rtsp... yes
checking whether to support proxies... yes
checking whether to support dict... yes
checking whether to support telnet... yes
checking whether to support tftp... yes
checking whether to support pop3... yes
checking whether to support imap... yes
checking whether to support smb... yes
checking whether to support smtp... yes
checking whether to support gopher... yes
checking whether to support mqtt... no
checking whether to build documentation... no
checking whether to provide built-in manual... yes
checking whether to enable generation of C code... yes
checking whether to use libgcc... no
checking if X/Open network library is required... no
checking for gethostbyname... yes
checking 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 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 enable Windows native IDN (Windows native builds only)... no
checking whether to build with libidn2... (assumed) yes
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libidn2 options with pkg-config... no
configure: IDN_LIBS: "-lidn2"
configure: IDN_LDFLAGS: ""
configure: IDN_CPPFLAGS: ""
configure: IDN_DIR: ""
checking if idn2_lookup_ul can be linked... no
checking for idn2.h... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libnghttp2 options with pkg-config... no
checking for nghttp2_session_get_stream_local_window_size in -lnghttp2... no
checking for 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 socket.h... no
checking for sys/resource.h... yes
checking for libgen.h... yes
checking for locale.h... yes
checking for stdbool.h... yes
checking for sys/filio.h... no
checking for sys/wait.h... yes
checking for setjmp.h... yes
checking for an ANSI C-conforming const... yes
checking for 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 for sys/types.h... (cached) yes
checking for socket.h... (cached) no
checking if closesocket can be linked... no
checking if closesocket might be used... no
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking if CloseSocket can be linked... no
checking if CloseSocket might be used... no
checking 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 net/if.h... (cached) yes
checking if if_nametoindex can be linked... yes
checking if if_nametoindex is prototyped... yes
checking if if_nametoindex is compilable... yes
checking if if_nametoindex usage allowed... yes
checking if if_nametoindex might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for ifaddrs.h... yes
checking if getifaddrs can be linked... yes
checking if getifaddrs is prototyped... yes
checking if getifaddrs is compilable... yes
checking if getifaddrs seems to work... yes
checking if getifaddrs usage allowed... yes
checking if getifaddrs might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/time.h... (cached) yes
checking if gmtime_r can be linked... yes
checking if gmtime_r is prototyped... yes
checking if gmtime_r is compilable... yes
checking if gmtime_r seems to work... yes
checking if gmtime_r usage allowed... yes
checking if gmtime_r might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/socket.h... (cached) yes
checking for netinet/in.h... (cached) yes
checking for arpa/inet.h... (cached) yes
checking if inet_ntop can be linked... yes
checking if inet_ntop is prototyped... yes
checking if inet_ntop is compilable... yes
checking if inet_ntop seems to work... yes
checking if inet_ntop usage allowed... yes
checking if inet_ntop might be used... yes
checking if inet_pton can be linked... yes
checking if inet_pton is prototyped... yes
checking if inet_pton is compilable... yes
checking if inet_pton seems to work... yes
checking if inet_pton usage allowed... yes
checking if inet_pton might be used... yes
checking 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... no
checking if memrchr might be used... no
checking for sys/types.h... (cached) yes
checking for poll.h... (cached) yes
checking for sys/poll.h... (cached) yes
checking if poll can be linked... yes
checking if poll is prototyped... yes
checking if poll is compilable... yes
checking if poll seems to work... yes
checking if poll usage allowed... yes
checking if poll might be used... yes
checking for sys/types.h... (cached) yes
checking 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... no
checking if strerror_r is POSIX like... yes
checking if strerror_r seems to work... yes
checking if strerror_r usage allowed... yes
checking if strerror_r might be used... yes
checking if stricmp can be linked... no
checking if stricmp might be used... no
checking if strtok_r can be linked... yes
checking if strtok_r is prototyped... yes
checking if strtok_r is compilable... yes
checking if strtok_r usage allowed... yes
checking if strtok_r might be used... yes
checking if strtoll can be linked... yes
checking if strtoll is prototyped... yes
checking if strtoll is compilable... yes
checking if strtoll usage allowed... yes
checking if strtoll might be used... yes
checking for ccache gcc options needed to detect all undeclared functions... none needed
checking whether getpwuid_r is declared... yes
checking for _fseeki64... no
checking deeper for _fseeki64... but still no
checking for arc4random... no
checking deeper for arc4random... but still no
checking for fnmatch... yes
checking for fseeko... yes
checking for geteuid... yes
checking for getpass_r... no
checking deeper for getpass_r... but still no
checking for getppid... yes
checking for getpwuid... yes
checking for getpwuid_r... yes
checking for getrlimit... yes
checking for gettimeofday... yes
checking for if_nametoindex... yes
checking for mach_absolute_time... no
checking deeper for mach_absolute_time... but still no
checking for pipe... yes
checking for sched_yield... yes
checking for sendmsg... yes
checking for setlocale... yes
checking for setmode... no
checking deeper for setmode... but still no
checking for setrlimit... yes
checking for snprintf... yes
checking for utime... yes
checking for utimes... yes
checking whether fseeko is declared... yes
checking how to set a socket into non-blocking mode... fcntl O_NONBLOCK
checking for perl... /usr/bin/perl
checking whether to enable the threaded resolver... yes
checking whether to use POSIX threads for threaded resolver... auto
checking for pthread.h... yes
checking for pthread_create... yes
checking convert -I options to -isystem... yes
checking whether to enable verbose strings... yes
checking whether to enable SSPI support (Windows native builds only)... no
checking whether to enable 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 NTLM delegation to winbind's helper... no
checking whether to enable TLS-SRP authentication... yes
checking whether to enable Unix domain sockets... auto
checking for struct sockaddr_un.sun_path... yes
checking whether to support cookies... yes
checking whether to support socketpair... yes
checking whether to support HTTP authentication... yes
checking whether to support DoH... yes
checking whether to support the MIME API... yes
checking whether to support 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 DNS shuffling... yes
checking whether to support curl_easy_option*... yes
checking whether to support alt-svc... yes
checking whether to support headers-api... yes
configure: disables HSTS due to lack of SSL
checking whether to support WebSockets... no
checking whether hiding of library internal symbols will actually happen... yes
checking 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 lib/libcurl.plist
config.status: creating tests/Makefile
config.status: creating tests/config
config.status: creating tests/certs/Makefile
config.status: creating tests/certs/scripts/Makefile
config.status: creating tests/data/Makefile
config.status: creating tests/server/Makefile
config.status: creating tests/libtest/Makefile
config.status: creating tests/unit/Makefile
config.status: creating tests/http/config.ini
config.status: creating tests/http/Makefile
config.status: creating tests/http/clients/Makefile
config.status: creating packages/Makefile
config.status: creating packages/vms/Makefile
config.status: creating curl-config
config.status: creating libcurl.pc
config.status: creating lib/curl_config.h
config.status: executing depfiles commands
config.status: executing libtool commands
configure: Configured to build curl/libcurl:
Host setup: x86_64-pc-linux-gnu
Install prefix: /usr/local
Compiler: ccache gcc
CFLAGS: -Werror-implicit-function-declaration -O2 -Wno-system-headers
CPPFLAGS:
LDFLAGS:
LIBS: -lpsl -lz
curl version: 8.7.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: enabled
--libcurl option: enabled (--disable-libcurl-option)
Verbose errors: enabled (--disable-verbose)
Code coverage: disabled
SSPI: no (--enable-sspi)
ca cert bundle: no
ca cert path:
ca fallback:
LDAP: no (--enable-ldap / --with-ldap-lib / --with-lber-lib)
LDAPS: no (--enable-ldaps)
RTSP: enabled
RTMP: no (--with-librtmp)
PSL: enabled
Alt-svc: enabled (--disable-alt-svc)
Headers API: enabled (--disable-headers-api)
HSTS: no (--enable-hsts)
HTTP1: enabled (internal)
HTTP2: no (--with-nghttp2)
HTTP3: no (--with-ngtcp2 --with-nghttp3, --with-quiche, --with-openssl-quic, --with-msh3)
ECH: no (--enable-ech)
WebSockets: no (--enable-websockets)
Protocols: DICT FILE FTP GOPHER HTTP IMAP IPFS IPNS MQTT POP3 RTSP SMTP TELNET TFTP
Features: AsynchDNS IPv6 Largefile PSL UnixSockets alt-svc libz threadsafe
configure: WARNING: Cannot find libraries for LDAP support: LDAP disabled
configure: WARNING: libgsasl was not found
configure: WARNING: Cannot find libraries for IDN support: IDN disabled
$ 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-conncache.lo
CC libcurl_la-cfilters.lo
CC libcurl_la-connect.lo
CC libcurl_la-content_encoding.lo
CC libcurl_la-cookie.lo
CC libcurl_la-curl_addrinfo.lo
CC libcurl_la-curl_des.lo
CC libcurl_la-curl_endian.lo
CC libcurl_la-curl_fnmatch.lo
CC libcurl_la-curl_get_line.lo
CC libcurl_la-curl_gethostname.lo
CC libcurl_la-curl_gssapi.lo
CC libcurl_la-curl_memrchr.lo
CC libcurl_la-curl_multibyte.lo
CC libcurl_la-curl_ntlm_core.lo
CC libcurl_la-curl_ntlm_wb.lo
CC libcurl_la-curl_path.lo
CC libcurl_la-curl_range.lo
CC libcurl_la-curl_rtmp.lo
CC libcurl_la-curl_sasl.lo
CC libcurl_la-curl_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-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-ws.lo
CC libcurl_la-warnless.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-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'
RENDER curl-config.1
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'
GENERATE curl.1
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'
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
CC slist_wc.o
CC tool_binmode.o
CC tool_bname.o
CC tool_cb_dbg.o
CC tool_cb_hdr.o
CC tool_cb_rea.o
CC tool_cb_prg.o
CC tool_cb_see.o
CC tool_cb_wrt.o
CC tool_cfgable.o
CC tool_dirhie.o
CC tool_doswin.o
CC tool_easysrc.o
CC tool_filetime.o
CC tool_findfile.o
CC tool_formparse.o
CC tool_getparam.o
CC tool_getpass.o
CC tool_help.o
cd ../docs && make
CC tool_helpers.o
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
CC tool_ipfs.o
Making all in .
make[4]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
make[4]: Nothing to be done for 'all-am'.
make[4]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in cmdline-opts
CC tool_libinfo.o
make[4]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[4]: Nothing to be done for 'all'.
make[4]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
Making all in libcurl
CC tool_listhelp.o
make[4]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
Making all in opts
CC tool_main.o
make[5]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
make[5]: Nothing to be done for 'all'.
make[5]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
make[5]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[5]: Nothing to be done for 'all-am'.
make[5]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[4]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
CC tool_msgs.o
CC tool_operate.o
CC tool_operhlp.o
CC tool_paramhlp.o
CC tool_parsecfg.o
CC tool_progress.o
CC tool_setopt.o
CC tool_sleep.o
CC tool_stderr.o
CC tool_strdup.o
CC tool_urlglob.o
CC tool_util.o
CC tool_vms.o
CC tool_writeout.o
CC tool_writeout_json.o
CC tool_xattr.o
CC var.o
HUGE tool_hugehelp.c
CC ../lib/base64.o
CC ../lib/dynbuf.o
CC ../lib/curl_multibyte.o
CC ../lib/nonblock.o
CC ../lib/strtoofft.o
CC ../lib/timediff.o
CC ../lib/version_win32.o
CC ../lib/warnless.o
CC tool_hugehelp.o
CCLD curl
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
/bin/bash: line 3: /root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts/curl.txt: No such file or directory
/bin/bash: line 5: /root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts/curl.txt: No such file or directory
/usr/bin/ld: tool_operate.o: in function `operate':
tool_operate.c:(.text+0x56e1): undefined reference to `hugehelp'
collect2: error: ld returned 1 exit status
make[2]: *** [Makefile:1047: curl] Error 1
make[1]: *** [Makefile:1552: all-recursive] Error 1
make: *** [Makefile:1266: all-recursive] Error 1
| @@ -219,17 +219,16 @@ static int hyper_body_chunk(void *userdata, const hyper_buf *chunk) | |
| Curl_safefree(data->req.newurl); | |
| } | |
| #endif | |
| - | if(data->state.expect100header) { |
| - | Curl_expire_done(data, EXPIRE_100_TIMEOUT); |
| + | if(Curl_http_exp100_is_selected(data)) { |
| if(data->req.httpcode < 400) { | |
| - | k->exp100 = EXP100_SEND_DATA; |
| - | if(data->hyp.exp100_waker) { |
| - | hyper_waker_wake(data->hyp.exp100_waker); |
| - | data->hyp.exp100_waker = NULL; |
| + | Curl_http_exp100_got100(data); |
| + | if(data->hyp.send_body_waker) { |
| + | hyper_waker_wake(data->hyp.send_body_waker); |
| + | data->hyp.send_body_waker = NULL; |
| } | |
| } | |
| else { /* >= 4xx */ | |
| - | k->exp100 = EXP100_FAILED; |
| + | Curl_req_abort_sending(data); |
| } | |
| } | |
| if(data->state.hconnect && (data->req.httpcode/100 != 2) && | |
| @@ -353,20 +352,9 @@ CURLcode Curl_hyper_stream(struct Curl_easy *data, | |
| struct SingleRequest *k = &data->req; | |
| (void)conn; | |
| - | if(k->exp100 > EXP100_SEND_DATA) { |
| - | struct curltime now = Curl_now(); |
| - | timediff_t ms = Curl_timediff(now, k->start100); |
| - | if(ms >= data->set.expect_100_timeout) { |
| - | /* we've waited long enough, continue anyway */ |
| - | k->exp100 = EXP100_SEND_DATA; |
| - | k->keepon |= KEEP_SEND; |
| - | Curl_expire_done(data, EXPIRE_100_TIMEOUT); |
| - | infof(data, "Done waiting for 100-continue after %ldms", (long)ms); |
| - | if(data->hyp.exp100_waker) { |
| - | hyper_waker_wake(data->hyp.exp100_waker); |
| - | data->hyp.exp100_waker = NULL; |
| - | } |
| - | } |
| + | if(data->hyp.send_body_waker) { |
| + | hyper_waker_wake(data->hyp.send_body_waker); |
| + | data->hyp.send_body_waker = NULL; |
| } | |
| if(select_res & CURL_CSELECT_IN) { | |
| @@ -461,7 +449,7 @@ CURLcode Curl_hyper_stream(struct Curl_easy *data, | |
| reasonp = hyper_response_reason_phrase(resp); | |
| reason_len = hyper_response_reason_phrase_len(resp); | |
| - | if(http_status == 417 && data->state.expect100header) { |
| + | if(http_status == 417 && Curl_http_exp100_is_selected(data)) { |
| infof(data, "Got 417 while waiting for a 100"); | |
| data->state.disableexpect = TRUE; | |
| data->req.newurl = strdup(data->state.url); | |
| @@ -665,17 +653,6 @@ static int uploadstreamed(void *userdata, hyper_context *ctx, | |
| int rc = HYPER_POLL_ERROR; | |
| (void)ctx; | |
| - | if(data->req.exp100 > EXP100_SEND_DATA) { |
| - | if(data->req.exp100 == EXP100_FAILED) |
| - | return HYPER_POLL_ERROR; |
| - | |
| - | /* still waiting confirmation */ |
| - | if(data->hyp.exp100_waker) |
| - | hyper_waker_free(data->hyp.exp100_waker); |
| - | data->hyp.exp100_waker = hyper_context_waker(ctx); |
| - | return HYPER_POLL_PENDING; |
| - | } |
| - | |
| result = Curl_multi_xfer_ulbuf_borrow(data, &xfer_ulbuf, &xfer_ulblen); | |
| if(result) | |
| goto out; | |
| @@ -974,11 +951,6 @@ CURLcode Curl_http(struct Curl_easy *data, bool *done) | |
| goto error; | |
| } | |
| } | |
| - | else { |
| - | if(!data->state.disableexpect) { |
| - | data->state.expect100header = TRUE; |
| - | } |
| - | } |
| if(hyper_request_set_method(req, (uint8_t *)method, strlen(method))) { | |
| failf(data, "error setting method"); | |
| @@ -1158,13 +1130,10 @@ CURLcode Curl_http(struct Curl_easy *data, bool *done) | |
| if((httpreq == HTTPREQ_GET) || (httpreq == HTTPREQ_HEAD)) { | |
| /* HTTP GET/HEAD download */ | |
| Curl_pgrsSetUploadSize(data, 0); /* nothing */ | |
| - | Curl_xfer_setup(data, FIRSTSOCKET, -1, TRUE, -1); |
| } | |
| + | |
| + | Curl_xfer_setup(data, FIRSTSOCKET, -1, TRUE, FIRSTSOCKET); |
| conn->datastream = Curl_hyper_stream; | |
| - | if(data->state.expect100header) |
| - | /* Timeout count starts now since with Hyper we don't know exactly when |
| - | the full request has been sent. */ |
| - | data->req.start100 = Curl_now(); |
| /* clear userpwd and proxyuserpwd to avoid reusing old credentials | |
| * from reused connections */ | |
| @@ -1206,10 +1175,6 @@ void Curl_hyper_done(struct Curl_easy *data) | |
| hyper_waker_free(h->write_waker); | |
| h->write_waker = NULL; | |
| } | |
| - | if(h->exp100_waker) { |
| - | hyper_waker_free(h->exp100_waker); |
| - | h->exp100_waker = NULL; |
| - | } |
| if(h->send_body_waker) { | |
| hyper_waker_free(h->send_body_waker); | |
| h->send_body_waker = NULL; | |
| @@ -1238,6 +1203,7 @@ static const struct Curl_crtype cr_hyper_protocol = { | |
| Curl_creader_def_resume_from, | |
| Curl_creader_def_rewind, | |
| cr_hyper_unpause, | |
| + | Curl_creader_def_done, |
| sizeof(struct Curl_creader) | |
| }; | |
| @@ -39,7 +39,6 @@ struct hyptransfer { | |
| hyper_waker *write_waker; | |
| hyper_waker *read_waker; | |
| const hyper_executor *exec; | |
| - | hyper_waker *exp100_waker; |
| hyper_waker *send_body_waker; | |
| struct hyp_io_ctx io_ctx; | |
| }; | |
| @@ -102,6 +102,9 @@ | |
| */ | |
| static bool http_should_fail(struct Curl_easy *data); | |
| + | static bool http_exp100_is_waiting(struct Curl_easy *data); |
| + | static CURLcode http_exp100_add_reader(struct Curl_easy *data); |
| + | static void http_exp100_send_anyway(struct Curl_easy *data); |
| /* | |
| * HTTP handler interface. | |
| @@ -1275,31 +1278,6 @@ static const char *get_http_string(const struct Curl_easy *data, | |
| } | |
| #endif | |
| - | /* check and possibly add an Expect: header */ |
| - | static CURLcode expect100(struct Curl_easy *data, struct dynbuf *req) |
| - | { |
| - | CURLcode result = CURLE_OK; |
| - | if(!data->state.disableexpect && |
| - | Curl_use_http_1_1plus(data, data->conn) && |
| - | (data->conn->httpversion < 20)) { |
| - | /* if not doing HTTP 1.0 or version 2, or disabled explicitly, we add an |
| - | Expect: 100-continue to the headers which actually speeds up post |
| - | operations (as there is one packet coming back from the web server) */ |
| - | const char *ptr = Curl_checkheaders(data, STRCONST("Expect")); |
| - | if(ptr) { |
| - | data->state.expect100header = |
| - | Curl_compareheader(ptr, STRCONST("Expect:"), STRCONST("100-continue")); |
| - | } |
| - | else { |
| - | result = Curl_dyn_addn(req, STRCONST("Expect: 100-continue\r\n")); |
| - | if(!result) |
| - | data->state.expect100header = TRUE; |
| - | } |
| - | } |
| - | |
| - | return result; |
| - | } |
| - | |
| enum proxy_use { | |
| HEADER_SERVER, /* direct to server */ | |
| HEADER_PROXY, /* regular request to proxy */ | |
| @@ -2164,26 +2142,39 @@ CURLcode Curl_http_req_set_reader(struct Curl_easy *data, | |
| return result; | |
| } | |
| - | static CURLcode addexpect(struct Curl_easy *data, struct dynbuf *r) |
| + | static CURLcode addexpect(struct Curl_easy *data, struct dynbuf *r, |
| + | bool *announced_exp100) |
| { | |
| - | data->state.expect100header = FALSE; |
| + | CURLcode result; |
| + | char *ptr; |
| + | |
| + | *announced_exp100 = FALSE; |
| /* Avoid Expect: 100-continue if Upgrade: is used */ | |
| - | if(data->req.upgr101 == UPGR101_INIT) { |
| - | /* For really small puts we don't use Expect: headers at all, and for |
| - | the somewhat bigger ones we allow the app to disable it. Just make |
| - | sure that the expect100header is always set to the preferred value |
| - | here. */ |
| - | char *ptr = Curl_checkheaders(data, STRCONST("Expect")); |
| - | if(ptr) { |
| - | data->state.expect100header = |
| - | Curl_compareheader(ptr, STRCONST("Expect:"), |
| - | STRCONST("100-continue")); |
| + | if(data->req.upgr101 != UPGR101_INIT) |
| + | return CURLE_OK; |
| + | |
| + | /* For really small puts we don't use Expect: headers at all, and for |
| + | the somewhat bigger ones we allow the app to disable it. Just make |
| + | sure that the expect100header is always set to the preferred value |
| + | here. */ |
| + | ptr = Curl_checkheaders(data, STRCONST("Expect")); |
| + | if(ptr) { |
| + | *announced_exp100 = |
| + | Curl_compareheader(ptr, STRCONST("Expect:"), STRCONST("100-continue")); |
| + | } |
| + | else if(!data->state.disableexpect && |
| + | Curl_use_http_1_1plus(data, data->conn) && |
| + | (data->conn->httpversion < 20)) { |
| + | /* if not doing HTTP 1.0 or version 2, or disabled explicitly, we add an |
| + | Expect: 100-continue to the headers which actually speeds up post |
| + | operations (as there is one packet coming back from the web server) */ |
| + | curl_off_t client_len = Curl_creader_client_length(data); |
| + | if(client_len > EXPECT_100_THRESHOLD || client_len < 0) { |
| + | result = Curl_dyn_addn(r, STRCONST("Expect: 100-continue\r\n")); |
| + | if(result) |
| + | return result; |
| + | *announced_exp100 = TRUE; |
| } | |
| - | else { |
| - | curl_off_t client_len = Curl_creader_client_length(data); |
| - | if(client_len > EXPECT_100_THRESHOLD || client_len < 0) |
| - | return expect100(data, r); |
| - | } |
| } | |
| return CURLE_OK; | |
| } | |
| @@ -2193,6 +2184,7 @@ CURLcode Curl_http_req_complete(struct Curl_easy *data, | |
| { | |
| CURLcode result = CURLE_OK; | |
| curl_off_t req_clen; | |
| + | bool announced_exp100 = FALSE; |
| DEBUGASSERT(data->conn); | |
| #ifndef USE_HYPER | |
| @@ -2251,7 +2243,7 @@ CURLcode Curl_http_req_complete(struct Curl_easy *data, | |
| goto out; | |
| } | |
| } | |
| - | result = addexpect(data, r); |
| + | result = addexpect(data, r, &announced_exp100); |
| if(result) | |
| goto out; | |
| break; | |
| @@ -2262,6 +2254,8 @@ CURLcode Curl_http_req_complete(struct Curl_easy *data, | |
| /* end of headers */ | |
| result = Curl_dyn_addn(r, STRCONST("\r\n")); | |
| Curl_pgrsSetUploadSize(data, req_clen); | |
| + | if(announced_exp100) |
| + | result = http_exp100_add_reader(data); |
| out: | |
| if(!result) { | |
| @@ -3434,11 +3428,7 @@ static CURLcode http_rw_headers(struct Curl_easy *data, | |
| k->headerline = 0; /* restart the header line counter */ | |
| /* if we did wait for this do enable write now! */ | |
| - | if(k->exp100 > EXP100_SEND_DATA) { |
| - | k->exp100 = EXP100_SEND_DATA; |
| - | k->keepon |= KEEP_SEND; |
| - | Curl_expire_done(data, EXPIRE_100_TIMEOUT); |
| - | } |
| + | Curl_http_exp100_got100(data); |
| break; | |
| case 101: | |
| if(conn->httpversion == 11) { | |
| @@ -3617,13 +3607,11 @@ static CURLcode http_rw_headers(struct Curl_easy *data, | |
| * request body has been sent we stop sending and mark the | |
| * connection for closure after we've read the entire response. | |
| */ | |
| - | Curl_expire_done(data, EXPIRE_100_TIMEOUT); |
| if(!Curl_req_done_sending(data)) { | |
| - | if((k->httpcode == 417) && data->state.expect100header) { |
| + | if((k->httpcode == 417) && Curl_http_exp100_is_selected(data)) { |
| /* 417 Expectation Failed - try again without the Expect | |
| header */ | |
| - | if(!k->writebytecount && |
| - | k->exp100 == EXP100_AWAITING_CONTINUE) { |
| + | if(!k->writebytecount && http_exp100_is_waiting(data)) { |
| infof(data, "Got HTTP failure 417 while waiting for a 100"); | |
| } | |
| else { | |
| @@ -3641,10 +3629,7 @@ static CURLcode http_rw_headers(struct Curl_easy *data, | |
| } | |
| else if(data->set.http_keep_sending_on_error) { | |
| infof(data, "HTTP error before end of send, keep sending"); | |
| - | if(k->exp100 > EXP100_SEND_DATA) { |
| - | k->exp100 = EXP100_SEND_DATA; |
| - | k->keepon |= KEEP_SEND; |
| - | } |
| + | http_exp100_send_anyway(data); |
| } | |
| else { | |
| infof(data, "HTTP error before end of send, stop sending"); | |
| @@ -3652,8 +3637,6 @@ static CURLcode http_rw_headers(struct Curl_easy *data, | |
| result = Curl_req_abort_sending(data); | |
| if(result) | |
| return result; | |
| - | if(data->state.expect100header) |
| - | k->exp100 = EXP100_FAILED; |
| } | |
| } | |
| break; | |
| @@ -4337,4 +4320,142 @@ void Curl_http_resp_free(struct http_resp *resp) | |
| } | |
| } | |
| + | struct cr_exp100_ctx { |
| + | struct Curl_creader super; |
| + | struct curltime start; /* time started waiting */ |
| + | enum expect100 state; |
| + | }; |
| + | |
| + | /* Expect: 100-continue client reader, blocking uploads */ |
| + | |
| + | static void http_exp100_continue(struct Curl_easy *data, |
| + | struct Curl_creader *reader) |
| + | { |
| + | struct cr_exp100_ctx *ctx = reader->ctx; |
| + | if(ctx->state > EXP100_SEND_DATA) { |
| + | ctx->state = EXP100_SEND_DATA; |
| + | data->req.keepon |= KEEP_SEND; |
| + | data->req.keepon &= ~KEEP_SEND_TIMED; |
| + | Curl_expire_done(data, EXPIRE_100_TIMEOUT); |
| + | } |
| + | } |
| + | |
| + | static CURLcode cr_exp100_read(struct Curl_easy *data, |
| + | struct Curl_creader *reader, |
| + | char *buf, size_t blen, |
| + | size_t *nread, bool *eos) |
| + | { |
| + | struct cr_exp100_ctx *ctx = reader->ctx; |
| + | timediff_t ms; |
| + | |
| + | switch(ctx->state) { |
| + | case EXP100_SENDING_REQUEST: |
| + | /* We are now waiting for a reply from the server or |
| + | * a timeout on our side */ |
| + | DEBUGF(infof(data, "cr_exp100_read, start AWAITING_CONTINUE")); |
| + | ctx->state = EXP100_AWAITING_CONTINUE; |
| + | ctx->start = Curl_now(); |
| + | Curl_expire(data, data->set.expect_100_timeout, EXPIRE_100_TIMEOUT); |
| + | data->req.keepon &= ~KEEP_SEND; |
| + | data->req.keepon |= KEEP_SEND_TIMED; |
| + | *nread = 0; |
| + | *eos = FALSE; |
| + | return CURLE_OK; |
| + | case EXP100_FAILED: |
| + | DEBUGF(infof(data, "cr_exp100_read, expectation failed, error")); |
| + | *nread = 0; |
| + | *eos = FALSE; |
| + | return CURLE_READ_ERROR; |
| + | case EXP100_AWAITING_CONTINUE: |
| + | ms = Curl_timediff(Curl_now(), ctx->start); |
| + | if(ms < data->set.expect_100_timeout) { |
| + | DEBUGF(infof(data, "cr_exp100_read, AWAITING_CONTINUE, not expired")); |
| + | data->req.keepon &= ~KEEP_SEND; |
| + | data->req.keepon |= KEEP_SEND_TIMED; |
| + | *nread = 0; |
| + | *eos = FALSE; |
| + | return CURLE_OK; |
| + | } |
| + | /* we've waited long enough, continue anyway */ |
| + | http_exp100_continue(data, reader); |
| + | infof(data, "Done waiting for 100-continue"); |
| + | FALLTHROUGH(); |
| + | default: |
| + | DEBUGF(infof(data, "cr_exp100_read, pass through")); |
| + | return Curl_creader_read(data, reader->next, buf, blen, nread, eos); |
| + | } |
| + | } |
| + | |
| + | static void cr_exp100_done(struct Curl_easy *data, |
| + | struct Curl_creader *reader, int premature) |
| + | { |
| + | struct cr_exp100_ctx *ctx = reader->ctx; |
| + | ctx->state = premature? EXP100_FAILED : EXP100_SEND_DATA; |
| + | data->req.keepon &= ~KEEP_SEND_TIMED; |
| + | Curl_expire_done(data, EXPIRE_100_TIMEOUT); |
| + | } |
| + | |
| + | static const struct Curl_crtype cr_exp100 = { |
| + | "cr-exp100", |
| + | Curl_creader_def_init, |
| + | cr_exp100_read, |
| + | Curl_creader_def_close, |
| + | Curl_creader_def_needs_rewind, |
| + | Curl_creader_def_total_length, |
| + | Curl_creader_def_resume_from, |
| + | Curl_creader_def_rewind, |
| + | Curl_creader_def_unpause, |
| + | cr_exp100_done, |
| + | sizeof(struct cr_exp100_ctx) |
| + | }; |
| + | |
| + | static CURLcode http_exp100_add_reader(struct Curl_easy *data) |
| + | { |
| + | struct Curl_creader *reader = NULL; |
| + | CURLcode result; |
| + | |
| + | result = Curl_creader_create(&reader, data, &cr_exp100, |
| + | CURL_CR_PROTOCOL); |
| + | if(!result) |
| + | result = Curl_creader_add(data, reader); |
| + | if(!result) { |
| + | struct cr_exp100_ctx *ctx = reader->ctx; |
| + | ctx->state = EXP100_SENDING_REQUEST; |
| + | } |
| + | |
| + | if(result && reader) |
| + | Curl_creader_free(data, reader); |
| + | return result; |
| + | } |
| + | |
| + | void Curl_http_exp100_got100(struct Curl_easy *data) |
| + | { |
| + | struct Curl_creader *r = Curl_creader_get_by_type(data, &cr_exp100); |
| + | if(r) |
| + | http_exp100_continue(data, r); |
| + | } |
| + | |
| + | static bool http_exp100_is_waiting(struct Curl_easy *data) |
| + | { |
| + | struct Curl_creader *r = Curl_creader_get_by_type(data, &cr_exp100); |
| + | if(r) { |
| + | struct cr_exp100_ctx *ctx = r->ctx; |
| + | return (ctx->state == EXP100_AWAITING_CONTINUE); |
| + | } |
| + | return FALSE; |
| + | } |
| + | |
| + | static void http_exp100_send_anyway(struct Curl_easy *data) |
| + | { |
| + | struct Curl_creader *r = Curl_creader_get_by_type(data, &cr_exp100); |
| + | if(r) |
| + | http_exp100_continue(data, r); |
| + | } |
| + | |
| + | bool Curl_http_exp100_is_selected(struct Curl_easy *data) |
| + | { |
| + | struct Curl_creader *r = Curl_creader_get_by_type(data, &cr_exp100); |
| + | return r? TRUE : FALSE; |
| + | } |
| + | |
| #endif /* CURL_DISABLE_HTTP */ | |
| @@ -176,6 +176,9 @@ CURLcode Curl_http_auth_act(struct Curl_easy *data); | |
| version. This count includes CONNECT response headers. */ | |
| #define MAX_HTTP_RESP_HEADER_SIZE (300*1024) | |
| + | bool Curl_http_exp100_is_selected(struct Curl_easy *data); |
| + | void Curl_http_exp100_got100(struct Curl_easy *data); |
| + | |
| #endif /* CURL_DISABLE_HTTP */ | |
| /**************************************************************************** | |
| @@ -644,6 +644,7 @@ const struct Curl_crtype Curl_httpchunk_encoder = { | |
| Curl_creader_def_resume_from, | |
| Curl_creader_def_rewind, | |
| Curl_creader_def_unpause, | |
| + | Curl_creader_def_done, |
| sizeof(struct chunked_reader) | |
| }; | |
| @@ -2106,6 +2106,7 @@ static const struct Curl_crtype cr_mime = { | |
| cr_mime_resume_from, | |
| cr_mime_rewind, | |
| cr_mime_unpause, | |
| + | Curl_creader_def_done, |
| sizeof(struct cr_mime_ctx) | |
| }; | |
| @@ -134,8 +134,6 @@ void Curl_req_hard_reset(struct SingleRequest *req, struct Curl_easy *data) | |
| req->offset = 0; | |
| req->httpcode = 0; | |
| req->keepon = 0; | |
| - | req->start100 = t0; |
| - | req->exp100 = EXP100_SEND_DATA; |
| req->upgr101 = UPGR101_INIT; | |
| req->timeofdoc = 0; | |
| req->bodywrites = 0; | |
| @@ -241,16 +239,6 @@ static CURLcode req_send_buffer_flush(struct Curl_easy *data) | |
| Curl_bufq_skip(&data->req.sendbuf, nwritten); | |
| if(hds_len) { | |
| data->req.sendbuf_hds_len -= CURLMIN(hds_len, nwritten); | |
| - | if(!data->req.sendbuf_hds_len) { |
| - | /* all request headers sent */ |
| - | if(data->req.exp100 == EXP100_SENDING_REQUEST) { |
| - | /* We are now waiting for a reply from the server or |
| - | * a timeout on our side */ |
| - | data->req.exp100 = EXP100_AWAITING_CONTINUE; |
| - | data->req.start100 = Curl_now(); |
| - | Curl_expire(data, data->set.expect_100_timeout, EXPIRE_100_TIMEOUT); |
| - | } |
| - | } |
| } | |
| /* leave if we could not send all. Maybe network blocking or | |
| * speed limits on transfer */ | |
| @@ -264,11 +252,9 @@ static CURLcode req_set_upload_done(struct Curl_easy *data) | |
| { | |
| DEBUGASSERT(!data->req.upload_done); | |
| data->req.upload_done = TRUE; | |
| - | data->req.keepon &= ~KEEP_SEND; /* we're done sending */ |
| + | data->req.keepon &= ~(KEEP_SEND|KEEP_SEND_TIMED); /* we're done sending */ |
| - | /* FIXME: http specific stuff, need to go somewhere else */ |
| - | data->req.exp100 = EXP100_SEND_DATA; |
| - | Curl_expire_done(data, EXPIRE_100_TIMEOUT); |
| + | Curl_creader_done(data, data->req.upload_aborted); |
| if(data->req.upload_aborted) { | |
| if(data->req.writebytecount) | |
| @@ -384,10 +370,8 @@ CURLcode Curl_req_send_more(struct Curl_easy *data) | |
| { | |
| CURLcode result; | |
| - | /* Fill our send buffer if more from client can be read and |
| - | * we are not in a "expect-100" situation. */ |
| - | if(!data->req.eos_read && !Curl_bufq_is_full(&data->req.sendbuf) && |
| - | (data->req.exp100 == EXP100_SEND_DATA)) { |
| + | /* Fill our send buffer if more from client can be read. */ |
| + | if(!data->req.eos_read && !Curl_bufq_is_full(&data->req.sendbuf)) { |
| ssize_t nread = Curl_bufq_sipn(&data->req.sendbuf, 0, | |
| add_from_client, data, &result); | |
| if(nread < 0 && result != CURLE_AGAIN) | |
| @@ -81,8 +81,6 @@ struct SingleRequest { | |
| int httpcode; /* error code from the 'HTTP/1.? XXX' or | |
| 'RTSP/1.? XXX' line */ | |
| int keepon; | |
| - | struct curltime start100; /* time stamp to wait for the 100 code from */ |
| - | enum expect100 exp100; /* expect 100 continue state */ |
| enum upgrade101 upgr101; /* 101 upgrade state */ | |
| /* Client Writer stack, handles transfer- and content-encodings, protocol | |
| @@ -555,8 +555,6 @@ static CURLcode rtsp_do(struct Curl_easy *data, bool *done) | |
| goto out; | |
| } | |
| } | |
| - | |
| - | data->state.expect100header = FALSE; /* RTSP posts are simple/small */ |
| } | |
| else if(rtspreq == RTSPREQ_GET_PARAMETER) { | |
| /* Check for an empty GET_PARAMETER (heartbeat) request */ | |
| @@ -579,6 +579,14 @@ CURLcode Curl_creader_def_unpause(struct Curl_easy *data, | |
| return CURLE_OK; | |
| } | |
| + | void Curl_creader_def_done(struct Curl_easy *data, |
| + | struct Curl_creader *reader, int premature) |
| + | { |
| + | (void)data; |
| + | (void)reader; |
| + | (void)premature; |
| + | } |
| + | |
| struct cr_in_ctx { | |
| struct Curl_creader super; | |
| curl_read_callback read_cb; | |
| @@ -840,6 +848,7 @@ static const struct Curl_crtype cr_in = { | |
| cr_in_resume_from, | |
| cr_in_rewind, | |
| Curl_creader_def_unpause, | |
| + | Curl_creader_def_done, |
| sizeof(struct cr_in_ctx) | |
| }; | |
| @@ -990,6 +999,7 @@ static const struct Curl_crtype cr_lc = { | |
| Curl_creader_def_resume_from, | |
| Curl_creader_def_rewind, | |
| Curl_creader_def_unpause, | |
| + | Curl_creader_def_done, |
| sizeof(struct cr_lc_ctx) | |
| }; | |
| @@ -1154,6 +1164,7 @@ static const struct Curl_crtype cr_null = { | |
| Curl_creader_def_resume_from, | |
| Curl_creader_def_rewind, | |
| Curl_creader_def_unpause, | |
| + | Curl_creader_def_done, |
| sizeof(struct Curl_creader) | |
| }; | |
| @@ -1250,6 +1261,7 @@ static const struct Curl_crtype cr_buf = { | |
| cr_buf_resume_from, | |
| Curl_creader_def_rewind, | |
| Curl_creader_def_unpause, | |
| + | Curl_creader_def_done, |
| sizeof(struct cr_buf_ctx) | |
| }; | |
| @@ -1307,3 +1319,24 @@ CURLcode Curl_creader_unpause(struct Curl_easy *data) | |
| } | |
| return result; | |
| } | |
| + | |
| + | void Curl_creader_done(struct Curl_easy *data, int premature) |
| + | { |
| + | struct Curl_creader *reader = data->req.reader_stack; |
| + | while(reader) { |
| + | reader->crt->done(data, reader, premature); |
| + | reader = reader->next; |
| + | } |
| + | } |
| + | |
| + | struct Curl_creader *Curl_creader_get_by_type(struct Curl_easy *data, |
| + | const struct Curl_crtype *crt) |
| + | { |
| + | struct Curl_creader *r; |
| + | for(r = data->req.reader_stack; r; r = r->next) { |
| + | if(r->crt == crt) |
| + | return r; |
| + | } |
| + | return NULL; |
| + | |
| + | } |
| @@ -208,6 +208,8 @@ struct Curl_crtype { | |
| struct Curl_creader *reader, curl_off_t offset); | |
| CURLcode (*rewind)(struct Curl_easy *data, struct Curl_creader *reader); | |
| CURLcode (*unpause)(struct Curl_easy *data, struct Curl_creader *reader); | |
| + | void (*done)(struct Curl_easy *data, |
| + | struct Curl_creader *reader, int premature); |
| size_t creader_size; /* sizeof() allocated struct Curl_creader */ | |
| }; | |
| @@ -256,6 +258,8 @@ CURLcode Curl_creader_def_rewind(struct Curl_easy *data, | |
| struct Curl_creader *reader); | |
| CURLcode Curl_creader_def_unpause(struct Curl_easy *data, | |
| struct Curl_creader *reader); | |
| + | void Curl_creader_def_done(struct Curl_easy *data, |
| + | struct Curl_creader *reader, int premature); |
| /** | |
| * Convenience method for calling `reader->do_read()` that | |
| @@ -361,6 +365,19 @@ CURLcode Curl_creader_resume_from(struct Curl_easy *data, curl_off_t offset); | |
| */ | |
| CURLcode Curl_creader_unpause(struct Curl_easy *data); | |
| + | /** |
| + | * Tell all client readers that they are done. |
| + | */ |
| + | void Curl_creader_done(struct Curl_easy *data, int premature); |
| + | |
| + | /** |
| + | * Look up an installed client reader on `data` by its type. |
| + | * @return first reader with that type or NULL |
| + | */ |
| + | struct Curl_creader *Curl_creader_get_by_type(struct Curl_easy *data, |
| + | const struct Curl_crtype *crt); |
| + | |
| + | |
| /** | |
| * Set the client reader to provide 0 bytes, immediate EOS. | |
| */ | |
| @@ -1923,6 +1923,7 @@ static const struct Curl_crtype cr_eob = { | |
| Curl_creader_def_resume_from, | |
| Curl_creader_def_rewind, | |
| Curl_creader_def_unpause, | |
| + | Curl_creader_def_done, |
| sizeof(struct cr_eob_ctx) | |
| }; | |
| @@ -463,7 +463,8 @@ CURLcode Curl_readwrite(struct Curl_easy *data) | |
| } | |
| /* If we still have writing to do, we check if we have a writable socket. */ | |
| - | if((k->keepon & KEEP_SEND) && (select_bits & CURL_CSELECT_OUT)) { |
| + | if(((k->keepon & KEEP_SEND) && (select_bits & CURL_CSELECT_OUT)) || |
| + | (k->keepon & KEEP_SEND_TIMED)) { |
| /* write */ | |
| result = readwrite_upload(data, &didwhat); | |
| @@ -476,31 +477,6 @@ CURLcode Curl_readwrite(struct Curl_easy *data) | |
| now = Curl_now(); | |
| if(!didwhat) { | |
| - | /* no read no write, this is a timeout? */ |
| - | if(k->exp100 == EXP100_AWAITING_CONTINUE) { |
| - | /* This should allow some time for the header to arrive, but only a |
| - | very short time as otherwise it'll be too much wasted time too |
| - | often. */ |
| - | |
| - | /* Quoting RFC2616, section "8.2.3 Use of the 100 (Continue) Status": |
| - | |
| - | Therefore, when a client sends this header field to an origin server |
| - | (possibly via a proxy) from which it has never seen a 100 (Continue) |
| - | status, the client SHOULD NOT wait for an indefinite period before |
| - | sending the request body. |
| - | |
| - | */ |
| - | |
| - | timediff_t ms = Curl_timediff(now, k->start100); |
| - | if(ms >= data->set.expect_100_timeout) { |
| - | /* we've waited long enough, continue anyway */ |
| - | k->exp100 = EXP100_SEND_DATA; |
| - | k->keepon |= KEEP_SEND; |
| - | Curl_expire_done(data, EXPIRE_100_TIMEOUT); |
| - | infof(data, "Done waiting for 100-continue"); |
| - | } |
| - | } |
| - | |
| result = Curl_conn_ev_data_idle(data); | |
| if(result) | |
| goto out; | |
| @@ -1172,36 +1148,8 @@ void Curl_xfer_setup( | |
| if(sockindex != -1) | |
| k->keepon |= KEEP_RECV; | |
| - | if(writesockindex != -1) { |
| - | /* HTTP 1.1 magic: |
| - | |
| - | Even if we require a 100-return code before uploading data, we might |
| - | need to write data before that since the REQUEST may not have been |
| - | finished sent off just yet. |
| - | |
| - | Thus, we must check if the request has been sent before we set the |
| - | state info where we wait for the 100-return code |
| - | */ |
| - | if((data->state.expect100header) && |
| - | (conn->handler->protocol&PROTO_FAMILY_HTTP)) { |
| - | /* wait with write until we either got 100-continue or a timeout */ |
| - | k->exp100 = EXP100_AWAITING_CONTINUE; |
| - | k->start100 = Curl_now(); |
| - | |
| - | /* Set a timeout for the multi interface. Add the inaccuracy margin so |
| - | that we don't fire slightly too early and get denied to run. */ |
| - | Curl_expire(data, data->set.expect_100_timeout, EXPIRE_100_TIMEOUT); |
| - | } |
| - | else { |
| - | if(data->state.expect100header) |
| - | /* when we've sent off the rest of the headers, we must await a |
| - | 100-continue but first finish sending the request */ |
| - | k->exp100 = EXP100_SENDING_REQUEST; |
| - | |
| - | /* enable the write bit when we're not waiting for continue */ |
| - | k->keepon |= KEEP_SEND; |
| - | } |
| - | } /* if(writesockindex != -1) */ |
| + | if(writesockindex != -1) |
| + | k->keepon |= KEEP_SEND; |
| } /* if(k->getheader || !data->req.no_body) */ | |
| } | |
| @@ -3898,7 +3898,6 @@ CURLcode Curl_init_do(struct Curl_easy *data, struct connectdata *conn) | |
| } | |
| data->state.done = FALSE; /* *_done() is not called yet */ | |
| - | data->state.expect100header = FALSE; |
| if(data->req.no_body) | |
| /* in HTTP lingo, no body means using the HEAD request... */ | |
| @@ -579,6 +579,14 @@ struct hostname { | |
| #define KEEP_RECV_PAUSE (1<<4) /* reading is paused */ | |
| #define KEEP_SEND_PAUSE (1<<5) /* writing is paused */ | |
| + | /* KEEP_SEND_TIMED is set when the transfer should attempt sending |
| + | * at timer (or other) events. A transfer waiting on a timer will |
| + | * remove KEEP_SEND to suppress POLLOUTs of the connection. |
| + | * Adding KEEP_SEND_TIMED will then attempt to send whenever the transfer |
| + | * enters the "readwrite" loop, e.g. when a timer fires. |
| + | * This is used in HTTP for 'Expect: 100-continue' waiting. */ |
| + | #define KEEP_SEND_TIMED (1<<6) |
| + | |
| #define KEEP_RECVBITS (KEEP_RECV | KEEP_RECV_HOLD | KEEP_RECV_PAUSE) | |
| #define KEEP_SENDBITS (KEEP_SEND | KEEP_SEND_HOLD | KEEP_SEND_PAUSE) | |
| @@ -1364,7 +1372,6 @@ struct UrlState { | |
| BIT(authproblem); /* TRUE if there's some problem authenticating */ | |
| /* set after initial USER failure, to prevent an authentication loop */ | |
| BIT(wildcardmatch); /* enable wildcard matching */ | |
| - | BIT(expect100header); /* TRUE if we added Expect: 100-continue */ |
| BIT(disableexpect); /* TRUE if Expect: is disabled due to a previous | |
| 417 response */ | |
| BIT(use_range); | |
| @@ -46,6 +46,7 @@ class TestUpload: | |
| env.make_data_file(indir=env.gen_dir, fname="data-63k", fsize=63*1024) | |
| env.make_data_file(indir=env.gen_dir, fname="data-64k", fsize=64*1024) | |
| env.make_data_file(indir=env.gen_dir, fname="data-100k", fsize=100*1024) | |
| + | env.make_data_file(indir=env.gen_dir, fname="data-1m+", fsize=(1024*1024)+1) |
| env.make_data_file(indir=env.gen_dir, fname="data-10m", fsize=10*1024*1024) | |
| httpd.clear_extra_configs() | |
| httpd.reload() | |
| @@ -501,3 +502,29 @@ class TestUpload: | |
| up_speed = r.stats[0]['speed_upload'] | |
| assert (speed_limit * 0.5) <= up_speed <= (speed_limit * 1.5), f'{r.stats[0]}' | |
| + | # upload larger data, triggering "Expect: 100-continue" code paths |
| + | @pytest.mark.parametrize("proto", ['http/1.1']) |
| + | def test_07_60_upload_exp100(self, env: Env, httpd, nghttpx, repeat, proto): |
| + | fdata = os.path.join(env.gen_dir, 'data-1m+') |
| + | read_delay = 1 |
| + | curl = CurlClient(env=env) |
| + | url = f'https://{env.authority_for(env.domain1, proto)}/curltest/put?id=[0-0]'\ |
| + | f'&read_delay={read_delay}s' |
| + | r = curl.http_put(urls=[url], fdata=fdata, alpn_proto=proto, extra_args=[ |
| + | '--expect100-timeout', f'{read_delay+1}' |
| + | ]) |
| + | r.check_stats(count=1, http_status=200, exitcode=0) |
| + | |
| + | # upload larger data, triggering "Expect: 100-continue" code paths |
| + | @pytest.mark.parametrize("proto", ['http/1.1']) |
| + | def test_07_61_upload_exp100_timeout(self, env: Env, httpd, nghttpx, repeat, proto): |
| + | fdata = os.path.join(env.gen_dir, 'data-1m+') |
| + | read_delay = 2 |
| + | curl = CurlClient(env=env) |
| + | url = f'https://{env.authority_for(env.domain1, proto)}/curltest/put?id=[0-0]'\ |
| + | f'&read_delay={read_delay}s' |
| + | r = curl.http_put(urls=[url], fdata=fdata, alpn_proto=proto, extra_args=[ |
| + | '--expect100-timeout', f'{read_delay-1}' |
| + | ]) |
| + | r.check_stats(count=1, http_status=200, exitcode=0) |
| + | |
| @@ -425,7 +425,7 @@ static int curltest_put_handler(request_rec *r) | |
| apr_off_t rbody_len = 0; | |
| const char *s_rbody_len; | |
| const char *request_id = "none"; | |
| - | apr_time_t chunk_delay = 0; |
| + | apr_time_t read_delay = 0, chunk_delay = 0; |
| apr_array_header_t *args = NULL; | |
| long l; | |
| int i; | |
| @@ -450,6 +450,12 @@ static int curltest_put_handler(request_rec *r) | |
| request_id = val; | |
| continue; | |
| } | |
| + | else if(!strcmp("read_delay", arg)) { |
| + | rv = duration_parse(&read_delay, val, "s"); |
| + | if(APR_SUCCESS == rv) { |
| + | continue; |
| + | } |
| + | } |
| else if(!strcmp("chunk_delay", arg)) { | |
| rv = duration_parse(&chunk_delay, val, "s"); | |
| if(APR_SUCCESS == rv) { | |
| @@ -478,6 +484,9 @@ static int curltest_put_handler(request_rec *r) | |
| ct = apr_table_get(r->headers_in, "content-type"); | |
| ap_set_content_type(r, ct? ct : "text/plain"); | |
| + | if(read_delay) { |
| + | apr_sleep(read_delay); |
| + | } |
| bb = apr_brigade_create(r->pool, c->bucket_alloc); | |
| /* copy any request body into the response */ | |
| if((rv = ap_setup_client_block(r, REQUEST_CHUNKED_DECHUNK))) goto cleanup; | |