← Commit list

5651a36d1a

Stefan Eissing

2023-01-31

SUCCESS Duration: 112s

Subject

cf-socket: improvements in socket I/O handling

Binary

Download Binary (776 KB)

Architecture & Compiler Flags

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

—

Build Log

$ git checkout -f 5651a36d1ae46db61a31771a8d4d6dcf2a510856
Previous HEAD position was d55de24dce connect: fix strategy testing for attempts, timeouts and happy-eyeball
HEAD is now at 5651a36d1a cf-socket: improvements in socket I/O handling

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

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

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

$ chmod +x configure

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

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

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

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

$ make -j3
Making all in lib
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make all-am
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
CC libcurl_la-altsvc.lo
CC libcurl_la-amigaos.lo
CC libcurl_la-asyn-ares.lo
CC libcurl_la-asyn-thread.lo
CC libcurl_la-base64.lo
CC libcurl_la-bufref.lo
CC libcurl_la-c-hyper.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_log.lo
CC libcurl_la-curl_memrchr.lo
CC libcurl_la-curl_multibyte.lo
CC libcurl_la-curl_ntlm_core.lo
CC libcurl_la-curl_ntlm_wb.lo
CC libcurl_la-curl_path.lo
CC libcurl_la-curl_range.lo
CC libcurl_la-curl_rtmp.lo
CC libcurl_la-curl_sasl.lo
CC libcurl_la-curl_sspi.lo
CC libcurl_la-curl_threads.lo
CC libcurl_la-dict.lo
CC libcurl_la-doh.lo
CC libcurl_la-dynbuf.lo
CC libcurl_la-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-h2h3.lo
CC libcurl_la-hash.lo
CC libcurl_la-headers.lo
CC libcurl_la-hmac.lo
CC libcurl_la-hostasyn.lo
CC libcurl_la-hostip.lo
CC libcurl_la-hostip4.lo
CC libcurl_la-hostip6.lo
CC libcurl_la-hostsyn.lo
CC libcurl_la-hsts.lo
CC libcurl_la-http.lo
CC libcurl_la-http2.lo
CC libcurl_la-http_chunks.lo
CC libcurl_la-http_digest.lo
CC libcurl_la-http_negotiate.lo
CC libcurl_la-http_ntlm.lo
CC libcurl_la-http_proxy.lo
CC libcurl_la-http_aws_sigv4.lo
CC libcurl_la-idn.lo
CC libcurl_la-if2ip.lo
CC libcurl_la-imap.lo
CC libcurl_la-inet_ntop.lo
CC libcurl_la-inet_pton.lo
CC libcurl_la-krb5.lo
CC libcurl_la-ldap.lo
CC libcurl_la-llist.lo
CC libcurl_la-md4.lo
CC libcurl_la-md5.lo
CC libcurl_la-memdebug.lo
CC libcurl_la-mime.lo
CC libcurl_la-mprintf.lo
CC libcurl_la-mqtt.lo
CC libcurl_la-multi.lo
CC libcurl_la-netrc.lo
CC libcurl_la-nonblock.lo
CC libcurl_la-noproxy.lo
CC libcurl_la-openldap.lo
CC libcurl_la-parsedate.lo
CC libcurl_la-pingpong.lo
CC libcurl_la-pop3.lo
CC libcurl_la-progress.lo
CC libcurl_la-psl.lo
CC libcurl_la-rand.lo
CC libcurl_la-rename.lo
CC libcurl_la-rtsp.lo
CC libcurl_la-select.lo
CC libcurl_la-sendf.lo
CC libcurl_la-setopt.lo
CC libcurl_la-sha256.lo
CC libcurl_la-share.lo
CC libcurl_la-slist.lo
CC libcurl_la-smb.lo
CC libcurl_la-smtp.lo
CC libcurl_la-socketpair.lo
CC libcurl_la-socks.lo
CC libcurl_la-socks_gssapi.lo
CC libcurl_la-socks_sspi.lo
CC libcurl_la-speedcheck.lo
CC libcurl_la-splay.lo
CC libcurl_la-strcase.lo
CC libcurl_la-strdup.lo
CC libcurl_la-strerror.lo
CC libcurl_la-strtok.lo
CC libcurl_la-strtoofft.lo
CC libcurl_la-system_win32.lo
CC libcurl_la-telnet.lo
CC libcurl_la-tftp.lo
CC libcurl_la-timediff.lo
CC libcurl_la-timeval.lo
CC libcurl_la-transfer.lo
CC libcurl_la-url.lo
CC libcurl_la-urlapi.lo
CC libcurl_la-version.lo
CC libcurl_la-version_win32.lo
CC libcurl_la-warnless.lo
CC libcurl_la-wildcard.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-gskit.lo
CC vtls/libcurl_la-gtls.lo
CC vtls/libcurl_la-hostcheck.lo
CC vtls/libcurl_la-keylog.lo
CC vtls/libcurl_la-mbedtls.lo
CC vtls/libcurl_la-mbedtls_threadlock.lo
CC vtls/libcurl_la-nss.lo
CC vtls/libcurl_la-openssl.lo
CC vtls/libcurl_la-schannel.lo
CC vtls/libcurl_la-rustls.lo
CC vtls/libcurl_la-schannel_verify.lo
CC vtls/libcurl_la-sectransp.lo
CC vtls/libcurl_la-vtls.lo
CC vtls/libcurl_la-wolfssl.lo
CC vtls/libcurl_la-x509asn1.lo
CC vquic/libcurl_la-curl_msh3.lo
CC vquic/libcurl_la-curl_ngtcp2.lo
CC vquic/libcurl_la-curl_quiche.lo
CC vquic/libcurl_la-vquic.lo
CC vssh/libcurl_la-libssh.lo
CC vssh/libcurl_la-libssh2.lo
CC vssh/libcurl_la-wolfssh.lo
CCLD libcurl.la
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
Making all in src
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
Making all in ../docs
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in .
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
if test "..x" != "..x" -a -e "./curl.1"; then \
/usr/bin/install -c -m 644 "./curl.1" /root/asi_db/builds/curl/_worktrees/w0/docs/curl.1; fi
cd cmdline-opts && make
make[4]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
generate ../../docs/curl.1
make[4]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in cmdline-opts
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[3]: Nothing to be done for 'all'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
CC slist_wc.o
CC tool_binmode.o
CC tool_bname.o
CC tool_cb_dbg.o
CC tool_cb_hdr.o
CC tool_cb_prg.o
CC tool_cb_rea.o
CC tool_cb_see.o
CC tool_cb_wrt.o
CC tool_dirhie.o
CC tool_cfgable.o
CC tool_doswin.o
CC tool_easysrc.o
CC tool_filetime.o
CC tool_findfile.o
CC tool_formparse.o
CC tool_getparam.o
CC tool_getpass.o
CC tool_help.o
CC tool_helpers.o
HUGE tool_hugehelp.c
CC tool_listhelp.o
CC tool_libinfo.o
CC tool_main.o
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_strdup.o
CC tool_setopt.o
CC tool_sleep.o
CC tool_urlglob.o
CC tool_util.o
CC tool_vms.o
CC tool_writeout.o
CC tool_writeout_json.o
CC tool_xattr.o
CC ../lib/strtoofft.o
CC ../lib/timediff.o
CC ../lib/nonblock.o
CC ../lib/warnless.o
CC ../lib/curl_multibyte.o
CC ../lib/version_win32.o
CC ../lib/dynbuf.o
CC tool_hugehelp.o
CCLD curl
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0'
make[1]: Nothing to be done for 'all-am'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0'

Commit Diff GitHub →

lib/cf-socket.c +188 -4 lib/cfilters.c +8 -2 lib/cfilters.h +2 -0 lib/http2.c +7 -8 lib/krb5.c +12 -12 lib/sendf.c +0 -282 lib/sendf.h +0 -20 lib/socks.c +140 -141 lib/socks.h +3 -3 lib/socks_gssapi.c +23 -21 lib/socks_sspi.c +17 -14 lib/url.c +0 -46 lib/urldata.h +0 -17 lib/vtls/schannel.h +2 -2

lib/cf-socket.c+188 -4

@@ -742,11 +742,29 @@ CURLcode Curl_socket_connect_result(struct Curl_easy *data,
	}
	}

+	#ifdef USE_RECV_BEFORE_SEND_WORKAROUND
+	struct io_buffer {
+	char *bufr;
+	size_t allc; /* size of the current allocation */
+	size_t head; /* bufr index for next read */
+	size_t tail; /* bufr index for next write */
+	};
+
+	static void io_buffer_reset(struct io_buffer *iob)
+	{
+	if(iob->bufr)
+	free(iob->bufr);
+	memset(iob, 0, sizeof(*iob));
+	}
+	#endif /* USE_RECV_BEFORE_SEND_WORKAROUND */

	struct cf_socket_ctx {
	int transport;
	struct Curl_sockaddr_ex addr; /* address to connect to */
	curl_socket_t sock; /* current attempt socket */
+	#ifdef USE_RECV_BEFORE_SEND_WORKAROUND
+	struct io_buffer recv_buffer;
+	#endif
	char r_ip[MAX_IPADR_LEN]; /* remote IP as string */
	int r_port; /* remote port number */
	char l_ip[MAX_IPADR_LEN]; /* local IP as string */
@@ -783,6 +801,9 @@ static void cf_socket_close(struct Curl_cfilter cf, struct Curl_easy data)
	DEBUGF(LOG_CF(data, cf, "cf_socket_close(%d) local", (int)ctx->sock));
	sclose(ctx->sock);
	}
+	#ifdef USE_RECV_BEFORE_SEND_WORKAROUND
+	io_buffer_reset(&ctx->recv_buffer);
+	#endif
	ctx->sock = CURL_SOCKET_BAD;
	ctx->active = FALSE;
	}
@@ -1112,12 +1133,88 @@ static int cf_socket_get_select_socks(struct Curl_cfilter *cf,
	return rc;
	}

+	#ifdef USE_RECV_BEFORE_SEND_WORKAROUND
+
+	static CURLcode pre_receive_plain(struct Curl_cfilter *cf,
+	struct Curl_easy *data)
+	{
+	struct cf_socket_ctx *ctx = cf->ctx;
+	struct io_buffer * const iob = &ctx->recv_buffer;
+
+	/* WinSock will destroy unread received data if send() is
+	failed.
+	To avoid lossage of received data, recv() must be
+	performed before every send() if any incoming data is
+	available. However, skip this, if buffer is already full. */
+	if((cf->conn->handler->protocol&PROTO_FAMILY_HTTP) != 0 &&
+	cf->conn->recv[cf->sockindex] == Curl_conn_recv &&
+	(!iob->bufr \|\| (iob->allc > iob->tail))) {
+	const int readymask = Curl_socket_check(ctx->sock, CURL_SOCKET_BAD,
+	CURL_SOCKET_BAD, 0);
+	if(readymask != -1 && (readymask & CURL_CSELECT_IN) != 0) {
+	size_t bytestorecv = iob->allc - iob->tail;
+	ssize_t nread;
+	/* Have some incoming data */
+	if(!iob->bufr) {
+	/* Use buffer double default size for intermediate buffer */
+	iob->allc = 2 * data->set.buffer_size;
+	iob->bufr = malloc(iob->allc);
+	if(!iob->bufr)
+	return CURLE_OUT_OF_MEMORY;
+	iob->tail = 0;
+	iob->head = 0;
+	bytestorecv = iob->allc;
+	}
+
+	nread = sread(ctx->sock, iob->bufr + iob->tail, bytestorecv);
+	if(nread > 0)
+	iob->tail += (size_t)nread;
+	}
+	}
+	return CURLE_OK;
+	}
+
+	static ssize_t get_pre_recved(struct Curl_cfilter cf, char buf, size_t len)
+	{
+	struct cf_socket_ctx *ctx = cf->ctx;
+	struct io_buffer * const iob = &ctx->recv_buffer;
+	size_t copysize;
+	if(!iob->bufr)
+	return 0;
+
+	DEBUGASSERT(iob->allc > 0);
+	DEBUGASSERT(iob->tail <= iob->allc);
+	DEBUGASSERT(iob->head <= iob->tail);
+	/* Check and process data that already received and storied in internal
+	intermediate buffer */
+	if(iob->tail > iob->head) {
+	copysize = CURLMIN(len, iob->tail - iob->head);
+	memcpy(buf, iob->bufr + iob->head, copysize);
+	iob->head += copysize;
+	}
+	else
+	copysize = 0; /* buffer was allocated, but nothing was received */
+
+	/* Free intermediate buffer if it has no unprocessed data */
+	if(iob->head == iob->tail)
+	io_buffer_reset(iob);
+
+	return (ssize_t)copysize;
+	}
+	#endif /* USE_RECV_BEFORE_SEND_WORKAROUND */
+
	static bool cf_socket_data_pending(struct Curl_cfilter *cf,
	const struct Curl_easy *data)
	{
	struct cf_socket_ctx *ctx = cf->ctx;
	int readable;

+	#ifdef USE_RECV_BEFORE_SEND_WORKAROUND
+	if(ctx->recv_buffer.bufr && ctx->recv_buffer.allc &&
+	ctx->recv_buffer.tail > ctx->recv_buffer.head)
+	return TRUE;
+	#endif
+
	(void)data;
	readable = SOCKET_READABLE(ctx->sock, 0);
	return (readable > 0 && (readable & CURL_CSELECT_IN));
@@ -1126,10 +1223,59 @@ static bool cf_socket_data_pending(struct Curl_cfilter *cf,
	static ssize_t cf_socket_send(struct Curl_cfilter cf, struct Curl_easy data,
	const void buf, size_t len, CURLcode err)
	{
+	struct cf_socket_ctx *ctx = cf->ctx;
	ssize_t nwritten;

-	DEBUGASSERT(data->conn == cf->conn);
-	nwritten = Curl_send_plain(data, cf->sockindex, buf, len, err);
+	*err = CURLE_OK;
+	#ifdef USE_RECV_BEFORE_SEND_WORKAROUND
+	/* WinSock will destroy unread received data if send() is
+	failed.
+	To avoid lossage of received data, recv() must be
+	performed before every send() if any incoming data is
+	available. */
+	if(pre_receive_plain(cf, data)) {
+	*err = CURLE_OUT_OF_MEMORY;
+	return -1;
+	}
+	#endif
+
+	#if defined(MSG_FASTOPEN) && !defined(TCP_FASTOPEN_CONNECT) /* Linux */
+	if(cf->conn->bits.tcp_fastopen) {
+	bytes_written = sendto(ctx->sock, buf, len, MSG_FASTOPEN,
+	&cf->conn->remote_addr->sa_addr,
+	cf->conn->remote_addr->addrlen);
+	cf->conn->bits.tcp_fastopen = FALSE;
+	}
+	else
+	#endif
+	nwritten = swrite(ctx->sock, buf, len);
+
+	if(-1 == nwritten) {
+	int sockerr = SOCKERRNO;
+
+	if(
+	#ifdef WSAEWOULDBLOCK
+	/* This is how Windows does it */
+	(WSAEWOULDBLOCK == sockerr)
+	#else
+	/* errno may be EWOULDBLOCK or on some systems EAGAIN when it returned
+	due to its inability to send off data without blocking. We therefore
+	treat both error codes the same here */
+	(EWOULDBLOCK == sockerr) \|\| (EAGAIN == sockerr) \|\| (EINTR == sockerr) \|\|
+	(EINPROGRESS == sockerr)
+	#endif
+	) {
+	/* this is just a case of EWOULDBLOCK */
+	*err = CURLE_AGAIN;
+	}
+	else {
+	char buffer[STRERROR_LEN];
+	failf(data, "Send failure: %s",
+	Curl_strerror(sockerr, buffer, sizeof(buffer)));
+	data->state.os_errno = sockerr;
+	*err = CURLE_SEND_ERROR;
+	}
+	}
	DEBUGF(LOG_CF(data, cf, "send(len=%zu) -> %d, err=%d",
	len, (int)nwritten, *err));
	return nwritten;
@@ -1138,10 +1284,48 @@ static ssize_t cf_socket_send(struct Curl_cfilter cf, struct Curl_easy data,
	static ssize_t cf_socket_recv(struct Curl_cfilter cf, struct Curl_easy data,
	char buf, size_t len, CURLcode err)
	{
+	struct cf_socket_ctx *ctx = cf->ctx;
	ssize_t nread;

-	DEBUGASSERT(data->conn == cf->conn);
-	nread = Curl_recv_plain(data, cf->sockindex, buf, len, err);
+	*err = CURLE_OK;
+
+	#ifdef USE_RECV_BEFORE_SEND_WORKAROUND
+	/* Check and return data that already received and storied in internal
+	intermediate buffer */
+	nread = get_pre_recved(cf, buf, len);
+	if(nread > 0) {
+	*err = CURLE_OK;
+	return nread;
+	}
+	#endif
+
+	nread = sread(ctx->sock, buf, len);
+
+	if(-1 == nread) {
+	int sockerr = SOCKERRNO;
+
+	if(
+	#ifdef WSAEWOULDBLOCK
+	/* This is how Windows does it */
+	(WSAEWOULDBLOCK == sockerr)
+	#else
+	/* errno may be EWOULDBLOCK or on some systems EAGAIN when it returned
+	due to its inability to send off data without blocking. We therefore
+	treat both error codes the same here */
+	(EWOULDBLOCK == sockerr) \|\| (EAGAIN == sockerr) \|\| (EINTR == sockerr)
+	#endif
+	) {
+	/* this is just a case of EWOULDBLOCK */
+	*err = CURLE_AGAIN;
+	}
+	else {
+	char buffer[STRERROR_LEN];
+	failf(data, "Recv failure: %s",
+	Curl_strerror(sockerr, buffer, sizeof(buffer)));
+	data->state.os_errno = sockerr;
+	*err = CURLE_RECV_ERROR;
+	}
+	}
	DEBUGF(LOG_CF(data, cf, "recv(len=%zu) -> %d, err=%d", len, (int)nread,
	*err));
	return nread;

lib/cfilters.c+8 -2

@@ -323,6 +323,14 @@ int Curl_conn_cf_get_select_socks(struct Curl_cfilter *cf,
	return 0;
	}

+	bool Curl_conn_cf_data_pending(struct Curl_cfilter *cf,
+	const struct Curl_easy *data)
+	{
+	if(cf)
+	return cf->cft->has_data_pending(cf, data);
+	return FALSE;
+	}
+
	ssize_t Curl_conn_cf_send(struct Curl_cfilter cf, struct Curl_easy data,
	const void buf, size_t len, CURLcode err)
	{
@@ -426,8 +434,6 @@ bool Curl_conn_data_pending(struct Curl_easy *data, int sockindex)
	(void)data;
	DEBUGASSERT(data);
	DEBUGASSERT(data->conn);
-	if(Curl_recv_has_postponed_data(data->conn, sockindex))
-	return TRUE;

	cf = data->conn->cfilter[sockindex];
	while(cf && !cf->connected) {

lib/cfilters.h+2 -0

@@ -268,6 +268,8 @@ void Curl_conn_cf_close(struct Curl_cfilter cf, struct Curl_easy data);
	int Curl_conn_cf_get_select_socks(struct Curl_cfilter *cf,
	struct Curl_easy *data,
	curl_socket_t *socks);
+	bool Curl_conn_cf_data_pending(struct Curl_cfilter *cf,
+	const struct Curl_easy *data);
	ssize_t Curl_conn_cf_send(struct Curl_cfilter cf, struct Curl_easy data,
	const void buf, size_t len, CURLcode err);
	ssize_t Curl_conn_cf_recv(struct Curl_cfilter cf, struct Curl_easy data,

lib/http2.c+7 -8

@@ -1786,8 +1786,7 @@ static ssize_t h2_cf_recv(struct Curl_cfilter cf, struct Curl_easy data,
	if(ctx->inbuflen == 0) {
	/* Receive data from the "lower" filters */
	nread = Curl_conn_cf_recv(cf->next, data, ctx->inbuf, H2_BUFSIZE, err);
-
-	if(nread == -1) {
+	if(nread < 0) {
	if(*err != CURLE_AGAIN)
	failf(data, "Failed receiving HTTP2 data");
	else if(stream->closed)
@@ -1796,8 +1795,7 @@ static ssize_t h2_cf_recv(struct Curl_cfilter cf, struct Curl_easy data,

	return -1;
	}
-
-	if(nread == 0) {
+	else if(nread == 0) {
	if(!stream->closed) {
	/* This will happen when the server or proxy server is SIGKILLed
	during data transfer. We should emit an error since our data
@@ -1814,21 +1812,22 @@ static ssize_t h2_cf_recv(struct Curl_cfilter cf, struct Curl_easy data,
	return 0;
	}

-	H2BUGF(infof(data, "nread=%zd", nread));
-
+	H2BUGF(infof(data, "http2_recv: recvd %zd bytes", nread));
	ctx->inbuflen = nread;
-
	DEBUGASSERT(ctx->nread_inbuf == 0);
	}
	else {
	nread = ctx->inbuflen - ctx->nread_inbuf;
-	(void)nread; /* silence warning, used in debug */
	H2BUGF(infof(data, "Use data left in connection buffer, nread=%zd",
	nread));
	}

	if(h2_process_pending_input(cf, data, err))
	return -1;
+	if(Curl_conn_cf_data_pending(cf->next, data)) {
+	H2BUGF(infof(data, "conn has pending data, set drain"));
+	drain_this(cf, data);
+	}
	}
	if(stream->memlen) {
	ssize_t retlen = stream->memlen;

lib/krb5.c+12 -12

@@ -46,6 +46,7 @@
	#endif

	#include "urldata.h"
+	#include "cfilters.h"
	#include "cf-socket.h"
	#include "curl_base64.h"
	#include "ftp.h"
@@ -455,15 +456,15 @@ static int ftp_send_command(struct Curl_easy data, const char message, ...)
	/* Read \|len\| from the socket \|fd\| and store it in \|to\|. Return a CURLcode
	saying whether an error occurred or CURLE_OK if \|len\| was read. */
	static CURLcode
-	socket_read(struct Curl_easy data, curl_socket_t fd, void to, size_t len)
+	socket_read(struct Curl_easy data, int sockindex, void to, size_t len)
	{
	char *to_p = to;
	CURLcode result;
	ssize_t nread = 0;

	while(len > 0) {
-	result = Curl_read_plain(data, fd, to_p, len, &nread);
-	if(!result) {
+	nread = Curl_conn_recv(data, sockindex, to_p, len, &result);
+	if(nread > 0) {
	len -= nread;
	to_p += nread;
	}
@@ -481,7 +482,7 @@ socket_read(struct Curl_easy data, curl_socket_t fd, void to, size_t len)
	CURLcode saying whether an error occurred or CURLE_OK if \|len\| was
	written. */
	static CURLcode
-	socket_write(struct Curl_easy data, curl_socket_t fd, const void to,
+	socket_write(struct Curl_easy data, int sockindex, const void to,
	size_t len)
	{
	const char *to_p = to;
@@ -489,8 +490,8 @@ socket_write(struct Curl_easy data, curl_socket_t fd, const void to,
	ssize_t written;

	while(len > 0) {
-	result = Curl_write_plain(data, fd, to_p, len, &written);
-	if(!result) {
+	written = Curl_conn_send(data, sockindex, to_p, len, &result);
+	if(written > 0) {
	len -= written;
	to_p += written;
	}
@@ -503,7 +504,7 @@ socket_write(struct Curl_easy data, curl_socket_t fd, const void to,
	return CURLE_OK;
	}

-	static CURLcode read_data(struct Curl_easy *data, curl_socket_t fd,
+	static CURLcode read_data(struct Curl_easy *data, int sockindex,
	struct krb5buffer *buf)
	{
	struct connectdata *conn = data->conn;
@@ -511,7 +512,7 @@ static CURLcode read_data(struct Curl_easy *data, curl_socket_t fd,
	CURLcode result;
	int nread;

-	result = socket_read(data, fd, &len, sizeof(len));
+	result = socket_read(data, sockindex, &len, sizeof(len));
	if(result)
	return result;

@@ -526,7 +527,7 @@ static CURLcode read_data(struct Curl_easy *data, curl_socket_t fd,
	if(!len \|\| !buf->data)
	return CURLE_OUT_OF_MEMORY;

-	result = socket_read(data, fd, buf->data, len);
+	result = socket_read(data, sockindex, buf->data, len);
	if(result)
	return result;
	nread = conn->mech->decode(conn->app_data, buf->data, len,
@@ -555,13 +556,12 @@ static ssize_t sec_recv(struct Curl_easy *data, int sockindex,
	size_t bytes_read;
	size_t total_read = 0;
	struct connectdata *conn = data->conn;
-	curl_socket_t fd = conn->sock[sockindex];

	*err = CURLE_OK;

	/* Handle clear text response. */
	if(conn->sec_complete == 0 \|\| conn->data_prot == PROT_CLEAR)
-	return Curl_recv_plain(data, sockindex, buffer, len, err);
+	return Curl_conn_recv(data, sockindex, buffer, len, err);

	if(conn->in_buffer.eof_flag) {
	conn->in_buffer.eof_flag = 0;
@@ -574,7 +574,7 @@ static ssize_t sec_recv(struct Curl_easy *data, int sockindex,
	buffer += bytes_read;

	while(len > 0) {
-	if(read_data(data, fd, &conn->in_buffer))
+	if(read_data(data, sockindex, &conn->in_buffer))
	return -1;
	if(conn->in_buffer.size == 0) {
	if(bytes_read > 0)

lib/sendf.c+0 -282

@@ -138,105 +138,6 @@ static size_t convert_lineends(struct Curl_easy *data,
	}
	#endif /* CURL_DO_LINEEND_CONV && !CURL_DISABLE_FTP */

-	#ifdef USE_RECV_BEFORE_SEND_WORKAROUND
-	bool Curl_recv_has_postponed_data(struct connectdata *conn, int sockindex)
-	{
-	struct postponed_data * const psnd = &(conn->postponed[sockindex]);
-	return psnd->buffer && psnd->allocated_size &&
-	psnd->recv_size > psnd->recv_processed;
-	}
-
-	static CURLcode pre_receive_plain(struct Curl_easy *data,
-	struct connectdata *conn, int num)
-	{
-	const curl_socket_t sockfd = conn->sock[num];
-	struct postponed_data * const psnd = &(conn->postponed[num]);
-	size_t bytestorecv = psnd->allocated_size - psnd->recv_size;
-	ssize_t recvedbytes;
-
-	/* WinSock will destroy unread received data if send() is
-	failed.
-	To avoid lossage of received data, recv() must be
-	performed before every send() if any incoming data is
-	available. However, skip this, if buffer is already full. */
-	if((conn->handler->protocol&PROTO_FAMILY_HTTP) != 0 &&
-	conn->recv[num] == Curl_conn_recv &&
-	(!psnd->buffer \|\| bytestorecv)) {
-	const int readymask = Curl_socket_check(sockfd, CURL_SOCKET_BAD,
-	CURL_SOCKET_BAD, 0);
-	if(readymask != -1 && (readymask & CURL_CSELECT_IN) != 0) {
-	/* Have some incoming data */
-	if(!psnd->buffer) {
-	/* Use buffer double default size for intermediate buffer */
-	psnd->allocated_size = 2 * data->set.buffer_size;
-	psnd->buffer = malloc(psnd->allocated_size);
-	if(!psnd->buffer)
-	return CURLE_OUT_OF_MEMORY;
-	psnd->recv_size = 0;
-	psnd->recv_processed = 0;
-	#ifdef DEBUGBUILD
-	psnd->bindsock = sockfd; /* Used only for DEBUGASSERT */
-	#endif /* DEBUGBUILD */
-	bytestorecv = psnd->allocated_size;
-	}
-
-	DEBUGASSERT(psnd->bindsock == sockfd);
-	recvedbytes = sread(sockfd, psnd->buffer + psnd->recv_size,
-	bytestorecv);
-	if(recvedbytes > 0)
-	psnd->recv_size += recvedbytes;
-	}
-	}
-	return CURLE_OK;
-	}
-
-	static ssize_t get_pre_recved(struct connectdata conn, int num, char buf,
-	size_t len)
-	{
-	struct postponed_data * const psnd = &(conn->postponed[num]);
-	size_t copysize;
-	if(!psnd->buffer)
-	return 0;
-
-	DEBUGASSERT(psnd->allocated_size > 0);
-	DEBUGASSERT(psnd->recv_size <= psnd->allocated_size);
-	DEBUGASSERT(psnd->recv_processed <= psnd->recv_size);
-	/* Check and process data that already received and storied in internal
-	intermediate buffer */
-	if(psnd->recv_size > psnd->recv_processed) {
-	DEBUGASSERT(psnd->bindsock == conn->sock[num]);
-	copysize = CURLMIN(len, psnd->recv_size - psnd->recv_processed);
-	memcpy(buf, psnd->buffer + psnd->recv_processed, copysize);
-	psnd->recv_processed += copysize;
-	}
-	else
-	copysize = 0; /* buffer was allocated, but nothing was received */
-
-	/* Free intermediate buffer if it has no unprocessed data */
-	if(psnd->recv_processed == psnd->recv_size) {
-	free(psnd->buffer);
-	psnd->buffer = NULL;
-	psnd->allocated_size = 0;
-	psnd->recv_size = 0;
-	psnd->recv_processed = 0;
-	#ifdef DEBUGBUILD
-	psnd->bindsock = CURL_SOCKET_BAD;
-	#endif /* DEBUGBUILD */
-	}
-	return (ssize_t)copysize;
-	}
-	#else /* ! USE_RECV_BEFORE_SEND_WORKAROUND */
-	/* Use "do-nothing" macros instead of functions when workaround not used */
-	bool Curl_recv_has_postponed_data(struct connectdata *conn, int sockindex)
-	{
-	(void)conn;
-	(void)sockindex;
-	return false;
-	}
-	#define pre_receive_plain(d,c,n) CURLE_OK
-	#define get_pre_recved(c,n,b,l) 0
-	#endif /* ! USE_RECV_BEFORE_SEND_WORKAROUND */
-
	/*
	* Curl_write() is an internal write function that sends data to the
	* server. Works with plain sockets, SCP, SSL or kerberos.
@@ -294,154 +195,6 @@ CURLcode Curl_write(struct Curl_easy *data,
	}
	}

-	/* Curl_send_plain sends raw data without a size restriction on 'len'. */
-	ssize_t Curl_send_plain(struct Curl_easy *data, int num,
-	const void mem, size_t len, CURLcode code)
-	{
-	struct connectdata *conn;
-	curl_socket_t sockfd;
-	ssize_t bytes_written;
-
-	DEBUGASSERT(data);
-	DEBUGASSERT(data->conn);
-	conn = data->conn;
-	sockfd = conn->sock[num];
-	/* WinSock will destroy unread received data if send() is
-	failed.
-	To avoid lossage of received data, recv() must be
-	performed before every send() if any incoming data is
-	available. */
-	if(pre_receive_plain(data, conn, num)) {
-	*code = CURLE_OUT_OF_MEMORY;
-	return -1;
-	}
-
-	#if defined(MSG_FASTOPEN) && !defined(TCP_FASTOPEN_CONNECT) /* Linux */
-	if(conn->bits.tcp_fastopen) {
-	bytes_written = sendto(sockfd, mem, len, MSG_FASTOPEN,
-	&conn->remote_addr->sa_addr,
-	conn->remote_addr->addrlen);
-	conn->bits.tcp_fastopen = FALSE;
-	}
-	else
-	#endif
-	bytes_written = swrite(sockfd, mem, len);
-
-	*code = CURLE_OK;
-	if(-1 == bytes_written) {
-	int err = SOCKERRNO;
-
-	if(
-	#ifdef WSAEWOULDBLOCK
-	/* This is how Windows does it */
-	(WSAEWOULDBLOCK == err)
-	#else
-	/* errno may be EWOULDBLOCK or on some systems EAGAIN when it returned
-	due to its inability to send off data without blocking. We therefore
-	treat both error codes the same here */
-	(EWOULDBLOCK == err) \|\| (EAGAIN == err) \|\| (EINTR == err) \|\|
-	(EINPROGRESS == err)
-	#endif
-	) {
-	/* this is just a case of EWOULDBLOCK */
-	*code = CURLE_AGAIN;
-	}
-	else {
-	char buffer[STRERROR_LEN];
-	failf(data, "Send failure: %s",
-	Curl_strerror(err, buffer, sizeof(buffer)));
-	data->state.os_errno = err;
-	*code = CURLE_SEND_ERROR;
-	}
-	}
-	return bytes_written;
-	}
-
-	/*
-	* Curl_write_plain() is an internal write function that sends data to the
-	* server using plain sockets only. Otherwise meant to have the exact same
-	* proto as Curl_write().
-	*
-	* This function wraps Curl_send_plain(). The only difference besides the
-	* prototype is '*written' (bytes written) is set to 0 on error.
-	* 'sockfd' must be one of the connection's two main sockets and the value of
-	* 'len' must not be changed.
-	*/
-	CURLcode Curl_write_plain(struct Curl_easy *data,
-	curl_socket_t sockfd,
-	const void *mem,
-	size_t len,
-	ssize_t *written)
-	{
-	CURLcode result;
-	struct connectdata *conn = data->conn;
-	int num;
-	DEBUGASSERT(conn);
-	DEBUGASSERT(sockfd == conn->sock[FIRSTSOCKET] \|\|
-	sockfd == conn->sock[SECONDARYSOCKET]);
-	if(sockfd != conn->sock[FIRSTSOCKET] &&
-	sockfd != conn->sock[SECONDARYSOCKET])
-	return CURLE_BAD_FUNCTION_ARGUMENT;
-
-	num = (sockfd == conn->sock[SECONDARYSOCKET]);
-
-	*written = Curl_send_plain(data, num, mem, len, &result);
-	if(*written == -1)
-	*written = 0;
-
-	return result;
-	}
-
-	/* Curl_recv_plain receives raw data without a size restriction on 'len'. */
-	ssize_t Curl_recv_plain(struct Curl_easy data, int num, char buf,
-	size_t len, CURLcode *code)
-	{
-	struct connectdata *conn;
-	curl_socket_t sockfd;
-	ssize_t nread;
-	DEBUGASSERT(data);
-	DEBUGASSERT(data->conn);
-	conn = data->conn;
-	sockfd = conn->sock[num];
-	/* Check and return data that already received and storied in internal
-	intermediate buffer */
-	nread = get_pre_recved(conn, num, buf, len);
-	if(nread > 0) {
-	*code = CURLE_OK;
-	return nread;
-	}
-
-	nread = sread(sockfd, buf, len);
-
-	*code = CURLE_OK;
-	if(-1 == nread) {
-	int err = SOCKERRNO;
-
-	if(
-	#ifdef WSAEWOULDBLOCK
-	/* This is how Windows does it */
-	(WSAEWOULDBLOCK == err)
-	#else
-	/* errno may be EWOULDBLOCK or on some systems EAGAIN when it returned
-	due to its inability to send off data without blocking. We therefore
-	treat both error codes the same here */
-	(EWOULDBLOCK == err) \|\| (EAGAIN == err) \|\| (EINTR == err)
-	#endif
-	) {
-	/* this is just a case of EWOULDBLOCK */
-	*code = CURLE_AGAIN;
-	}
-	else {
-	char buffer[STRERROR_LEN];
-	failf(data, "Recv failure: %s",
-	Curl_strerror(err, buffer, sizeof(buffer)));
-	data->state.os_errno = err;
-	*code = CURLE_RECV_ERROR;
-	}
-	}
-	return nread;
-	}
-
	static CURLcode pausewrite(struct Curl_easy *data,
	int type, /* what type of data */
	const char *ptr,
@@ -633,41 +386,6 @@ CURLcode Curl_client_write(struct Curl_easy *data,
	return chop_write(data, type, ptr, len);
	}

-	/*
-	* Curl_read_plain() is an internal read function that reads data from the
-	* server using plain sockets only. Otherwise meant to have the exact same
-	* proto as Curl_read().
-	*
-	* This function wraps Curl_recv_plain(). The only difference besides the
-	* prototype is '*n' (bytes read) is set to 0 on error.
-	* 'sockfd' must be one of the connection's two main sockets and the value of
-	* 'sizerequested' must not be changed.
-	*/
-	CURLcode Curl_read_plain(struct Curl_easy data, / transfer */
-	curl_socket_t sockfd, /* read from this socket */
-	char buf, / store read data here */
-	size_t sizerequested, /* max amount to read */
-	ssize_t n) / amount bytes read */
-	{
-	CURLcode result;
-	struct connectdata *conn = data->conn;
-	int num;
-	DEBUGASSERT(conn);
-	DEBUGASSERT(sockfd == conn->sock[FIRSTSOCKET] \|\|
-	sockfd == conn->sock[SECONDARYSOCKET]);
-	if(sockfd != conn->sock[FIRSTSOCKET] &&
-	sockfd != conn->sock[SECONDARYSOCKET])
-	return CURLE_BAD_FUNCTION_ARGUMENT;
-
-	num = (sockfd == conn->sock[SECONDARYSOCKET]);
-
-	*n = Curl_recv_plain(data, num, buf, sizerequested, &result);
-	if(*n == -1)
-	*n = 0;
-
-	return result;
-	}
-
	/*
	* Internal read-from-socket function. This is meant to deal with plain
	* sockets, SSL sockets and kerberos sockets.

lib/sendf.h+0 -20

@@ -40,20 +40,6 @@
	CURLcode Curl_client_write(struct Curl_easy data, int type, char ptr,
	size_t len) WARN_UNUSED_RESULT;

-	bool Curl_recv_has_postponed_data(struct connectdata *conn, int sockindex);
-
-	/* internal read-function, does plain socket only */
-	CURLcode Curl_read_plain(struct Curl_easy *data,
-	curl_socket_t sockfd,
-	char *buf,
-	size_t sizerequested,
-	ssize_t *n);
-
-	ssize_t Curl_recv_plain(struct Curl_easy data, int num, char buf,
-	size_t len, CURLcode *code);
-	ssize_t Curl_send_plain(struct Curl_easy *data, int num,
-	const void mem, size_t len, CURLcode code);
-
	/* internal read-function, does plain socket, SSL and krb4 */
	CURLcode Curl_read(struct Curl_easy *data, curl_socket_t sockfd,
	char *buf, size_t buffersize,
@@ -65,10 +51,4 @@ CURLcode Curl_write(struct Curl_easy *data,
	const void *mem, size_t len,
	ssize_t *written);

-	/* internal write-function, does plain sockets ONLY */
-	CURLcode Curl_write_plain(struct Curl_easy *data,
-	curl_socket_t sockfd,
-	const void *mem, size_t len,
-	ssize_t *written);
-
	#endif /* HEADER_CURL_SENDF_H */

lib/socks.c+140 -141

@@ -89,8 +89,8 @@ struct socks_state {
	*
	* This is STUPID BLOCKING behavior. Only used by the SOCKS GSSAPI functions.
	*/
-	int Curl_blockread_all(struct Curl_easy data, / transfer */
-	curl_socket_t sockfd, /* read from this socket */
+	int Curl_blockread_all(struct Curl_cfilter *cf,
+	struct Curl_easy data, / transfer */
	char buf, / store read data here */
	ssize_t buffersize, /* max amount to read */
	ssize_t n) / amount bytes read */
@@ -98,6 +98,8 @@ int Curl_blockread_all(struct Curl_easy data, / transfer */
	ssize_t nread = 0;
	ssize_t allread = 0;
	int result;
+	CURLcode err = CURLE_OK;
+
	*n = 0;
	for(;;) {
	timediff_t timeout_ms = Curl_timeleft(data, NULL, TRUE);
@@ -108,15 +110,19 @@ int Curl_blockread_all(struct Curl_easy data, / transfer */
	}
	if(!timeout_ms)
	timeout_ms = TIMEDIFF_T_MAX;
-	if(SOCKET_READABLE(sockfd, timeout_ms) <= 0) {
+	if(SOCKET_READABLE(cf->conn->sock[cf->sockindex], timeout_ms) <= 0) {
	result = ~CURLE_OK;
	break;
	}
-	result = Curl_read_plain(data, sockfd, buf, buffersize, &nread);
-	if(CURLE_AGAIN == result)
-	continue;
-	if(result)
-	break;
+	nread = Curl_conn_cf_recv(cf->next, data, buf, buffersize, &err);
+	if(nread <= 0) {
+	result = err;
+	if(CURLE_AGAIN == err)
+	continue;
+	if(err) {
+	break;
+	}
+	}

	if(buffersize == nread) {
	allread += nread;
@@ -192,6 +198,68 @@ static void socksstate(struct socks_state sx, struct Curl_easy data,
	#endif
	}

+	static CURLproxycode socks_state_send(struct Curl_cfilter *cf,
+	struct socks_state *sx,
+	struct Curl_easy *data,
+	CURLproxycode failcode,
+	const char *description)
+	{
+	ssize_t nwritten;
+	CURLcode result;
+
+	nwritten = Curl_conn_cf_send(cf->next, data, (char *)sx->outp,
+	sx->outstanding, &result);
+	if(nwritten <= 0) {
+	if(CURLE_AGAIN == result) {
+	return CURLPX_OK;
+	}
+	else if(CURLE_OK == result) {
+	/* connection closed */
+	failf(data, "connection to proxy closed");
+	return CURLPX_CLOSED;
+	}
+	failf(data, "Failed to send %s: %s", description,
+	curl_easy_strerror(result));
+	return failcode;
+	}
+	DEBUGASSERT(sx->outstanding >= nwritten);
+	/* not done, remain in state */
+	sx->outstanding -= nwritten;
+	sx->outp += nwritten;
+	return CURLPX_OK;
+	}
+
+	static CURLproxycode socks_state_recv(struct Curl_cfilter *cf,
+	struct socks_state *sx,
+	struct Curl_easy *data,
+	CURLproxycode failcode,
+	const char *description)
+	{
+	ssize_t nread;
+	CURLcode result;
+
+	nread = Curl_conn_cf_recv(cf->next, data, (char *)sx->outp,
+	sx->outstanding, &result);
+	if(nread <= 0) {
+	if(CURLE_AGAIN == result) {
+	return CURLPX_OK;
+	}
+	else if(CURLE_OK == result) {
+	/* connection closed */
+	failf(data, "connection to proxy closed");
+	return CURLPX_CLOSED;
+	}
+	failf(data, "SOCKS4: Failed receiving %s: %s", description,
+	curl_easy_strerror(result));
+	return failcode;
+	}
+	/* remain in reading state */
+	DEBUGASSERT(sx->outstanding >= nread);
+	sx->outstanding -= nread;
+	sx->outp += nread;
+	return CURLPX_OK;
+	}
+
	/*
	* This function logs in to a SOCKS4 proxy and sends the specifics to the final
	* destination server.
@@ -212,10 +280,8 @@ static CURLproxycode do_SOCKS4(struct Curl_cfilter *cf,
	(conn->socks_proxy.proxytype == CURLPROXY_SOCKS4A) ? TRUE : FALSE;
	unsigned char socksreq = (unsigned char )data->state.buffer;
	CURLcode result;
-	curl_socket_t sockfd = conn->sock[cf->sockindex];
+	CURLproxycode presult;
	struct Curl_dns_entry *dns = NULL;
-	ssize_t actualread;
-	ssize_t written;

	/* make sure that the buffer is at least 600 bytes */
	DEBUGASSERT(READBUFFER_MIN >= 600);
@@ -375,19 +441,14 @@ static CURLproxycode do_SOCKS4(struct Curl_cfilter *cf,
	/* FALLTHROUGH */
	case CONNECT_REQ_SENDING:
	/* Send request */
-	result = Curl_write_plain(data, sockfd, (char *)sx->outp,
-	sx->outstanding, &written);
-	if(result && (CURLE_AGAIN != result)) {
-	failf(data, "Failed to send SOCKS4 connect request.");
-	return CURLPX_SEND_CONNECT;
-	}
-	if(written != sx->outstanding) {
-	/* not done, remain in state */
-	sx->outstanding -= written;
-	sx->outp += written;
+	presult = socks_state_send(cf, sx, data, CURLPX_SEND_CONNECT,
+	"SOCKS4 connect request");
+	if(CURLPX_OK != presult)
+	return presult;
+	else if(sx->outstanding) {
+	/* remain in sending state */
	return CURLPX_OK;
	}
-
	/* done sending! */
	sx->outstanding = 8; /* receive data size */
	sx->outp = socksreq;
@@ -396,22 +457,12 @@ static CURLproxycode do_SOCKS4(struct Curl_cfilter *cf,
	/* FALLTHROUGH */
	case CONNECT_SOCKS_READ:
	/* Receive response */
-	result = Curl_read_plain(data, sockfd, (char *)sx->outp,
-	sx->outstanding, &actualread);
-	if(result && (CURLE_AGAIN != result)) {
-	failf(data, "SOCKS4: Failed receiving connect request ack: %s",
-	curl_easy_strerror(result));
-	return CURLPX_RECV_CONNECT;
-	}
-	else if(!result && !actualread) {
-	/* connection closed */
-	failf(data, "connection to proxy closed");
-	return CURLPX_CLOSED;
-	}
-	else if(actualread != sx->outstanding) {
+	presult = socks_state_recv(cf, sx, data, CURLPX_RECV_CONNECT,
+	"connect request ack");
+	if(CURLPX_OK != presult)
+	return presult;
+	else if(sx->outstanding) {
	/* remain in reading state */
-	sx->outstanding -= actualread;
-	sx->outp += actualread;
	return CURLPX_OK;
	}
	sxstate(sx, data, CONNECT_DONE);
@@ -518,10 +569,8 @@ static CURLproxycode do_SOCKS5(struct Curl_cfilter *cf,
	unsigned char socksreq = (unsigned char )data->state.buffer;
	char dest[256] = "unknown"; /* printable hostname:port */
	int idx;
-	ssize_t actualread;
-	ssize_t written;
	CURLcode result;
-	curl_socket_t sockfd = conn->sock[cf->sockindex];
+	CURLproxycode presult;
	bool socks5_resolve_local =
	(conn->socks_proxy.proxytype == CURLPROXY_SOCKS5) ? TRUE : FALSE;
	const size_t hostname_len = strlen(sx->hostname);
@@ -567,30 +616,25 @@ static CURLproxycode do_SOCKS5(struct Curl_cfilter *cf,
	/* write the number of authentication methods */
	socksreq[1] = (unsigned char) (idx - 2);

-	result = Curl_write_plain(data, sockfd, socksreq, idx, &written);
-	if(result && (CURLE_AGAIN != result)) {
-	failf(data, "Unable to send initial SOCKS5 request.");
-	return CURLPX_SEND_CONNECT;
-	}
-	if(written != idx) {
-	sxstate(sx, data, CONNECT_SOCKS_SEND);
-	sx->outstanding = idx - written;
-	sx->outp = &socksreq[written];
+	sx->outp = socksreq;
+	sx->outstanding = idx;
+	presult = socks_state_send(cf, sx, data, CURLPX_SEND_CONNECT,
+	"initial SOCKS5 request");
+	if(CURLPX_OK != presult)
+	return presult;
+	else if(sx->outstanding) {
+	/* remain in sending state */
	return CURLPX_OK;
	}
	sxstate(sx, data, CONNECT_SOCKS_READ);
	goto CONNECT_SOCKS_READ_INIT;
	case CONNECT_SOCKS_SEND:
-	result = Curl_write_plain(data, sockfd, (char *)sx->outp,
-	sx->outstanding, &written);
-	if(result && (CURLE_AGAIN != result)) {
-	failf(data, "Unable to send initial SOCKS5 request.");
-	return CURLPX_SEND_CONNECT;
-	}
-	if(written != sx->outstanding) {
-	/* not done, remain in state */
-	sx->outstanding -= written;
-	sx->outp += written;
+	presult = socks_state_send(cf, sx, data, CURLPX_SEND_CONNECT,
+	"initial SOCKS5 request");
+	if(CURLPX_OK != presult)
+	return presult;
+	else if(sx->outstanding) {
+	/* remain in sending state */
	return CURLPX_OK;
	}
	/* FALLTHROUGH */
@@ -600,21 +644,12 @@ static CURLproxycode do_SOCKS5(struct Curl_cfilter *cf,
	sx->outp = socksreq; /* store it here */
	/* FALLTHROUGH */
	case CONNECT_SOCKS_READ:
-	result = Curl_read_plain(data, sockfd, (char *)sx->outp,
-	sx->outstanding, &actualread);
-	if(result && (CURLE_AGAIN != result)) {
-	failf(data, "Unable to receive initial SOCKS5 response.");
-	return CURLPX_RECV_CONNECT;
-	}
-	else if(!result && !actualread) {
-	/* connection closed */
-	failf(data, "Connection to proxy closed");
-	return CURLPX_CLOSED;
-	}
-	else if(actualread != sx->outstanding) {
+	presult = socks_state_recv(cf, sx, data, CURLPX_RECV_CONNECT,
+	"initial SOCKS5 response");
+	if(CURLPX_OK != presult)
+	return presult;
+	else if(sx->outstanding) {
	/* remain in reading state */
-	sx->outstanding -= actualread;
-	sx->outp += actualread;
	return CURLPX_OK;
	}
	else if(socksreq[0] != 5) {
@@ -634,7 +669,7 @@ static CURLproxycode do_SOCKS5(struct Curl_cfilter *cf,
	#if defined(HAVE_GSSAPI) \|\| defined(USE_WINDOWS_SSPI)
	else if(allow_gssapi && (socksreq[1] == 1)) {
	sxstate(sx, data, CONNECT_GSSAPI_INIT);
-	result = Curl_SOCKS5_gssapi_negotiate(cf->sockindex, data);
+	result = Curl_SOCKS5_gssapi_negotiate(cf, data);
	if(result) {
	failf(data, "Unable to negotiate SOCKS5 GSS-API context.");
	return CURLPX_GSSAPI;
@@ -713,16 +748,12 @@ static CURLproxycode do_SOCKS5(struct Curl_cfilter *cf,
	}
	/* FALLTHROUGH */
	case CONNECT_AUTH_SEND:
-	result = Curl_write_plain(data, sockfd, sx->outp,
-	sx->outstanding, &written);
-	if(result && (CURLE_AGAIN != result)) {
-	failf(data, "Failed to send SOCKS5 sub-negotiation request.");
-	return CURLPX_SEND_AUTH;
-	}
-	if(sx->outstanding != written) {
-	/* remain in state */
-	sx->outstanding -= written;
-	sx->outp += written;
+	presult = socks_state_send(cf, sx, data, CURLPX_SEND_AUTH,
+	"SOCKS5 sub-negotiation request");
+	if(CURLPX_OK != presult)
+	return presult;
+	else if(sx->outstanding) {
+	/* remain in sending state */
	return CURLPX_OK;
	}
	sx->outp = socksreq;
@@ -730,21 +761,12 @@ static CURLproxycode do_SOCKS5(struct Curl_cfilter *cf,
	sxstate(sx, data, CONNECT_AUTH_READ);
	/* FALLTHROUGH */
	case CONNECT_AUTH_READ:
-	result = Curl_read_plain(data, sockfd, (char *)sx->outp,
-	sx->outstanding, &actualread);
-	if(result && (CURLE_AGAIN != result)) {
-	failf(data, "Unable to receive SOCKS5 sub-negotiation response.");
-	return CURLPX_RECV_AUTH;
-	}
-	else if(!result && !actualread) {
-	/* connection closed */
-	failf(data, "connection to proxy closed");
-	return CURLPX_CLOSED;
-	}
-	else if(actualread != sx->outstanding) {
-	/* remain in state */
-	sx->outstanding -= actualread;
-	sx->outp += actualread;
+	presult = socks_state_recv(cf, sx, data, CURLPX_RECV_AUTH,
+	"SOCKS5 sub-negotiation response");
+	if(CURLPX_OK != presult)
+	return presult;
+	else if(sx->outstanding) {
+	/* remain in reading state */
	return CURLPX_OK;
	}
	/* ignore the first (VER) byte */
@@ -909,16 +931,12 @@ static CURLproxycode do_SOCKS5(struct Curl_cfilter *cf,
	sxstate(sx, data, CONNECT_REQ_SENDING);
	/* FALLTHROUGH */
	case CONNECT_REQ_SENDING:
-	result = Curl_write_plain(data, sockfd, (char *)sx->outp,
-	sx->outstanding, &written);
-	if(result && (CURLE_AGAIN != result)) {
-	failf(data, "Failed to send SOCKS5 connect request.");
-	return CURLPX_SEND_REQUEST;
-	}
-	if(sx->outstanding != written) {
-	/* remain in state */
-	sx->outstanding -= written;
-	sx->outp += written;
+	presult = socks_state_send(cf, sx, data, CURLPX_SEND_REQUEST,
+	"SOCKS5 connect request");
+	if(CURLPX_OK != presult)
+	return presult;
+	else if(sx->outstanding) {
+	/* remain in send state */
	return CURLPX_OK;
	}
	#if defined(HAVE_GSSAPI) \|\| defined(USE_WINDOWS_SSPI)
@@ -932,25 +950,15 @@ static CURLproxycode do_SOCKS5(struct Curl_cfilter *cf,
	sxstate(sx, data, CONNECT_REQ_READ);
	/* FALLTHROUGH */
	case CONNECT_REQ_READ:
-	result = Curl_read_plain(data, sockfd, (char *)sx->outp,
-	sx->outstanding, &actualread);
-	if(result && (CURLE_AGAIN != result)) {
-	failf(data, "Failed to receive SOCKS5 connect request ack.");
-	return CURLPX_RECV_REQACK;
-	}
-	else if(!result && !actualread) {
-	/* connection closed */
-	failf(data, "connection to proxy closed");
-	return CURLPX_CLOSED;
-	}
-	else if(actualread != sx->outstanding) {
-	/* remain in state */
-	sx->outstanding -= actualread;
-	sx->outp += actualread;
+	presult = socks_state_recv(cf, sx, data, CURLPX_RECV_REQACK,
+	"SOCKS5 connect request ack");
+	if(CURLPX_OK != presult)
+	return presult;
+	else if(sx->outstanding) {
+	/* remain in reading state */
	return CURLPX_OK;
	}
-
-	if(socksreq[0] != 5) { /* version */
+	else if(socksreq[0] != 5) { /* version */
	failf(data,
	"SOCKS5 reply has wrong version, version should be 5.");
	return CURLPX_BAD_VERSION;
@@ -1031,21 +1039,12 @@ static CURLproxycode do_SOCKS5(struct Curl_cfilter *cf,
	#endif
	/* FALLTHROUGH */
	case CONNECT_REQ_READ_MORE:
-	result = Curl_read_plain(data, sockfd, (char *)sx->outp,
-	sx->outstanding, &actualread);
-	if(result && (CURLE_AGAIN != result)) {
-	failf(data, "Failed to receive SOCKS5 connect request ack.");
-	return CURLPX_RECV_ADDRESS;
-	}
-	else if(!result && !actualread) {
-	/* connection closed */
-	failf(data, "connection to proxy closed");
-	return CURLPX_CLOSED;
-	}
-	else if(actualread != sx->outstanding) {
-	/* remain in state */
-	sx->outstanding -= actualread;
-	sx->outp += actualread;
+	presult = socks_state_recv(cf, sx, data, CURLPX_RECV_ADDRESS,
+	"SOCKS5 connect request address");
+	if(CURLPX_OK != presult)
+	return presult;
+	else if(sx->outstanding) {
+	/* remain in reading state */
	return CURLPX_OK;
	}
	sxstate(sx, data, CONNECT_DONE);

lib/socks.h+3 -3

@@ -37,8 +37,8 @@
	*
	* This is STUPID BLOCKING behavior
	*/
-	int Curl_blockread_all(struct Curl_easy *data,
-	curl_socket_t sockfd,
+	int Curl_blockread_all(struct Curl_cfilter *cf,
+	struct Curl_easy *data,
	char *buf,
	ssize_t buffersize,
	ssize_t *n);
@@ -47,7 +47,7 @@ int Curl_blockread_all(struct Curl_easy *data,
	/*
	* This function handles the SOCKS5 GSS-API negotiation and initialization
	*/
-	CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
+	CURLcode Curl_SOCKS5_gssapi_negotiate(struct Curl_cfilter *cf,
	struct Curl_easy *data);
	#endif

lib/socks_gssapi.c+23 -21

@@ -30,6 +30,7 @@
	#include "curl_gssapi.h"
	#include "urldata.h"
	#include "sendf.h"
+	#include "cfilters.h"
	#include "connect.h"
	#include "timeval.h"
	#include "socks.h"
@@ -101,14 +102,14 @@ static int check_gss_err(struct Curl_easy *data,
	return 0;
	}

-	CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
+	CURLcode Curl_SOCKS5_gssapi_negotiate(struct Curl_cfilter *cf,
	struct Curl_easy *data)
	{
-	struct connectdata *conn = data->conn;
-	curl_socket_t sock = conn->sock[sockindex];
+	struct connectdata *conn = cf->conn;
+	curl_socket_t sock = conn->sock[cf->sockindex];
	CURLcode code;
	ssize_t actualread;
-	ssize_t written;
+	ssize_t nwritten;
	int result;
	OM_uint32 gss_major_status, gss_minor_status, gss_status;
	OM_uint32 gss_ret_flags;
@@ -203,8 +204,8 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
	us_length = htons((short)gss_send_token.length);
	memcpy(socksreq + 2, &us_length, sizeof(short));

-	code = Curl_write_plain(data, sock, (char *)socksreq, 4, &written);
-	if(code \|\| (4 != written)) {
+	nwritten = Curl_conn_cf_send(cf->next, data, (char *)socksreq, 4, &code);
+	if(code \|\| (4 != nwritten)) {
	failf(data, "Failed to send GSS-API authentication request.");
	gss_release_name(&gss_status, &server);
	gss_release_buffer(&gss_status, &gss_recv_token);
@@ -213,10 +214,10 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
	return CURLE_COULDNT_CONNECT;
	}

-	code = Curl_write_plain(data, sock, (char *)gss_send_token.value,
-	gss_send_token.length, &written);
-
-	if(code \|\| ((ssize_t)gss_send_token.length != written)) {
+	nwritten = Curl_conn_cf_send(cf->next, data,
+	(char *)gss_send_token.value,
+	gss_send_token.length, &code);
+	if(code \|\| ((ssize_t)gss_send_token.length != nwritten)) {
	failf(data, "Failed to send GSS-API authentication token.");
	gss_release_name(&gss_status, &server);
	gss_release_buffer(&gss_status, &gss_recv_token);
@@ -242,7 +243,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
	* +----+------+-----+----------------+
	*/

-	result = Curl_blockread_all(data, sock, (char *)socksreq, 4, &actualread);
+	result = Curl_blockread_all(cf, data, (char *)socksreq, 4, &actualread);
	if(result \|\| (actualread != 4)) {
	failf(data, "Failed to receive GSS-API authentication response.");
	gss_release_name(&gss_status, &server);
@@ -281,7 +282,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
	return CURLE_OUT_OF_MEMORY;
	}

-	result = Curl_blockread_all(data, sock, (char *)gss_recv_token.value,
+	result = Curl_blockread_all(cf, data, (char *)gss_recv_token.value,
	gss_recv_token.length, &actualread);

	if(result \|\| (actualread != us_length)) {
@@ -410,8 +411,8 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
	memcpy(socksreq + 2, &us_length, sizeof(short));
	}

-	code = Curl_write_plain(data, sock, (char *)socksreq, 4, &written);
-	if(code \|\| (4 != written)) {
+	nwritten = Curl_conn_cf_send(cf->next, data, (char *)socksreq, 4, &code);
+	if(code \|\| (4 != nwritten)) {
	failf(data, "Failed to send GSS-API encryption request.");
	gss_release_buffer(&gss_status, &gss_w_token);
	gss_delete_sec_context(&gss_status, &gss_context, NULL);
@@ -420,17 +421,18 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,

	if(data->set.socks5_gssapi_nec) {
	memcpy(socksreq, &gss_enc, 1);
-	code = Curl_write_plain(data, sock, socksreq, 1, &written);
-	if(code \|\| ( 1 != written)) {
+	nwritten = Curl_conn_cf_send(cf->next, data, (char *)socksreq, 1, &code);
+	if(code \|\| ( 1 != nwritten)) {
	failf(data, "Failed to send GSS-API encryption type.");
	gss_delete_sec_context(&gss_status, &gss_context, NULL);
	return CURLE_COULDNT_CONNECT;
	}
	}
	else {
-	code = Curl_write_plain(data, sock, (char *)gss_w_token.value,
-	gss_w_token.length, &written);
-	if(code \|\| ((ssize_t)gss_w_token.length != written)) {
+	nwritten = Curl_conn_cf_send(cf->next, data,
+	(char *)gss_w_token.value,
+	gss_w_token.length, &code);
+	if(code \|\| ((ssize_t)gss_w_token.length != nwritten)) {
	failf(data, "Failed to send GSS-API encryption type.");
	gss_release_buffer(&gss_status, &gss_w_token);
	gss_delete_sec_context(&gss_status, &gss_context, NULL);
@@ -439,7 +441,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
	gss_release_buffer(&gss_status, &gss_w_token);
	}

-	result = Curl_blockread_all(data, sock, (char *)socksreq, 4, &actualread);
+	result = Curl_blockread_all(cf, data, (char *)socksreq, 4, &actualread);
	if(result \|\| (actualread != 4)) {
	failf(data, "Failed to receive GSS-API encryption response.");
	gss_delete_sec_context(&gss_status, &gss_context, NULL);
@@ -470,7 +472,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
	gss_delete_sec_context(&gss_status, &gss_context, NULL);
	return CURLE_OUT_OF_MEMORY;
	}
-	result = Curl_blockread_all(data, sock, (char *)gss_recv_token.value,
+	result = Curl_blockread_all(cf, data, (char *)gss_recv_token.value,
	gss_recv_token.length, &actualread);

	if(result \|\| (actualread != us_length)) {

lib/socks_sspi.c+17 -14

@@ -29,6 +29,7 @@

	#include "urldata.h"
	#include "sendf.h"
+	#include "cfilters.h"
	#include "connect.h"
	#include "strerror.h"
	#include "timeval.h"
@@ -62,11 +63,11 @@ static int check_sspi_err(struct Curl_easy *data,
	}

	/* This is the SSPI-using version of this function */
-	CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
+	CURLcode Curl_SOCKS5_gssapi_negotiate(struct Curl_cfilter *cf,
	struct Curl_easy *data)
	{
-	struct connectdata *conn = data->conn;
-	curl_socket_t sock = conn->sock[sockindex];
+	struct connectdata *conn = cf->conn;
+	curl_socket_t sock = conn->sock[cf->sockindex];
	CURLcode code;
	ssize_t actualread;
	ssize_t written;
@@ -206,7 +207,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
	us_length = htons((short)sspi_send_token.cbBuffer);
	memcpy(socksreq + 2, &us_length, sizeof(short));

-	code = Curl_write_plain(data, sock, (char *)socksreq, 4, &written);
+	written = Curl_conn_cf_send(cf->next, data, (char *)socksreq, 4, &code);
	if(code \|\| (4 != written)) {
	failf(data, "Failed to send SSPI authentication request.");
	free(service_name);
@@ -219,8 +220,9 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
	return CURLE_COULDNT_CONNECT;
	}

-	code = Curl_write_plain(data, sock, (char *)sspi_send_token.pvBuffer,
-	sspi_send_token.cbBuffer, &written);
+	written = Curl_conn_cf_send(cf->next, data,
+	(char *)sspi_send_token.pvBuffer,
+	sspi_send_token.cbBuffer, &code);
	if(code \|\| (sspi_send_token.cbBuffer != (size_t)written)) {
	failf(data, "Failed to send SSPI authentication token.");
	free(service_name);
@@ -260,7 +262,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
	* +----+------+-----+----------------+
	*/

-	result = Curl_blockread_all(data, sock, (char *)socksreq, 4, &actualread);
+	result = Curl_blockread_all(cf, data, (char *)socksreq, 4, &actualread);
	if(result \|\| (actualread != 4)) {
	failf(data, "Failed to receive SSPI authentication response.");
	free(service_name);
@@ -300,7 +302,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
	s_pSecFn->DeleteSecurityContext(&sspi_context);
	return CURLE_OUT_OF_MEMORY;
	}
-	result = Curl_blockread_all(data, sock, (char *)sspi_recv_token.pvBuffer,
+	result = Curl_blockread_all(cf, data, (char *)sspi_recv_token.pvBuffer,
	sspi_recv_token.cbBuffer, &actualread);

	if(result \|\| (actualread != us_length)) {
@@ -468,7 +470,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
	memcpy(socksreq + 2, &us_length, sizeof(short));
	}

-	code = Curl_write_plain(data, sock, (char *)socksreq, 4, &written);
+	written = Curl_conn_cf_send(cf->next, data, (char *)socksreq, 4, &code);
	if(code \|\| (4 != written)) {
	failf(data, "Failed to send SSPI encryption request.");
	if(sspi_send_token.pvBuffer)
@@ -479,7 +481,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,

	if(data->set.socks5_gssapi_nec) {
	memcpy(socksreq, &gss_enc, 1);
-	code = Curl_write_plain(data, sock, (char *)socksreq, 1, &written);
+	written = Curl_conn_cf_send(cf->next, data, (char *)socksreq, 1, &code);
	if(code \|\| (1 != written)) {
	failf(data, "Failed to send SSPI encryption type.");
	s_pSecFn->DeleteSecurityContext(&sspi_context);
@@ -487,8 +489,9 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
	}
	}
	else {
-	code = Curl_write_plain(data, sock, (char *)sspi_send_token.pvBuffer,
-	sspi_send_token.cbBuffer, &written);
+	written = Curl_conn_cf_send(cf->next, data,
+	(char *)sspi_send_token.pvBuffer,
+	sspi_send_token.cbBuffer, &code);
	if(code \|\| (sspi_send_token.cbBuffer != (size_t)written)) {
	failf(data, "Failed to send SSPI encryption type.");
	if(sspi_send_token.pvBuffer)
@@ -500,7 +503,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
	s_pSecFn->FreeContextBuffer(sspi_send_token.pvBuffer);
	}

-	result = Curl_blockread_all(data, sock, (char *)socksreq, 4, &actualread);
+	result = Curl_blockread_all(cf, data, (char *)socksreq, 4, &actualread);
	if(result \|\| (actualread != 4)) {
	failf(data, "Failed to receive SSPI encryption response.");
	s_pSecFn->DeleteSecurityContext(&sspi_context);
@@ -532,7 +535,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
	return CURLE_OUT_OF_MEMORY;
	}

-	result = Curl_blockread_all(data, sock, (char *)sspi_w_token[0].pvBuffer,
+	result = Curl_blockread_all(cf, data, (char *)sspi_w_token[0].pvBuffer,
	sspi_w_token[0].cbBuffer, &actualread);

	if(result \|\| (actualread != us_length)) {

lib/url.c+0 -46

@@ -705,45 +705,6 @@ CURLcode Curl_open(struct Curl_easy **curl)
	return result;
	}

-	#ifdef USE_RECV_BEFORE_SEND_WORKAROUND
-	static void conn_reset_postponed_data(struct connectdata *conn, int num)
-	{
-	struct postponed_data * const psnd = &(conn->postponed[num]);
-	if(psnd->buffer) {
-	DEBUGASSERT(psnd->allocated_size > 0);
-	DEBUGASSERT(psnd->recv_size <= psnd->allocated_size);
-	DEBUGASSERT(psnd->recv_size ?
-	(psnd->recv_processed < psnd->recv_size) :
-	(psnd->recv_processed == 0));
-	DEBUGASSERT(psnd->bindsock != CURL_SOCKET_BAD);
-	free(psnd->buffer);
-	psnd->buffer = NULL;
-	psnd->allocated_size = 0;
-	psnd->recv_size = 0;
-	psnd->recv_processed = 0;
-	#ifdef DEBUGBUILD
-	psnd->bindsock = CURL_SOCKET_BAD; /* used only for DEBUGASSERT */
-	#endif /* DEBUGBUILD */
-	}
-	else {
-	DEBUGASSERT(psnd->allocated_size == 0);
-	DEBUGASSERT(psnd->recv_size == 0);
-	DEBUGASSERT(psnd->recv_processed == 0);
-	DEBUGASSERT(psnd->bindsock == CURL_SOCKET_BAD);
-	}
-	}
-
-	static void conn_reset_all_postponed_data(struct connectdata *conn)
-	{
-	conn_reset_postponed_data(conn, 0);
-	conn_reset_postponed_data(conn, 1);
-	}
-	#else /* ! USE_RECV_BEFORE_SEND_WORKAROUND */
-	/* Use "do-nothing" macro instead of function when workaround not used */
-	#define conn_reset_all_postponed_data(c) do {} while(0)
-	#endif /* ! USE_RECV_BEFORE_SEND_WORKAROUND */
-
-
	static void conn_shutdown(struct Curl_easy *data)
	{
	DEBUGASSERT(data);
@@ -792,7 +753,6 @@ static void conn_free(struct Curl_easy data, struct connectdata conn)
	Curl_safefree(conn->hostname_resolve);
	Curl_safefree(conn->secondaryhostname);

-	conn_reset_all_postponed_data(conn);
	Curl_llist_destroy(&conn->easyq, NULL);
	Curl_safefree(conn->localdev);
	Curl_free_primary_ssl_config(&conn->ssl_config);
@@ -1545,10 +1505,6 @@ static struct connectdata allocate_conn(struct Curl_easy data)
	conn->connection_id = -1; /* no ID */
	conn->port = -1; /* unknown at this point */
	conn->remote_port = -1; /* unknown at this point */
-	#if defined(USE_RECV_BEFORE_SEND_WORKAROUND) && defined(DEBUGBUILD)
-	conn->postponed[0].bindsock = CURL_SOCKET_BAD; /* no file descriptor */
-	conn->postponed[1].bindsock = CURL_SOCKET_BAD; /* no file descriptor */
-	#endif /* USE_RECV_BEFORE_SEND_WORKAROUND && DEBUGBUILD */

	/* Default protocol-independent behavior doesn't support persistent
	connections, so we set this to force-close. Protocols that support
@@ -3399,8 +3355,6 @@ static void reuse_conn(struct Curl_easy *data,
	existing->hostname_resolve = temp->hostname_resolve;
	temp->hostname_resolve = NULL;

-	conn_reset_all_postponed_data(temp); /* free buffers */
-
	/* re-use init */
	existing->bits.reuse = TRUE; /* yes, we're re-using here */

lib/urldata.h+0 -17

@@ -830,20 +830,6 @@ struct Curl_handler {
	#define CONNRESULT_NONE 0 /* No extra information. */
	#define CONNRESULT_DEAD (1<<0) /* The connection is dead. */

-	#ifdef USE_RECV_BEFORE_SEND_WORKAROUND
-	struct postponed_data {
-	char buffer; / Temporal store for received data during
-	sending, must be freed */
-	size_t allocated_size; /* Size of temporal store */
-	size_t recv_size; /* Size of received data during sending */
-	size_t recv_processed; /* Size of processed part of postponed data */
-	#ifdef DEBUGBUILD
-	curl_socket_t bindsock;/* Structure must be bound to specific socket,
-	used only for DEBUGASSERT */
-	#endif /* DEBUGBUILD */
-	};
-	#endif /* USE_RECV_BEFORE_SEND_WORKAROUND */
-
	struct proxy_info {
	struct hostname host;
	int port;
@@ -926,9 +912,6 @@ struct connectdata {
	Curl_send *send[2];
	struct Curl_cfilter cfilter[2]; / connection filters */

-	#ifdef USE_RECV_BEFORE_SEND_WORKAROUND
-	struct postponed_data postponed[2]; /* two buffers for two sockets */
-	#endif /* USE_RECV_BEFORE_SEND_WORKAROUND */
	struct ssl_primary_config ssl_config;
	#ifndef CURL_DISABLE_PROXY
	struct ssl_primary_config proxy_ssl_config;

lib/vtls/schannel.h+2 -2

@@ -179,8 +179,8 @@ struct ssl_backend_data {
	size_t encdata_offset, decdata_offset;
	unsigned char encdata_buffer, decdata_buffer;
	/* encdata_is_incomplete: if encdata contains only a partial record that
-	can't be decrypted without another Curl_read_plain (that is, status is
-	SEC_E_INCOMPLETE_MESSAGE) then set this true. after Curl_read_plain writes
+	can't be decrypted without another recv() (that is, status is
+	SEC_E_INCOMPLETE_MESSAGE) then set this true. after an recv() adds
	more bytes into encdata then set this back to false. */
	bool encdata_is_incomplete;
	unsigned long req_flags, ret_flags;