00887aee8c
Viktor Szakats
2025-07-30
Subject
tests: merge clients into libtests, drop duplicate code
Binary
Architecture & Compiler Flags
—
Build Log
$ git checkout -f 00887aee8ca0efe0b40fa41b2a36e2d853d49b57
Previous HEAD position was daa5b044b8 cmake: defer building `unitprotos.h` till a test target needs it
HEAD is now at 00887aee8c tests: merge clients into libtests, drop duplicate code
$ git clean -fdx
Removing Makefile
Removing Makefile.in
Removing aclocal.m4
Removing autom4te.cache/
Removing buildinfo.txt
Removing compile
Removing config.guess
Removing config.log
Removing config.status
Removing config.sub
Removing configure
Removing curl-config
Removing depcomp
Removing docs/Makefile
Removing docs/Makefile.in
Removing docs/cmdline-opts/Makefile
Removing docs/cmdline-opts/Makefile.in
Removing docs/examples/.deps/
Removing docs/examples/Makefile
Removing docs/examples/Makefile.in
Removing docs/libcurl/Makefile
Removing docs/libcurl/Makefile.in
Removing docs/libcurl/opts/Makefile
Removing docs/libcurl/opts/Makefile.in
Removing include/Makefile
Removing include/Makefile.in
Removing include/curl/Makefile
Removing include/curl/Makefile.in
Removing install-sh
Removing lib/.deps/
Removing lib/.libs/
Removing lib/Makefile
Removing lib/Makefile.in
Removing lib/curl_config.h
Removing lib/curl_config.h.in
Removing lib/curlx/.deps/
Removing lib/curlx/.dirstamp
Removing lib/curlx/libcurl_la-base64.lo
Removing lib/curlx/libcurl_la-base64.o
Removing lib/curlx/libcurl_la-dynbuf.lo
Removing lib/curlx/libcurl_la-dynbuf.o
Removing lib/curlx/libcurl_la-inet_ntop.lo
Removing lib/curlx/libcurl_la-inet_ntop.o
Removing lib/curlx/libcurl_la-inet_pton.lo
Removing lib/curlx/libcurl_la-inet_pton.o
Removing lib/curlx/libcurl_la-multibyte.lo
Removing lib/curlx/libcurl_la-multibyte.o
Removing lib/curlx/libcurl_la-nonblock.lo
Removing lib/curlx/libcurl_la-nonblock.o
Removing lib/curlx/libcurl_la-strparse.lo
Removing lib/curlx/libcurl_la-strparse.o
Removing lib/curlx/libcurl_la-timediff.lo
Removing lib/curlx/libcurl_la-timediff.o
Removing lib/curlx/libcurl_la-timeval.lo
Removing lib/curlx/libcurl_la-timeval.o
Removing lib/curlx/libcurl_la-version_win32.lo
Removing lib/curlx/libcurl_la-version_win32.o
Removing lib/curlx/libcurl_la-wait.lo
Removing lib/curlx/libcurl_la-wait.o
Removing lib/curlx/libcurl_la-warnless.lo
Removing lib/curlx/libcurl_la-warnless.o
Removing lib/curlx/libcurl_la-winapi.lo
Removing lib/curlx/libcurl_la-winapi.o
Removing lib/curlx/libcurlu_la-base64.lo
Removing lib/curlx/libcurlu_la-base64.o
Removing lib/curlx/libcurlu_la-dynbuf.lo
Removing lib/curlx/libcurlu_la-dynbuf.o
Removing lib/curlx/libcurlu_la-inet_ntop.lo
Removing lib/curlx/libcurlu_la-inet_ntop.o
Removing lib/curlx/libcurlu_la-inet_pton.lo
Removing lib/curlx/libcurlu_la-inet_pton.o
Removing lib/curlx/libcurlu_la-multibyte.lo
Removing lib/curlx/libcurlu_la-multibyte.o
Removing lib/curlx/libcurlu_la-nonblock.lo
Removing lib/curlx/libcurlu_la-nonblock.o
Removing lib/curlx/libcurlu_la-strparse.lo
Removing lib/curlx/libcurlu_la-strparse.o
Removing lib/curlx/libcurlu_la-timediff.lo
Removing lib/curlx/libcurlu_la-timediff.o
Removing lib/curlx/libcurlu_la-timeval.lo
Removing lib/curlx/libcurlu_la-timeval.o
Removing lib/curlx/libcurlu_la-version_win32.lo
Removing lib/curlx/libcurlu_la-version_win32.o
Removing lib/curlx/libcurlu_la-wait.lo
Removing lib/curlx/libcurlu_la-wait.o
Removing lib/curlx/libcurlu_la-warnless.lo
Removing lib/curlx/libcurlu_la-warnless.o
Removing lib/curlx/libcurlu_la-winapi.lo
Removing lib/curlx/libcurlu_la-winapi.o
Removing lib/libcurl.la
Removing lib/libcurl.vers
Removing lib/libcurl_la-altsvc.lo
Removing lib/libcurl_la-altsvc.o
Removing lib/libcurl_la-amigaos.lo
Removing lib/libcurl_la-amigaos.o
Removing lib/libcurl_la-asyn-ares.lo
Removing lib/libcurl_la-asyn-ares.o
Removing lib/libcurl_la-asyn-base.lo
Removing lib/libcurl_la-asyn-base.o
Removing lib/libcurl_la-asyn-thrdd.lo
Removing lib/libcurl_la-asyn-thrdd.o
Removing lib/libcurl_la-bufq.lo
Removing lib/libcurl_la-bufq.o
Removing lib/libcurl_la-bufref.lo
Removing lib/libcurl_la-bufref.o
Removing lib/libcurl_la-cf-h1-proxy.lo
Removing lib/libcurl_la-cf-h1-proxy.o
Removing lib/libcurl_la-cf-h2-proxy.lo
Removing lib/libcurl_la-cf-h2-proxy.o
Removing lib/libcurl_la-cf-haproxy.lo
Removing lib/libcurl_la-cf-haproxy.o
Removing lib/libcurl_la-cf-https-connect.lo
Removing lib/libcurl_la-cf-https-connect.o
Removing lib/libcurl_la-cf-socket.lo
Removing lib/libcurl_la-cf-socket.o
Removing lib/libcurl_la-cfilters.lo
Removing lib/libcurl_la-cfilters.o
Removing lib/libcurl_la-conncache.lo
Removing lib/libcurl_la-conncache.o
Removing lib/libcurl_la-connect.lo
Removing lib/libcurl_la-connect.o
Removing lib/libcurl_la-content_encoding.lo
Removing lib/libcurl_la-content_encoding.o
Removing lib/libcurl_la-cookie.lo
Removing lib/libcurl_la-cookie.o
Removing lib/libcurl_la-cshutdn.lo
Removing lib/libcurl_la-cshutdn.o
Removing lib/libcurl_la-curl_addrinfo.lo
Removing lib/libcurl_la-curl_addrinfo.o
Removing lib/libcurl_la-curl_des.lo
Removing lib/libcurl_la-curl_des.o
Removing lib/libcurl_la-curl_endian.lo
Removing lib/libcurl_la-curl_endian.o
Removing lib/libcurl_la-curl_fnmatch.lo
Removing lib/libcurl_la-curl_fnmatch.o
Removing lib/libcurl_la-curl_get_line.lo
Removing lib/libcurl_la-curl_get_line.o
Removing lib/libcurl_la-curl_gethostname.lo
Removing lib/libcurl_la-curl_gethostname.o
Removing lib/libcurl_la-curl_gssapi.lo
Removing lib/libcurl_la-curl_gssapi.o
Removing lib/libcurl_la-curl_memrchr.lo
Removing lib/libcurl_la-curl_memrchr.o
Removing lib/libcurl_la-curl_ntlm_core.lo
Removing lib/libcurl_la-curl_ntlm_core.o
Removing lib/libcurl_la-curl_range.lo
Removing lib/libcurl_la-curl_range.o
Removing lib/libcurl_la-curl_rtmp.lo
Removing lib/libcurl_la-curl_rtmp.o
Removing lib/libcurl_la-curl_sasl.lo
Removing lib/libcurl_la-curl_sasl.o
Removing lib/libcurl_la-curl_sha512_256.lo
Removing lib/libcurl_la-curl_sha512_256.o
Removing lib/libcurl_la-curl_sspi.lo
Removing lib/libcurl_la-curl_sspi.o
Removing lib/libcurl_la-curl_threads.lo
Removing lib/libcurl_la-curl_threads.o
Removing lib/libcurl_la-curl_trc.lo
Removing lib/libcurl_la-curl_trc.o
Removing lib/libcurl_la-cw-out.lo
Removing lib/libcurl_la-cw-out.o
Removing lib/libcurl_la-cw-pause.lo
Removing lib/libcurl_la-cw-pause.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-dynhds.lo
Removing lib/libcurl_la-dynhds.o
Removing lib/libcurl_la-easy.lo
Removing lib/libcurl_la-easy.o
Removing lib/libcurl_la-easygetopt.lo
Removing lib/libcurl_la-easygetopt.o
Removing lib/libcurl_la-easyoptions.lo
Removing lib/libcurl_la-easyoptions.o
Removing lib/libcurl_la-escape.lo
Removing lib/libcurl_la-escape.o
Removing lib/libcurl_la-fake_addrinfo.lo
Removing lib/libcurl_la-fake_addrinfo.o
Removing lib/libcurl_la-file.lo
Removing lib/libcurl_la-file.o
Removing lib/libcurl_la-fileinfo.lo
Removing lib/libcurl_la-fileinfo.o
Removing lib/libcurl_la-fopen.lo
Removing lib/libcurl_la-fopen.o
Removing lib/libcurl_la-formdata.lo
Removing lib/libcurl_la-formdata.o
Removing lib/libcurl_la-ftp.lo
Removing lib/libcurl_la-ftp.o
Removing lib/libcurl_la-ftplistparser.lo
Removing lib/libcurl_la-ftplistparser.o
Removing lib/libcurl_la-getenv.lo
Removing lib/libcurl_la-getenv.o
Removing lib/libcurl_la-getinfo.lo
Removing lib/libcurl_la-getinfo.o
Removing lib/libcurl_la-gopher.lo
Removing lib/libcurl_la-gopher.o
Removing lib/libcurl_la-hash.lo
Removing lib/libcurl_la-hash.o
Removing lib/libcurl_la-headers.lo
Removing lib/libcurl_la-headers.o
Removing lib/libcurl_la-hmac.lo
Removing lib/libcurl_la-hmac.o
Removing lib/libcurl_la-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-hsts.lo
Removing lib/libcurl_la-hsts.o
Removing lib/libcurl_la-http.lo
Removing lib/libcurl_la-http.o
Removing lib/libcurl_la-http1.lo
Removing lib/libcurl_la-http1.o
Removing lib/libcurl_la-http2.lo
Removing lib/libcurl_la-http2.o
Removing lib/libcurl_la-http_aws_sigv4.lo
Removing lib/libcurl_la-http_aws_sigv4.o
Removing lib/libcurl_la-http_chunks.lo
Removing lib/libcurl_la-http_chunks.o
Removing lib/libcurl_la-http_digest.lo
Removing lib/libcurl_la-http_digest.o
Removing lib/libcurl_la-http_negotiate.lo
Removing lib/libcurl_la-http_negotiate.o
Removing lib/libcurl_la-http_ntlm.lo
Removing lib/libcurl_la-http_ntlm.o
Removing lib/libcurl_la-http_proxy.lo
Removing lib/libcurl_la-http_proxy.o
Removing lib/libcurl_la-httpsrr.lo
Removing lib/libcurl_la-httpsrr.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-krb5.lo
Removing lib/libcurl_la-krb5.o
Removing lib/libcurl_la-ldap.lo
Removing lib/libcurl_la-ldap.o
Removing lib/libcurl_la-llist.lo
Removing lib/libcurl_la-llist.o
Removing lib/libcurl_la-macos.lo
Removing lib/libcurl_la-macos.o
Removing lib/libcurl_la-md4.lo
Removing lib/libcurl_la-md4.o
Removing lib/libcurl_la-md5.lo
Removing lib/libcurl_la-md5.o
Removing lib/libcurl_la-memdebug.lo
Removing lib/libcurl_la-memdebug.o
Removing lib/libcurl_la-mime.lo
Removing lib/libcurl_la-mime.o
Removing lib/libcurl_la-mprintf.lo
Removing lib/libcurl_la-mprintf.o
Removing lib/libcurl_la-mqtt.lo
Removing lib/libcurl_la-mqtt.o
Removing lib/libcurl_la-multi.lo
Removing lib/libcurl_la-multi.o
Removing lib/libcurl_la-multi_ev.lo
Removing lib/libcurl_la-multi_ev.o
Removing lib/libcurl_la-netrc.lo
Removing lib/libcurl_la-netrc.o
Removing lib/libcurl_la-noproxy.lo
Removing lib/libcurl_la-noproxy.o
Removing lib/libcurl_la-openldap.lo
Removing lib/libcurl_la-openldap.o
Removing lib/libcurl_la-parsedate.lo
Removing lib/libcurl_la-parsedate.o
Removing lib/libcurl_la-pingpong.lo
Removing lib/libcurl_la-pingpong.o
Removing lib/libcurl_la-pop3.lo
Removing lib/libcurl_la-pop3.o
Removing lib/libcurl_la-progress.lo
Removing lib/libcurl_la-progress.o
Removing lib/libcurl_la-psl.lo
Removing lib/libcurl_la-psl.o
Removing lib/libcurl_la-rand.lo
Removing lib/libcurl_la-rand.o
Removing lib/libcurl_la-rename.lo
Removing lib/libcurl_la-rename.o
Removing lib/libcurl_la-request.lo
Removing lib/libcurl_la-request.o
Removing lib/libcurl_la-rtsp.lo
Removing lib/libcurl_la-rtsp.o
Removing lib/libcurl_la-select.lo
Removing lib/libcurl_la-select.o
Removing lib/libcurl_la-sendf.lo
Removing lib/libcurl_la-sendf.o
Removing lib/libcurl_la-setopt.lo
Removing lib/libcurl_la-setopt.o
Removing lib/libcurl_la-sha256.lo
Removing lib/libcurl_la-sha256.o
Removing lib/libcurl_la-share.lo
Removing lib/libcurl_la-share.o
Removing lib/libcurl_la-slist.lo
Removing lib/libcurl_la-slist.o
Removing lib/libcurl_la-smb.lo
Removing lib/libcurl_la-smb.o
Removing lib/libcurl_la-smtp.lo
Removing lib/libcurl_la-smtp.o
Removing lib/libcurl_la-socketpair.lo
Removing lib/libcurl_la-socketpair.o
Removing lib/libcurl_la-socks.lo
Removing lib/libcurl_la-socks.o
Removing lib/libcurl_la-socks_gssapi.lo
Removing lib/libcurl_la-socks_gssapi.o
Removing lib/libcurl_la-socks_sspi.lo
Removing lib/libcurl_la-socks_sspi.o
Removing lib/libcurl_la-speedcheck.lo
Removing lib/libcurl_la-speedcheck.o
Removing lib/libcurl_la-splay.lo
Removing lib/libcurl_la-splay.o
Removing lib/libcurl_la-strcase.lo
Removing lib/libcurl_la-strcase.o
Removing lib/libcurl_la-strdup.lo
Removing lib/libcurl_la-strdup.o
Removing lib/libcurl_la-strequal.lo
Removing lib/libcurl_la-strequal.o
Removing lib/libcurl_la-strerror.lo
Removing lib/libcurl_la-strerror.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-transfer.lo
Removing lib/libcurl_la-transfer.o
Removing lib/libcurl_la-uint-bset.lo
Removing lib/libcurl_la-uint-bset.o
Removing lib/libcurl_la-uint-hash.lo
Removing lib/libcurl_la-uint-hash.o
Removing lib/libcurl_la-uint-spbset.lo
Removing lib/libcurl_la-uint-spbset.o
Removing lib/libcurl_la-uint-table.lo
Removing lib/libcurl_la-uint-table.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-ws.lo
Removing lib/libcurl_la-ws.o
Removing lib/libcurlu.la
Removing lib/libcurlu_la-altsvc.lo
Removing lib/libcurlu_la-altsvc.o
Removing lib/libcurlu_la-amigaos.lo
Removing lib/libcurlu_la-amigaos.o
Removing lib/libcurlu_la-asyn-ares.lo
Removing lib/libcurlu_la-asyn-ares.o
Removing lib/libcurlu_la-asyn-base.lo
Removing lib/libcurlu_la-asyn-base.o
Removing lib/libcurlu_la-asyn-thrdd.lo
Removing lib/libcurlu_la-asyn-thrdd.o
Removing lib/libcurlu_la-bufq.lo
Removing lib/libcurlu_la-bufq.o
Removing lib/libcurlu_la-bufref.lo
Removing lib/libcurlu_la-bufref.o
Removing lib/libcurlu_la-cf-h1-proxy.lo
Removing lib/libcurlu_la-cf-h1-proxy.o
Removing lib/libcurlu_la-cf-h2-proxy.lo
Removing lib/libcurlu_la-cf-h2-proxy.o
Removing lib/libcurlu_la-cf-haproxy.lo
Removing lib/libcurlu_la-cf-haproxy.o
Removing lib/libcurlu_la-cf-https-connect.lo
Removing lib/libcurlu_la-cf-https-connect.o
Removing lib/libcurlu_la-cf-socket.lo
Removing lib/libcurlu_la-cf-socket.o
Removing lib/libcurlu_la-cfilters.lo
Removing lib/libcurlu_la-cfilters.o
Removing lib/libcurlu_la-conncache.lo
Removing lib/libcurlu_la-conncache.o
Removing lib/libcurlu_la-connect.lo
Removing lib/libcurlu_la-connect.o
Removing lib/libcurlu_la-content_encoding.lo
Removing lib/libcurlu_la-content_encoding.o
Removing lib/libcurlu_la-cookie.lo
Removing lib/libcurlu_la-cookie.o
Removing lib/libcurlu_la-cshutdn.lo
Removing lib/libcurlu_la-cshutdn.o
Removing lib/libcurlu_la-curl_addrinfo.lo
Removing lib/libcurlu_la-curl_addrinfo.o
Removing lib/libcurlu_la-curl_des.lo
Removing lib/libcurlu_la-curl_des.o
Removing lib/libcurlu_la-curl_endian.lo
Removing lib/libcurlu_la-curl_endian.o
Removing lib/libcurlu_la-curl_fnmatch.lo
Removing lib/libcurlu_la-curl_fnmatch.o
Removing lib/libcurlu_la-curl_get_line.lo
Removing lib/libcurlu_la-curl_get_line.o
Removing lib/libcurlu_la-curl_gethostname.lo
Removing lib/libcurlu_la-curl_gethostname.o
Removing lib/libcurlu_la-curl_gssapi.lo
Removing lib/libcurlu_la-curl_gssapi.o
Removing lib/libcurlu_la-curl_memrchr.lo
Removing lib/libcurlu_la-curl_memrchr.o
Removing lib/libcurlu_la-curl_ntlm_core.lo
Removing lib/libcurlu_la-curl_ntlm_core.o
Removing lib/libcurlu_la-curl_range.lo
Removing lib/libcurlu_la-curl_range.o
Removing lib/libcurlu_la-curl_rtmp.lo
Removing lib/libcurlu_la-curl_rtmp.o
Removing lib/libcurlu_la-curl_sasl.lo
Removing lib/libcurlu_la-curl_sasl.o
Removing lib/libcurlu_la-curl_sha512_256.lo
Removing lib/libcurlu_la-curl_sha512_256.o
Removing lib/libcurlu_la-curl_sspi.lo
Removing lib/libcurlu_la-curl_sspi.o
Removing lib/libcurlu_la-curl_threads.lo
Removing lib/libcurlu_la-curl_threads.o
Removing lib/libcurlu_la-curl_trc.lo
Removing lib/libcurlu_la-curl_trc.o
Removing lib/libcurlu_la-cw-out.lo
Removing lib/libcurlu_la-cw-out.o
Removing lib/libcurlu_la-cw-pause.lo
Removing lib/libcurlu_la-cw-pause.o
Removing lib/libcurlu_la-dict.lo
Removing lib/libcurlu_la-dict.o
Removing lib/libcurlu_la-doh.lo
Removing lib/libcurlu_la-doh.o
Removing lib/libcurlu_la-dynhds.lo
Removing lib/libcurlu_la-dynhds.o
Removing lib/libcurlu_la-easy.lo
Removing lib/libcurlu_la-easy.o
Removing lib/libcurlu_la-easygetopt.lo
Removing lib/libcurlu_la-easygetopt.o
Removing lib/libcurlu_la-easyoptions.lo
Removing lib/libcurlu_la-easyoptions.o
Removing lib/libcurlu_la-escape.lo
Removing lib/libcurlu_la-escape.o
Removing lib/libcurlu_la-fake_addrinfo.lo
Removing lib/libcurlu_la-fake_addrinfo.o
Removing lib/libcurlu_la-file.lo
Removing lib/libcurlu_la-file.o
Removing lib/libcurlu_la-fileinfo.lo
Removing lib/libcurlu_la-fileinfo.o
Removing lib/libcurlu_la-fopen.lo
Removing lib/libcurlu_la-fopen.o
Removing lib/libcurlu_la-formdata.lo
Removing lib/libcurlu_la-formdata.o
Removing lib/libcurlu_la-ftp.lo
Removing lib/libcurlu_la-ftp.o
Removing lib/libcurlu_la-ftplistparser.lo
Removing lib/libcurlu_la-ftplistparser.o
Removing lib/libcurlu_la-getenv.lo
Removing lib/libcurlu_la-getenv.o
Removing lib/libcurlu_la-getinfo.lo
Removing lib/libcurlu_la-getinfo.o
Removing lib/libcurlu_la-gopher.lo
Removing lib/libcurlu_la-gopher.o
Removing lib/libcurlu_la-hash.lo
Removing lib/libcurlu_la-hash.o
Removing lib/libcurlu_la-headers.lo
Removing lib/libcurlu_la-headers.o
Removing lib/libcurlu_la-hmac.lo
Removing lib/libcurlu_la-hmac.o
Removing lib/libcurlu_la-hostip.lo
Removing lib/libcurlu_la-hostip.o
Removing lib/libcurlu_la-hostip4.lo
Removing lib/libcurlu_la-hostip4.o
Removing lib/libcurlu_la-hostip6.lo
Removing lib/libcurlu_la-hostip6.o
Removing lib/libcurlu_la-hsts.lo
Removing lib/libcurlu_la-hsts.o
Removing lib/libcurlu_la-http.lo
Removing lib/libcurlu_la-http.o
Removing lib/libcurlu_la-http1.lo
Removing lib/libcurlu_la-http1.o
Removing lib/libcurlu_la-http2.lo
Removing lib/libcurlu_la-http2.o
Removing lib/libcurlu_la-http_aws_sigv4.lo
Removing lib/libcurlu_la-http_aws_sigv4.o
Removing lib/libcurlu_la-http_chunks.lo
Removing lib/libcurlu_la-http_chunks.o
Removing lib/libcurlu_la-http_digest.lo
Removing lib/libcurlu_la-http_digest.o
Removing lib/libcurlu_la-http_negotiate.lo
Removing lib/libcurlu_la-http_negotiate.o
Removing lib/libcurlu_la-http_ntlm.lo
Removing lib/libcurlu_la-http_ntlm.o
Removing lib/libcurlu_la-http_proxy.lo
Removing lib/libcurlu_la-http_proxy.o
Removing lib/libcurlu_la-httpsrr.lo
Removing lib/libcurlu_la-httpsrr.o
Removing lib/libcurlu_la-idn.lo
Removing lib/libcurlu_la-idn.o
Removing lib/libcurlu_la-if2ip.lo
Removing lib/libcurlu_la-if2ip.o
Removing lib/libcurlu_la-imap.lo
Removing lib/libcurlu_la-imap.o
Removing lib/libcurlu_la-krb5.lo
Removing lib/libcurlu_la-krb5.o
Removing lib/libcurlu_la-ldap.lo
Removing lib/libcurlu_la-ldap.o
Removing lib/libcurlu_la-llist.lo
Removing lib/libcurlu_la-llist.o
Removing lib/libcurlu_la-macos.lo
Removing lib/libcurlu_la-macos.o
Removing lib/libcurlu_la-md4.lo
Removing lib/libcurlu_la-md4.o
Removing lib/libcurlu_la-md5.lo
Removing lib/libcurlu_la-md5.o
Removing lib/libcurlu_la-memdebug.lo
Removing lib/libcurlu_la-memdebug.o
Removing lib/libcurlu_la-mime.lo
Removing lib/libcurlu_la-mime.o
Removing lib/libcurlu_la-mprintf.lo
Removing lib/libcurlu_la-mprintf.o
Removing lib/libcurlu_la-mqtt.lo
Removing lib/libcurlu_la-mqtt.o
Removing lib/libcurlu_la-multi.lo
Removing lib/libcurlu_la-multi.o
Removing lib/libcurlu_la-multi_ev.lo
Removing lib/libcurlu_la-multi_ev.o
Removing lib/libcurlu_la-netrc.lo
Removing lib/libcurlu_la-netrc.o
Removing lib/libcurlu_la-noproxy.lo
Removing lib/libcurlu_la-noproxy.o
Removing lib/libcurlu_la-openldap.lo
Removing lib/libcurlu_la-openldap.o
Removing lib/libcurlu_la-parsedate.lo
Removing lib/libcurlu_la-parsedate.o
Removing lib/libcurlu_la-pingpong.lo
Removing lib/libcurlu_la-pingpong.o
Removing lib/libcurlu_la-pop3.lo
Removing lib/libcurlu_la-pop3.o
Removing lib/libcurlu_la-progress.lo
Removing lib/libcurlu_la-progress.o
Removing lib/libcurlu_la-psl.lo
Removing lib/libcurlu_la-psl.o
Removing lib/libcurlu_la-rand.lo
Removing lib/libcurlu_la-rand.o
Removing lib/libcurlu_la-rename.lo
Removing lib/libcurlu_la-rename.o
Removing lib/libcurlu_la-request.lo
Removing lib/libcurlu_la-request.o
Removing lib/libcurlu_la-rtsp.lo
Removing lib/libcurlu_la-rtsp.o
Removing lib/libcurlu_la-select.lo
Removing lib/libcurlu_la-select.o
Removing lib/libcurlu_la-sendf.lo
Removing lib/libcurlu_la-sendf.o
Removing lib/libcurlu_la-setopt.lo
Removing lib/libcurlu_la-setopt.o
Removing lib/libcurlu_la-sha256.lo
Removing lib/libcurlu_la-sha256.o
Removing lib/libcurlu_la-share.lo
Removing lib/libcurlu_la-share.o
Removing lib/libcurlu_la-slist.lo
Removing lib/libcurlu_la-slist.o
Removing lib/libcurlu_la-smb.lo
Removing lib/libcurlu_la-smb.o
Removing lib/libcurlu_la-smtp.lo
Removing lib/libcurlu_la-smtp.o
Removing lib/libcurlu_la-socketpair.lo
Removing lib/libcurlu_la-socketpair.o
Removing lib/libcurlu_la-socks.lo
Removing lib/libcurlu_la-socks.o
Removing lib/libcurlu_la-socks_gssapi.lo
Removing lib/libcurlu_la-socks_gssapi.o
Removing lib/libcurlu_la-socks_sspi.lo
Removing lib/libcurlu_la-socks_sspi.o
Removing lib/libcurlu_la-speedcheck.lo
Removing lib/libcurlu_la-speedcheck.o
Removing lib/libcurlu_la-splay.lo
Removing lib/libcurlu_la-splay.o
Removing lib/libcurlu_la-strcase.lo
Removing lib/libcurlu_la-strcase.o
Removing lib/libcurlu_la-strdup.lo
Removing lib/libcurlu_la-strdup.o
Removing lib/libcurlu_la-strequal.lo
Removing lib/libcurlu_la-strequal.o
Removing lib/libcurlu_la-strerror.lo
Removing lib/libcurlu_la-strerror.o
Removing lib/libcurlu_la-system_win32.lo
Removing lib/libcurlu_la-system_win32.o
Removing lib/libcurlu_la-telnet.lo
Removing lib/libcurlu_la-telnet.o
Removing lib/libcurlu_la-tftp.lo
Removing lib/libcurlu_la-tftp.o
Removing lib/libcurlu_la-transfer.lo
Removing lib/libcurlu_la-transfer.o
Removing lib/libcurlu_la-uint-bset.lo
Removing lib/libcurlu_la-uint-bset.o
Removing lib/libcurlu_la-uint-hash.lo
Removing lib/libcurlu_la-uint-hash.o
Removing lib/libcurlu_la-uint-spbset.lo
Removing lib/libcurlu_la-uint-spbset.o
Removing lib/libcurlu_la-uint-table.lo
Removing lib/libcurlu_la-uint-table.o
Removing lib/libcurlu_la-url.lo
Removing lib/libcurlu_la-url.o
Removing lib/libcurlu_la-urlapi.lo
Removing lib/libcurlu_la-urlapi.o
Removing lib/libcurlu_la-version.lo
Removing lib/libcurlu_la-version.o
Removing lib/libcurlu_la-ws.lo
Removing lib/libcurlu_la-ws.o
Removing lib/stamp-h1
Removing lib/unitprotos.h
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/vauth/libcurlu_la-cleartext.lo
Removing lib/vauth/libcurlu_la-cleartext.o
Removing lib/vauth/libcurlu_la-cram.lo
Removing lib/vauth/libcurlu_la-cram.o
Removing lib/vauth/libcurlu_la-digest.lo
Removing lib/vauth/libcurlu_la-digest.o
Removing lib/vauth/libcurlu_la-digest_sspi.lo
Removing lib/vauth/libcurlu_la-digest_sspi.o
Removing lib/vauth/libcurlu_la-gsasl.lo
Removing lib/vauth/libcurlu_la-gsasl.o
Removing lib/vauth/libcurlu_la-krb5_gssapi.lo
Removing lib/vauth/libcurlu_la-krb5_gssapi.o
Removing lib/vauth/libcurlu_la-krb5_sspi.lo
Removing lib/vauth/libcurlu_la-krb5_sspi.o
Removing lib/vauth/libcurlu_la-ntlm.lo
Removing lib/vauth/libcurlu_la-ntlm.o
Removing lib/vauth/libcurlu_la-ntlm_sspi.lo
Removing lib/vauth/libcurlu_la-ntlm_sspi.o
Removing lib/vauth/libcurlu_la-oauth2.lo
Removing lib/vauth/libcurlu_la-oauth2.o
Removing lib/vauth/libcurlu_la-spnego_gssapi.lo
Removing lib/vauth/libcurlu_la-spnego_gssapi.o
Removing lib/vauth/libcurlu_la-spnego_sspi.lo
Removing lib/vauth/libcurlu_la-spnego_sspi.o
Removing lib/vauth/libcurlu_la-vauth.lo
Removing lib/vauth/libcurlu_la-vauth.o
Removing lib/vquic/.deps/
Removing lib/vquic/.dirstamp
Removing lib/vquic/libcurl_la-curl_ngtcp2.lo
Removing lib/vquic/libcurl_la-curl_ngtcp2.o
Removing lib/vquic/libcurl_la-curl_osslq.lo
Removing lib/vquic/libcurl_la-curl_osslq.o
Removing lib/vquic/libcurl_la-curl_quiche.lo
Removing lib/vquic/libcurl_la-curl_quiche.o
Removing lib/vquic/libcurl_la-vquic-tls.lo
Removing lib/vquic/libcurl_la-vquic-tls.o
Removing lib/vquic/libcurl_la-vquic.lo
Removing lib/vquic/libcurl_la-vquic.o
Removing lib/vquic/libcurlu_la-curl_ngtcp2.lo
Removing lib/vquic/libcurlu_la-curl_ngtcp2.o
Removing lib/vquic/libcurlu_la-curl_osslq.lo
Removing lib/vquic/libcurlu_la-curl_osslq.o
Removing lib/vquic/libcurlu_la-curl_quiche.lo
Removing lib/vquic/libcurlu_la-curl_quiche.o
Removing lib/vquic/libcurlu_la-vquic-tls.lo
Removing lib/vquic/libcurlu_la-vquic-tls.o
Removing lib/vquic/libcurlu_la-vquic.lo
Removing lib/vquic/libcurlu_la-vquic.o
Removing lib/vssh/.deps/
Removing lib/vssh/.dirstamp
Removing lib/vssh/libcurl_la-curl_path.lo
Removing lib/vssh/libcurl_la-curl_path.o
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/vssh/libcurlu_la-curl_path.lo
Removing lib/vssh/libcurlu_la-curl_path.o
Removing lib/vssh/libcurlu_la-libssh.lo
Removing lib/vssh/libcurlu_la-libssh.o
Removing lib/vssh/libcurlu_la-libssh2.lo
Removing lib/vssh/libcurlu_la-libssh2.o
Removing lib/vssh/libcurlu_la-wolfssh.lo
Removing lib/vssh/libcurlu_la-wolfssh.o
Removing lib/vtls/.deps/
Removing lib/vtls/.dirstamp
Removing lib/vtls/libcurl_la-cipher_suite.lo
Removing lib/vtls/libcurl_la-cipher_suite.o
Removing lib/vtls/libcurl_la-gtls.lo
Removing lib/vtls/libcurl_la-gtls.o
Removing lib/vtls/libcurl_la-hostcheck.lo
Removing lib/vtls/libcurl_la-hostcheck.o
Removing lib/vtls/libcurl_la-keylog.lo
Removing lib/vtls/libcurl_la-keylog.o
Removing lib/vtls/libcurl_la-mbedtls.lo
Removing lib/vtls/libcurl_la-mbedtls.o
Removing lib/vtls/libcurl_la-mbedtls_threadlock.lo
Removing lib/vtls/libcurl_la-mbedtls_threadlock.o
Removing lib/vtls/libcurl_la-openssl.lo
Removing lib/vtls/libcurl_la-openssl.o
Removing lib/vtls/libcurl_la-rustls.lo
Removing lib/vtls/libcurl_la-rustls.o
Removing lib/vtls/libcurl_la-schannel.lo
Removing lib/vtls/libcurl_la-schannel.o
Removing lib/vtls/libcurl_la-schannel_verify.lo
Removing lib/vtls/libcurl_la-schannel_verify.o
Removing lib/vtls/libcurl_la-vtls.lo
Removing lib/vtls/libcurl_la-vtls.o
Removing lib/vtls/libcurl_la-vtls_scache.lo
Removing lib/vtls/libcurl_la-vtls_scache.o
Removing lib/vtls/libcurl_la-vtls_spack.lo
Removing lib/vtls/libcurl_la-vtls_spack.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/vtls/libcurlu_la-cipher_suite.lo
Removing lib/vtls/libcurlu_la-cipher_suite.o
Removing lib/vtls/libcurlu_la-gtls.lo
Removing lib/vtls/libcurlu_la-gtls.o
Removing lib/vtls/libcurlu_la-hostcheck.lo
Removing lib/vtls/libcurlu_la-hostcheck.o
Removing lib/vtls/libcurlu_la-keylog.lo
Removing lib/vtls/libcurlu_la-keylog.o
Removing lib/vtls/libcurlu_la-mbedtls.lo
Removing lib/vtls/libcurlu_la-mbedtls.o
Removing lib/vtls/libcurlu_la-mbedtls_threadlock.lo
Removing lib/vtls/libcurlu_la-mbedtls_threadlock.o
Removing lib/vtls/libcurlu_la-openssl.lo
Removing lib/vtls/libcurlu_la-openssl.o
Removing lib/vtls/libcurlu_la-rustls.lo
Removing lib/vtls/libcurlu_la-rustls.o
Removing lib/vtls/libcurlu_la-schannel.lo
Removing lib/vtls/libcurlu_la-schannel.o
Removing lib/vtls/libcurlu_la-schannel_verify.lo
Removing lib/vtls/libcurlu_la-schannel_verify.o
Removing lib/vtls/libcurlu_la-vtls.lo
Removing lib/vtls/libcurlu_la-vtls.o
Removing lib/vtls/libcurlu_la-vtls_scache.lo
Removing lib/vtls/libcurlu_la-vtls_scache.o
Removing lib/vtls/libcurlu_la-vtls_spack.lo
Removing lib/vtls/libcurlu_la-vtls_spack.o
Removing lib/vtls/libcurlu_la-wolfssl.lo
Removing lib/vtls/libcurlu_la-wolfssl.o
Removing lib/vtls/libcurlu_la-x509asn1.lo
Removing lib/vtls/libcurlu_la-x509asn1.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/curl-config2setopts.o
Removing src/curl-slist_wc.o
Removing src/curl-terminal.o
Removing src/curl-tool_bname.o
Removing src/curl-tool_ca_embed.o
Removing src/curl-tool_cb_dbg.o
Removing src/curl-tool_cb_hdr.o
Removing src/curl-tool_cb_prg.o
Removing src/curl-tool_cb_rea.o
Removing src/curl-tool_cb_see.o
Removing src/curl-tool_cb_soc.o
Removing src/curl-tool_cb_wrt.o
Removing src/curl-tool_cfgable.o
Removing src/curl-tool_dirhie.o
Removing src/curl-tool_doswin.o
Removing src/curl-tool_easysrc.o
Removing src/curl-tool_filetime.o
Removing src/curl-tool_findfile.o
Removing src/curl-tool_formparse.o
Removing src/curl-tool_getparam.o
Removing src/curl-tool_getpass.o
Removing src/curl-tool_help.o
Removing src/curl-tool_helpers.o
Removing src/curl-tool_hugehelp.o
Removing src/curl-tool_ipfs.o
Removing src/curl-tool_libinfo.o
Removing src/curl-tool_listhelp.o
Removing src/curl-tool_main.o
Removing src/curl-tool_msgs.o
Removing src/curl-tool_operate.o
Removing src/curl-tool_operhlp.o
Removing src/curl-tool_paramhlp.o
Removing src/curl-tool_parsecfg.o
Removing src/curl-tool_progress.o
Removing src/curl-tool_setopt.o
Removing src/curl-tool_ssls.o
Removing src/curl-tool_stderr.o
Removing src/curl-tool_strdup.o
Removing src/curl-tool_urlglob.o
Removing src/curl-tool_util.o
Removing src/curl-tool_vms.o
Removing src/curl-tool_writeout.o
Removing src/curl-tool_writeout_json.o
Removing src/curl-tool_xattr.o
Removing src/curl-var.o
Removing src/curlinfo
Removing src/curlinfo.o
Removing src/libcurltool.la
Removing src/libcurltool_la-config2setopts.lo
Removing src/libcurltool_la-config2setopts.o
Removing src/libcurltool_la-slist_wc.lo
Removing src/libcurltool_la-slist_wc.o
Removing src/libcurltool_la-terminal.lo
Removing src/libcurltool_la-terminal.o
Removing src/libcurltool_la-tool_bname.lo
Removing src/libcurltool_la-tool_bname.o
Removing src/libcurltool_la-tool_cb_dbg.lo
Removing src/libcurltool_la-tool_cb_dbg.o
Removing src/libcurltool_la-tool_cb_hdr.lo
Removing src/libcurltool_la-tool_cb_hdr.o
Removing src/libcurltool_la-tool_cb_prg.lo
Removing src/libcurltool_la-tool_cb_prg.o
Removing src/libcurltool_la-tool_cb_rea.lo
Removing src/libcurltool_la-tool_cb_rea.o
Removing src/libcurltool_la-tool_cb_see.lo
Removing src/libcurltool_la-tool_cb_see.o
Removing src/libcurltool_la-tool_cb_soc.lo
Removing src/libcurltool_la-tool_cb_soc.o
Removing src/libcurltool_la-tool_cb_wrt.lo
Removing src/libcurltool_la-tool_cb_wrt.o
Removing src/libcurltool_la-tool_cfgable.lo
Removing src/libcurltool_la-tool_cfgable.o
Removing src/libcurltool_la-tool_dirhie.lo
Removing src/libcurltool_la-tool_dirhie.o
Removing src/libcurltool_la-tool_doswin.lo
Removing src/libcurltool_la-tool_doswin.o
Removing src/libcurltool_la-tool_easysrc.lo
Removing src/libcurltool_la-tool_easysrc.o
Removing src/libcurltool_la-tool_filetime.lo
Removing src/libcurltool_la-tool_filetime.o
Removing src/libcurltool_la-tool_findfile.lo
Removing src/libcurltool_la-tool_findfile.o
Removing src/libcurltool_la-tool_formparse.lo
Removing src/libcurltool_la-tool_formparse.o
Removing src/libcurltool_la-tool_getparam.lo
Removing src/libcurltool_la-tool_getparam.o
Removing src/libcurltool_la-tool_getpass.lo
Removing src/libcurltool_la-tool_getpass.o
Removing src/libcurltool_la-tool_help.lo
Removing src/libcurltool_la-tool_help.o
Removing src/libcurltool_la-tool_helpers.lo
Removing src/libcurltool_la-tool_helpers.o
Removing src/libcurltool_la-tool_ipfs.lo
Removing src/libcurltool_la-tool_ipfs.o
Removing src/libcurltool_la-tool_libinfo.lo
Removing src/libcurltool_la-tool_libinfo.o
Removing src/libcurltool_la-tool_listhelp.lo
Removing src/libcurltool_la-tool_listhelp.o
Removing src/libcurltool_la-tool_main.lo
Removing src/libcurltool_la-tool_main.o
Removing src/libcurltool_la-tool_msgs.lo
Removing src/libcurltool_la-tool_msgs.o
Removing src/libcurltool_la-tool_operate.lo
Removing src/libcurltool_la-tool_operate.o
Removing src/libcurltool_la-tool_operhlp.lo
Removing src/libcurltool_la-tool_operhlp.o
Removing src/libcurltool_la-tool_paramhlp.lo
Removing src/libcurltool_la-tool_paramhlp.o
Removing src/libcurltool_la-tool_parsecfg.lo
Removing src/libcurltool_la-tool_parsecfg.o
Removing src/libcurltool_la-tool_progress.lo
Removing src/libcurltool_la-tool_progress.o
Removing src/libcurltool_la-tool_setopt.lo
Removing src/libcurltool_la-tool_setopt.o
Removing src/libcurltool_la-tool_ssls.lo
Removing src/libcurltool_la-tool_ssls.o
Removing src/libcurltool_la-tool_stderr.lo
Removing src/libcurltool_la-tool_stderr.o
Removing src/libcurltool_la-tool_strdup.lo
Removing src/libcurltool_la-tool_strdup.o
Removing src/libcurltool_la-tool_urlglob.lo
Removing src/libcurltool_la-tool_urlglob.o
Removing src/libcurltool_la-tool_util.lo
Removing src/libcurltool_la-tool_util.o
Removing src/libcurltool_la-tool_vms.lo
Removing src/libcurltool_la-tool_vms.o
Removing src/libcurltool_la-tool_writeout.lo
Removing src/libcurltool_la-tool_writeout.o
Removing src/libcurltool_la-tool_writeout_json.lo
Removing src/libcurltool_la-tool_writeout_json.o
Removing src/libcurltool_la-tool_xattr.lo
Removing src/libcurltool_la-tool_xattr.o
Removing src/libcurltool_la-var.lo
Removing src/libcurltool_la-var.o
Removing src/tool_ca_embed.c
Removing src/tool_hugehelp.c
Removing tests/Makefile
Removing tests/Makefile.in
Removing tests/certs/Makefile
Removing tests/certs/Makefile.in
Removing tests/config
Removing tests/configurehelp.pm
Removing tests/data/Makefile
Removing tests/data/Makefile.in
Removing tests/http/Makefile
Removing tests/http/Makefile.in
Removing tests/http/config.ini
Removing tests/libtest/.deps/
Removing tests/libtest/Makefile
Removing tests/libtest/Makefile.in
Removing tests/server/.deps/
Removing tests/server/Makefile
Removing tests/server/Makefile.in
Removing tests/tunit/.deps/
Removing tests/tunit/Makefile
Removing tests/tunit/Makefile.in
Removing tests/unit/.deps/
Removing tests/unit/Makefile
Removing tests/unit/Makefile.in
$ autoreconf -fi
libtoolize: putting auxiliary files in '.'.
libtoolize: copying file './ltmain.sh'
libtoolize: putting macros in AC_CONFIG_MACRO_DIRS, 'm4'.
libtoolize: copying file 'm4/libtool.m4'
libtoolize: copying file 'm4/ltoptions.m4'
libtoolize: copying file 'm4/ltsugar.m4'
libtoolize: copying file 'm4/ltversion.m4'
libtoolize: copying file 'm4/lt~obsolete.m4'
libtoolize: Remember to add 'LT_INIT' to configure.ac.
configure.ac:128: installing './compile'
configure.ac:448: installing './config.guess'
configure.ac:448: installing './config.sub'
configure.ac:128: installing './install-sh'
configure.ac:134: installing './missing'
docs/examples/Makefile.am: installing './depcomp'
$ bash -c find . -name config.guess -exec cp /usr/share/misc/config.guess {} \;
$ bash -c find . -name config.sub -exec cp /usr/share/misc/config.sub {} \;
$ chmod +x configure
$ ./configure --disable-shared --without-ssl --disable-docs
checking whether to enable maintainer-specific portions of Makefiles... no
checking whether make supports nested variables... yes
checking whether to enable debug build options... no
checking whether to enable compiler optimizer... (assumed) yes
checking whether to enable strict compiler warnings... no
checking whether to enable compiler warnings as errors... no
checking whether to enable curl debug memory tracking... no
checking whether to enable hiding of library internal symbols... yes
checking whether to enable c-ares for DNS lookups... no
checking whether to disable dependency on -lrt... (assumed no)
checking whether to enable HTTPSRR support... no
checking whether to enable ECH support... no
checking whether to enable SSL session export support... no
checking for path separator... :
checking for sed... /usr/bin/sed
checking for grep... /usr/bin/grep
checking that grep -E works... yes
checking for ar... /usr/bin/ar
checking for a BSD-compatible install... /usr/bin/install -c
checking for gcc... ccache gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether the compiler supports GNU C... yes
checking whether ccache gcc accepts -g... yes
checking for ccache gcc option to enable C11 features... none needed
checking whether ccache gcc understands -c and -o together... yes
checking how to run the C preprocessor... ccache gcc -E
checking for stdio.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for strings.h... yes
checking for sys/stat.h... yes
checking for sys/types.h... yes
checking for unistd.h... yes
checking for stdatomic.h... yes
checking if _Atomic is available... yes
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for code coverage support... no
checking whether build environment is sane... yes
checking for a race-free mkdir -p... /usr/bin/mkdir -p
checking for gawk... gawk
checking whether make sets $(MAKE)... yes
checking whether make supports the include directive... yes (GNU style)
checking dependency style of ccache gcc... gcc3
checking curl version... 8.16.0-DEV
checking for httpd... no
checking for apache2... no
checking for apxs... no
configure: httpd/apache2 not in PATH, http tests disabled
configure: apxs not in PATH, http tests disabled
checking for danted... no
checking for danted... no
checking for nghttpx... no
checking for caddy... no
checking build system type... x86_64-pc-linux-gnu
checking host system type... x86_64-pc-linux-gnu
checking for grep that handles long lines and -e... (cached) /usr/bin/grep
checking for egrep... /usr/bin/grep -E
checking if OS is AIX (to define _ALL_SOURCE)... no
checking if _THREAD_SAFE is already defined... no
checking if _THREAD_SAFE is actually needed... no
checking if _THREAD_SAFE is onwards defined... no
checking if _REENTRANT is already defined... no
checking if _REENTRANT is actually needed... no
checking if _REENTRANT is onwards defined... no
checking for special C compiler options needed for large files... no
checking for _FILE_OFFSET_BITS value needed for large files... no
checking how to print strings... printf
checking for a sed that does not truncate output... (cached) /usr/bin/sed
checking for fgrep... /usr/bin/grep -F
checking for ld used by ccache gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking how to convert x86_64-pc-linux-gnu file names to x86_64-pc-linux-gnu format... func_convert_file_noop
checking how to convert x86_64-pc-linux-gnu file names to toolchain format... func_convert_file_noop
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for dlltool... no
checking how to associate runtime and link libraries... printf %s\n
checking for archiver @FILE support... @
checking for strip... strip
checking for ranlib... ranlib
checking command to parse /usr/bin/nm -B output from ccache gcc object... ok
checking for sysroot... no
checking for a working dd... /usr/bin/dd
checking how to truncate binary pipes... /usr/bin/dd bs=4096 count=1
checking for mt... mt
checking if mt is a manifest tool... no
checking for dlfcn.h... yes
checking for objdir... .libs
checking if ccache gcc supports -fno-rtti -fno-exceptions... no
checking for ccache gcc option to produce PIC... -fPIC -DPIC
checking if ccache gcc PIC flag -fPIC -DPIC works... yes
checking if ccache gcc static flag -static works... yes
checking if ccache gcc supports -c -o file.o... yes
checking if ccache gcc supports -c -o file.o... (cached) yes
checking whether the ccache gcc linker (/usr/bin/ld -m elf_x86_64) supports shared libraries... yes
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... no
checking whether to build static libraries... yes
checking whether to build shared libraries with -version-info... yes
checking whether to build shared libraries with -no-undefined... no
checking whether to build shared libraries with -mimpure-text... no
checking whether to build shared libraries with PIC... yes
checking whether to build static libraries with PIC... yes
checking whether to build shared libraries only... no
checking whether to build static libraries only... yes
checking for windres... no
checking if cpp -P is needed... yes
checking if cpp -P works... yes
checking if compiler is DEC/Compaq/HP C... no
checking if compiler is HP-UX C... no
checking if compiler is IBM C... no
checking if compiler is Intel C... no
checking if compiler is clang... no
checking if compiler is GNU C... yes
checking compiler version... gcc '1100' (raw: '11')
checking if compiler is SunPro C... no
checking if compiler is Tiny C... no
checking whether build target is a native Windows one... no
checking if compiler accepts some basic options... yes
configure: compiler options added: -Werror-implicit-function-declaration
checking if compiler optimizer assumed setting might be used... yes
checking if compiler accepts optimizer enabling options... yes
configure: compiler options added: -O2
checking if compiler accepts strict warning options... yes
configure: compiler options added: -Wno-system-headers
checking if compiler halts on compilation errors... yes
checking if compiler halts on negative sized arrays... yes
checking if compiler halts on function prototype mismatch... yes
checking if compiler supports hiding library internal symbols... yes
checking whether build target supports Win32 crypto API... no
checking whether to build libcurl and curl in "unity" mode... no
checking whether to support http... yes
checking whether to support ftp... yes
checking whether to support file... yes
checking whether to support IPFS... yes
checking whether to support ldap... yes
checking whether to support ldaps... yes
checking whether to support rtsp... yes
checking whether to support proxies... yes
checking whether to support dict... yes
checking whether to support telnet... yes
checking whether to support tftp... yes
checking whether to support pop3... yes
checking whether to support imap... yes
checking whether to support smb... yes
checking whether to support smtp... yes
checking whether to support gopher... yes
checking whether to support mqtt... no
checking whether to provide built-in manual... yes
checking whether to build documentation... no
checking whether to enable generation of C code... yes
checking whether to use libgcc... no
checking if X/Open network library is required... no
checking for gethostbyname... yes
checking whether build target is a native Windows one... (cached) no
checking for proto/bsdsocket.h... no
checking for connect in libraries... yes
checking for sys/types.h... (cached) yes
checking for monotonic clock_gettime... yes
checking for clock_gettime in libraries... no additional lib required
checking if monotonic clock_gettime works... yes
checking for sys/types.h... (cached) yes
checking for raw monotonic clock_gettime... yes
checking for pkg-config... /usr/bin/pkg-config
checking for zlib options with pkg-config... found
checking for zlib.h... yes
configure: found both libz and libz.h header
checking for BrotliDecoderDecompress in -lbrotlidec... no
checking for brotli/decode.h... no
checking for ZSTD_createDStream in -lzstd... no
checking for zstd.h... no
checking 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 Amiga native SSL/TLS (AmiSSL v5)... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libpsl options with pkg-config... found
checking for psl_builtin in -lpsl... yes
checking for libpsl.h... yes
checking for library containing gsasl_init... no
checking for lber.h... no
checking for ldap.h... no
checking for ldap_ssl.h... no
checking for LDAP libraries... cannot find LDAP libraries
checking for RTMP_Init in -lrtmp... no
checking whether versioned symbols are wanted... no
checking whether to build with libidn2... (assumed) yes
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libidn2 options with pkg-config... no
configure: IDN_LIBS: "-lidn2"
configure: IDN_LDFLAGS: ""
configure: IDN_CPPFLAGS: ""
configure: IDN_DIR: ""
checking if idn2_lookup_ul can be linked... no
checking for idn2.h... no
checking for pkg-config... (cached) /usr/bin/pkg-config
checking for libnghttp2 options with pkg-config... no
checking for nghttp2_session_get_stream_local_window_size in -lnghttp2... no
checking for sys/types.h... (cached) yes
checking for sys/select.h... yes
checking for sys/ioctl.h... yes
checking for unistd.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/param.h... yes
checking for termios.h... yes
checking for termio.h... yes
checking for fcntl.h... yes
checking for io.h... no
checking for pwd.h... yes
checking for utime.h... yes
checking for sys/utime.h... no
checking for sys/poll.h... yes
checking for poll.h... yes
checking for sys/resource.h... yes
checking for libgen.h... yes
checking for locale.h... yes
checking for stdbool.h... yes
checking for stdint.h... (cached) yes
checking for sys/filio.h... no
checking for sys/eventfd.h... yes
checking for an ANSI C-conforming const... yes
checking for size_t... yes
checking for sys/types.h... (cached) yes
checking for struct timeval... yes
checking run-time libs availability... fine
checking size of size_t... 8
checking size of long... 8
checking size of int... 4
checking size of time_t... 8
checking size of off_t... 8
checking size of curl_off_t... 8
checking size of curl_socket_t... 4
checking for long long... yes
checking for ssize_t... yes
checking for bool... yes
checking for sa_family_t... yes
checking for suseconds_t... yes
checking if time_t is unsigned... no
checking for struct sockaddr_storage... yes
checking for sys/select.h... (cached) yes
checking for select... yes
checking for sys/types.h... (cached) yes
checking for recv... yes
checking for sys/types.h... (cached) yes
checking for send... yes
checking for sys/types.h... (cached) yes
checking for MSG_NOSIGNAL... yes
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking if alarm can be linked... yes
checking if alarm is prototyped... yes
checking if alarm is compilable... yes
checking if alarm usage allowed... yes
checking if alarm might be used... yes
checking for sys/types.h... (cached) yes
checking for strings.h... (cached) yes
checking for sys/types.h... (cached) yes
checking for libgen.h... (cached) yes
checking if basename can be linked... yes
checking if basename is prototyped... yes
checking if basename is compilable... yes
checking if basename usage allowed... yes
checking if basename might be used... yes
checking if closesocket can be linked... no
checking if closesocket might be used... no
checking for sys/types.h... (cached) yes
checking if CloseSocket can be linked... no
checking if CloseSocket might be used... no
checking for sys/types.h... (cached) yes
checking for unistd.h... (cached) yes
checking for fcntl.h... (cached) yes
checking if fcntl can be linked... yes
checking if fcntl is prototyped... yes
checking if fcntl is compilable... yes
checking if fcntl usage allowed... yes
checking if fcntl might be used... yes
checking if fcntl O_NONBLOCK is compilable... yes
checking if fcntl O_NONBLOCK usage allowed... yes
checking if fcntl O_NONBLOCK might be used... yes
checking whether build target is a native Windows one... (cached) no
checking for sys/types.h... (cached) yes
checking for netdb.h... (cached) yes
checking if freeaddrinfo can be linked... yes
checking if freeaddrinfo is prototyped... yes
checking if freeaddrinfo is compilable... yes
checking if freeaddrinfo usage allowed... yes
checking if freeaddrinfo might be used... yes
checking for sys/types.h... (cached) yes
checking for sys/xattr.h... yes
checking if fsetxattr can be linked... yes
checking if fsetxattr is prototyped... yes
checking if fsetxattr takes 5 args.... yes
checking if fsetxattr is compilable... yes
checking if fsetxattr usage allowed... yes
checking if fsetxattr might be used... yes
checking if ftruncate can be linked... yes
checking if ftruncate is prototyped... yes
checking if ftruncate is compilable... yes
checking if ftruncate usage allowed... yes
checking if ftruncate might be used... yes
checking for sys/types.h... (cached) yes
checking if getaddrinfo can be linked... yes
checking if getaddrinfo is prototyped... yes
checking if getaddrinfo is compilable... yes
checking if getaddrinfo seems to work... yes
checking if getaddrinfo usage allowed... yes
checking if getaddrinfo might be used... yes
checking if getaddrinfo is threadsafe... yes
checking if gethostbyname_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 for sys/types.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 if getpeername can be linked... yes
checking if getpeername is prototyped... yes
checking if getpeername is compilable... yes
checking if getpeername usage allowed... yes
checking if getpeername might be used... yes
checking if getsockname can be linked... yes
checking if getsockname is prototyped... yes
checking if getsockname is compilable... yes
checking if getsockname usage allowed... yes
checking if getsockname might be used... yes
checking for sys/types.h... (cached) yes
checking 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 unistd.h... (cached) yes
checking for sys/ioctl.h... (cached) yes
checking for stropts.h... no
checking if ioctl can be linked... yes
checking if ioctl is prototyped... yes
checking if ioctl is compilable... yes
checking if ioctl usage allowed... yes
checking if ioctl might be used... yes
checking if ioctl FIONBIO is compilable... yes
checking if ioctl FIONBIO usage allowed... yes
checking if ioctl FIONBIO might be used... yes
checking if ioctl SIOCGIFADDR is compilable... yes
checking if ioctl SIOCGIFADDR usage allowed... yes
checking if ioctl SIOCGIFADDR might be used... yes
checking if ioctlsocket can be linked... no
checking if ioctlsocket might be used... no
checking if IoctlSocket can be linked... no
checking if IoctlSocket might be used... no
checking if memrchr can be linked... yes
checking if memrchr is prototyped... yes
checking if memrchr is compilable... yes
checking if memrchr usage allowed... yes
checking if memrchr might be used... yes
checking for sys/types.h... (cached) yes
checking if sigaction can be linked... yes
checking if sigaction is prototyped... yes
checking if sigaction is compilable... yes
checking if sigaction usage allowed... yes
checking if sigaction might be used... yes
checking if siginterrupt can be linked... yes
checking if siginterrupt is prototyped... yes
checking if siginterrupt is compilable... yes
checking if siginterrupt usage allowed... yes
checking if siginterrupt might be used... yes
checking if signal can be linked... yes
checking if signal is prototyped... yes
checking if signal is compilable... yes
checking if signal usage allowed... yes
checking if signal might be used... yes
checking for sys/types.h... (cached) yes
checking if sigsetjmp can be linked... no
checking if sigsetjmp seems a macro... yes
checking if sigsetjmp is compilable... yes
checking if sigsetjmp usage allowed... yes
checking if sigsetjmp might be used... yes
checking if socket can be linked... yes
checking if socket is prototyped... yes
checking if socket is compilable... yes
checking if socket usage allowed... yes
checking if socket might be used... yes
checking if socketpair can be linked... yes
checking if socketpair is prototyped... yes
checking if socketpair is compilable... yes
checking if socketpair usage allowed... yes
checking if socketpair might be used... yes
checking if strdup can be linked... yes
checking if strdup is prototyped... yes
checking if strdup is compilable... yes
checking if strdup usage allowed... yes
checking if strdup might be used... yes
checking if strerror_r can be linked... yes
checking if strerror_r is prototyped... yes
checking if strerror_r is compilable... yes
checking if strerror_r is glibc like... yes
checking if strerror_r seems to work... yes
checking if strerror_r usage allowed... yes
checking if strerror_r might be used... yes
checking for accept4... yes
checking for eventfd... yes
checking for fnmatch... yes
checking for geteuid... yes
checking for getpass_r... no
checking for getppid... yes
checking for getpwuid... yes
checking for getpwuid_r... yes
checking for getrlimit... yes
checking for gettimeofday... yes
checking for mach_absolute_time... no
checking for pipe... yes
checking for pipe2... yes
checking for poll... yes
checking for sendmmsg... yes
checking for sendmsg... yes
checking for setlocale... yes
checking for setrlimit... yes
checking for snprintf... yes
checking for utime... yes
checking for utimes... yes
checking for if_nametoindex... yes
checking for realpath... yes
checking for sched_yield... yes
checking for sys/types.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 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 stricmp can be linked... no
checking if stricmp might be used... no
checking for setmode... no
checking for arc4random... no
checking for fseeko... yes
checking for ccache gcc options needed to detect all undeclared functions... none needed
checking whether fseeko is declared... yes
checking how to set a socket into non-blocking mode... fcntl O_NONBLOCK
checking for perl... /usr/bin/perl
checking whether to enable the threaded resolver... yes
checking for pthread.h... yes
checking for pthread_create... yes
checking for dirent.h... yes
checking for opendir... yes
checking convert -I options to -isystem... yes
checking whether to enable verbose strings... yes
checking whether to enable SSPI support (Windows native builds only)... no
checking whether to enable basic authentication method... yes
checking whether to enable bearer authentication method... yes
checking whether to enable digest authentication method... yes
checking whether to enable kerberos authentication method... yes
checking whether to enable negotiate authentication method... yes
checking whether to enable aws sig methods... yes
checking whether to support NTLM... yes
checking whether to enable TLS-SRP authentication... yes
checking whether to enable Unix domain sockets... auto
checking for struct sockaddr_un.sun_path... yes
checking whether to support cookies... yes
checking whether to support socketpair... yes
checking whether to support HTTP authentication... yes
checking whether to support DoH... yes
checking whether to support the MIME API... yes
checking whether to support binding connections locally... yes
checking whether to support the form API... yes
checking whether to support date parsing... yes
checking whether to support netrc parsing... yes
checking whether to support progress-meter... yes
checking whether to support the SHA-512/256 hash algorithm... yes
checking whether to support DNS shuffling... yes
checking whether to support curl_easy_option*... yes
checking whether to support alt-svc... yes
checking whether to support headers-api... yes
configure: disables HSTS due to lack of SSL
checking whether to enable HTTPS-RR support... no
checking whether to support WebSockets... yes
checking whether hiding of library internal symbols will actually happen... yes
checking if this build supports HTTPS-proxy... no
checking that generated files are newer than configure... done
configure: creating ./config.status
config.status: creating Makefile
config.status: creating docs/Makefile
config.status: creating docs/examples/Makefile
config.status: creating docs/libcurl/Makefile
config.status: creating docs/libcurl/opts/Makefile
config.status: creating docs/cmdline-opts/Makefile
config.status: creating include/Makefile
config.status: creating include/curl/Makefile
config.status: creating src/Makefile
config.status: creating lib/Makefile
config.status: creating scripts/Makefile
config.status: creating lib/libcurl.vers
config.status: creating tests/Makefile
config.status: creating tests/config
config.status: creating tests/configurehelp.pm
config.status: creating tests/certs/Makefile
config.status: creating tests/data/Makefile
config.status: creating tests/server/Makefile
config.status: creating tests/libtest/Makefile
config.status: creating tests/unit/Makefile
config.status: creating tests/tunit/Makefile
config.status: creating tests/http/config.ini
config.status: creating tests/http/Makefile
config.status: creating packages/Makefile
config.status: creating packages/vms/Makefile
config.status: creating curl-config
config.status: creating libcurl.pc
config.status: creating lib/curl_config.h
config.status: executing depfiles commands
config.status: executing libtool commands
configure: Configured to build curl/libcurl:
Host setup: x86_64-pc-linux-gnu
Install prefix: /usr/local
Compiler: ccache gcc
CFLAGS: -Werror-implicit-function-declaration -O2 -Wno-system-headers
CFLAGS extras:
CPPFLAGS: -D_GNU_SOURCE
LDFLAGS:
curl-config:
LIBS: -lpsl -lz
curl version: 8.16.0-DEV
SSL: no (--with-{openssl,gnutls,mbedtls,wolfssl,schannel,amissl,rustls} )
SSH: no (--with-{libssh,libssh2})
zlib: enabled
brotli: no (--with-brotli)
zstd: no (--with-zstd)
GSS-API: no (--with-gssapi)
GSASL: no (libgsasl not found)
TLS-SRP: no (--enable-tls-srp)
resolver: POSIX threaded
IPv6: enabled
Unix sockets: enabled
IDN: no (--with-{libidn2,winidn})
Build docs: no
Build libcurl: Shared=no, Static=yes
Built-in manual: no (--enable-manual)
--libcurl option: enabled (--disable-libcurl-option)
Verbose errors: enabled (--disable-verbose)
Code coverage: disabled
SSPI: no (--enable-sspi)
ca cert bundle: no
ca cert path:
ca cert embed: no
ca fallback:
LDAP: no (--enable-ldap / --with-ldap-lib / --with-lber-lib)
LDAPS: no (--enable-ldaps)
IPFS/IPNS: enabled
RTSP: enabled
RTMP: no (--with-librtmp)
PSL: enabled
Alt-svc: enabled (--disable-alt-svc)
Headers API: enabled (--disable-headers-api)
HSTS: no (--enable-hsts)
HTTP1: enabled (internal)
HTTP2: no (--with-nghttp2)
HTTP3: no (--with-ngtcp2 --with-nghttp3, --with-quiche, --with-openssl-quic)
ECH: no (--enable-ech)
HTTPS RR: no (--enable-httpsrr)
SSLS-EXPORT: no (--enable-ssls-export)
Protocols: dict file ftp gopher http imap ipfs ipns mqtt pop3 rtsp smtp telnet tftp ws
Features: alt-svc AsynchDNS IPv6 Largefile libz PSL threadsafe UnixSockets
configure: WARNING: libgsasl was not found
configure: WARNING: Cannot find libraries for LDAP support: LDAP disabled
configure: WARNING: Cannot find libidn2
$ make -j3
Making all in lib
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make all-am
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
CC libcurl_la-altsvc.lo
CC libcurl_la-amigaos.lo
CC libcurl_la-asyn-ares.lo
CC libcurl_la-asyn-base.lo
CC libcurl_la-asyn-thrdd.lo
CC libcurl_la-bufq.lo
CC libcurl_la-bufref.lo
CC libcurl_la-cf-h1-proxy.lo
CC libcurl_la-cf-h2-proxy.lo
CC libcurl_la-cf-haproxy.lo
CC libcurl_la-cf-https-connect.lo
CC libcurl_la-cf-socket.lo
CC libcurl_la-cfilters.lo
CC libcurl_la-conncache.lo
CC libcurl_la-connect.lo
CC libcurl_la-content_encoding.lo
CC libcurl_la-cookie.lo
CC libcurl_la-cshutdn.lo
CC libcurl_la-curl_addrinfo.lo
CC libcurl_la-curl_des.lo
CC libcurl_la-curl_endian.lo
CC libcurl_la-curl_fnmatch.lo
CC libcurl_la-curl_get_line.lo
CC libcurl_la-curl_gethostname.lo
CC libcurl_la-curl_gssapi.lo
CC libcurl_la-curl_memrchr.lo
CC libcurl_la-curl_ntlm_core.lo
CC libcurl_la-curl_range.lo
CC libcurl_la-curl_rtmp.lo
CC libcurl_la-curl_sasl.lo
CC libcurl_la-curl_sha512_256.lo
CC libcurl_la-curl_sspi.lo
CC libcurl_la-curl_threads.lo
CC libcurl_la-curl_trc.lo
CC libcurl_la-cw-out.lo
CC libcurl_la-cw-pause.lo
CC libcurl_la-dict.lo
CC libcurl_la-doh.lo
CC libcurl_la-dynhds.lo
CC libcurl_la-easy.lo
CC libcurl_la-easygetopt.lo
CC libcurl_la-easyoptions.lo
CC libcurl_la-escape.lo
CC libcurl_la-fake_addrinfo.lo
CC libcurl_la-file.lo
CC libcurl_la-fopen.lo
CC libcurl_la-fileinfo.lo
CC libcurl_la-formdata.lo
CC libcurl_la-ftp.lo
CC libcurl_la-ftplistparser.lo
CC libcurl_la-getenv.lo
CC libcurl_la-getinfo.lo
CC libcurl_la-gopher.lo
CC libcurl_la-hash.lo
CC libcurl_la-headers.lo
CC libcurl_la-hmac.lo
CC libcurl_la-hostip.lo
CC libcurl_la-hostip4.lo
CC libcurl_la-hostip6.lo
CC libcurl_la-hsts.lo
CC libcurl_la-http.lo
CC libcurl_la-http1.lo
CC libcurl_la-http2.lo
CC libcurl_la-http_aws_sigv4.lo
CC libcurl_la-http_chunks.lo
CC libcurl_la-http_digest.lo
CC libcurl_la-http_negotiate.lo
CC libcurl_la-http_ntlm.lo
CC libcurl_la-http_proxy.lo
CC libcurl_la-httpsrr.lo
CC libcurl_la-idn.lo
CC libcurl_la-if2ip.lo
CC libcurl_la-imap.lo
CC libcurl_la-krb5.lo
CC libcurl_la-ldap.lo
CC libcurl_la-llist.lo
CC libcurl_la-macos.lo
CC libcurl_la-md4.lo
CC libcurl_la-md5.lo
CC libcurl_la-memdebug.lo
CC libcurl_la-mime.lo
CC libcurl_la-mprintf.lo
CC libcurl_la-mqtt.lo
CC libcurl_la-multi.lo
CC libcurl_la-multi_ev.lo
CC libcurl_la-netrc.lo
CC libcurl_la-noproxy.lo
CC libcurl_la-openldap.lo
CC libcurl_la-parsedate.lo
CC libcurl_la-pingpong.lo
CC libcurl_la-pop3.lo
CC libcurl_la-progress.lo
CC libcurl_la-psl.lo
CC libcurl_la-rand.lo
CC libcurl_la-rename.lo
CC libcurl_la-request.lo
CC libcurl_la-rtsp.lo
CC libcurl_la-select.lo
CC libcurl_la-sendf.lo
CC libcurl_la-setopt.lo
CC libcurl_la-sha256.lo
CC libcurl_la-share.lo
CC libcurl_la-slist.lo
CC libcurl_la-smb.lo
CC libcurl_la-smtp.lo
CC libcurl_la-socketpair.lo
CC libcurl_la-socks.lo
CC libcurl_la-socks_gssapi.lo
CC libcurl_la-socks_sspi.lo
CC libcurl_la-speedcheck.lo
CC libcurl_la-splay.lo
CC libcurl_la-strcase.lo
CC libcurl_la-strdup.lo
CC libcurl_la-strequal.lo
CC libcurl_la-strerror.lo
CC libcurl_la-system_win32.lo
CC libcurl_la-telnet.lo
CC libcurl_la-tftp.lo
CC libcurl_la-transfer.lo
CC libcurl_la-uint-bset.lo
CC libcurl_la-uint-hash.lo
CC libcurl_la-uint-spbset.lo
CC libcurl_la-uint-table.lo
CC libcurl_la-url.lo
CC libcurl_la-urlapi.lo
CC libcurl_la-version.lo
CC libcurl_la-ws.lo
CC libcurlu_la-altsvc.lo
CC libcurlu_la-amigaos.lo
CC libcurlu_la-asyn-ares.lo
CC libcurlu_la-asyn-base.lo
CC libcurlu_la-asyn-thrdd.lo
CC libcurlu_la-bufq.lo
CC libcurlu_la-bufref.lo
CC libcurlu_la-cf-h1-proxy.lo
CC libcurlu_la-cf-h2-proxy.lo
CC libcurlu_la-cf-haproxy.lo
CC libcurlu_la-cf-https-connect.lo
CC libcurlu_la-cf-socket.lo
CC libcurlu_la-cfilters.lo
CC libcurlu_la-conncache.lo
CC libcurlu_la-connect.lo
CC libcurlu_la-content_encoding.lo
CC libcurlu_la-cookie.lo
CC libcurlu_la-cshutdn.lo
CC libcurlu_la-curl_addrinfo.lo
CC libcurlu_la-curl_des.lo
CC libcurlu_la-curl_endian.lo
CC libcurlu_la-curl_fnmatch.lo
CC libcurlu_la-curl_get_line.lo
CC libcurlu_la-curl_gethostname.lo
CC libcurlu_la-curl_gssapi.lo
CC libcurlu_la-curl_memrchr.lo
CC libcurlu_la-curl_ntlm_core.lo
CC libcurlu_la-curl_range.lo
CC libcurlu_la-curl_rtmp.lo
CC libcurlu_la-curl_sasl.lo
CC libcurlu_la-curl_sha512_256.lo
CC libcurlu_la-curl_sspi.lo
CC libcurlu_la-curl_threads.lo
CC libcurlu_la-curl_trc.lo
CC libcurlu_la-cw-out.lo
CC libcurlu_la-cw-pause.lo
CC libcurlu_la-dict.lo
CC libcurlu_la-doh.lo
CC libcurlu_la-dynhds.lo
CC libcurlu_la-easy.lo
CC libcurlu_la-easygetopt.lo
CC libcurlu_la-easyoptions.lo
CC libcurlu_la-escape.lo
CC libcurlu_la-fake_addrinfo.lo
CC libcurlu_la-file.lo
CC libcurlu_la-fileinfo.lo
CC libcurlu_la-fopen.lo
CC libcurlu_la-ftp.lo
CC libcurlu_la-formdata.lo
CC libcurlu_la-ftplistparser.lo
CC libcurlu_la-getinfo.lo
CC libcurlu_la-getenv.lo
CC libcurlu_la-gopher.lo
CC libcurlu_la-hash.lo
CC libcurlu_la-headers.lo
CC libcurlu_la-hmac.lo
CC libcurlu_la-hostip.lo
CC libcurlu_la-hostip4.lo
CC libcurlu_la-hostip6.lo
CC libcurlu_la-hsts.lo
CC libcurlu_la-http.lo
CC libcurlu_la-http1.lo
CC libcurlu_la-http2.lo
CC libcurlu_la-http_aws_sigv4.lo
CC libcurlu_la-http_chunks.lo
CC libcurlu_la-http_digest.lo
CC libcurlu_la-http_negotiate.lo
CC libcurlu_la-http_ntlm.lo
CC libcurlu_la-http_proxy.lo
CC libcurlu_la-httpsrr.lo
CC libcurlu_la-idn.lo
CC libcurlu_la-if2ip.lo
CC libcurlu_la-imap.lo
CC libcurlu_la-krb5.lo
CC libcurlu_la-ldap.lo
CC libcurlu_la-llist.lo
CC libcurlu_la-macos.lo
CC libcurlu_la-md4.lo
CC libcurlu_la-md5.lo
CC libcurlu_la-memdebug.lo
CC libcurlu_la-mime.lo
CC libcurlu_la-mprintf.lo
CC libcurlu_la-mqtt.lo
CC libcurlu_la-multi.lo
CC libcurlu_la-multi_ev.lo
CC libcurlu_la-netrc.lo
CC libcurlu_la-openldap.lo
CC libcurlu_la-noproxy.lo
CC libcurlu_la-parsedate.lo
CC libcurlu_la-pop3.lo
CC libcurlu_la-pingpong.lo
CC libcurlu_la-progress.lo
CC libcurlu_la-psl.lo
CC libcurlu_la-rand.lo
CC libcurlu_la-rename.lo
CC libcurlu_la-request.lo
CC libcurlu_la-rtsp.lo
CC libcurlu_la-select.lo
CC libcurlu_la-sendf.lo
CC libcurlu_la-setopt.lo
CC libcurlu_la-sha256.lo
CC libcurlu_la-share.lo
CC libcurlu_la-slist.lo
CC libcurlu_la-smb.lo
CC libcurlu_la-smtp.lo
CC libcurlu_la-socketpair.lo
CC libcurlu_la-socks.lo
CC libcurlu_la-socks_gssapi.lo
CC libcurlu_la-socks_sspi.lo
CC libcurlu_la-speedcheck.lo
CC libcurlu_la-splay.lo
CC libcurlu_la-strcase.lo
CC libcurlu_la-strdup.lo
CC libcurlu_la-strequal.lo
CC libcurlu_la-strerror.lo
CC libcurlu_la-system_win32.lo
CC libcurlu_la-telnet.lo
CC libcurlu_la-tftp.lo
CC libcurlu_la-uint-bset.lo
CC libcurlu_la-transfer.lo
CC libcurlu_la-uint-hash.lo
CC libcurlu_la-uint-spbset.lo
CC libcurlu_la-uint-table.lo
CC libcurlu_la-url.lo
CC libcurlu_la-urlapi.lo
CC libcurlu_la-version.lo
CC libcurlu_la-ws.lo
CC vauth/libcurlu_la-cleartext.lo
CC vauth/libcurlu_la-cram.lo
CC vauth/libcurlu_la-digest.lo
CC vauth/libcurlu_la-digest_sspi.lo
CC vauth/libcurlu_la-gsasl.lo
CC vauth/libcurlu_la-krb5_gssapi.lo
CC vauth/libcurlu_la-krb5_sspi.lo
CC vauth/libcurlu_la-ntlm.lo
CC vauth/libcurlu_la-ntlm_sspi.lo
CC vauth/libcurlu_la-oauth2.lo
CC vauth/libcurlu_la-spnego_gssapi.lo
CC vauth/libcurlu_la-spnego_sspi.lo
CC vauth/libcurlu_la-vauth.lo
CC vtls/libcurlu_la-cipher_suite.lo
CC vtls/libcurlu_la-gtls.lo
CC vtls/libcurlu_la-hostcheck.lo
CC vtls/libcurlu_la-keylog.lo
CC vtls/libcurlu_la-mbedtls.lo
CC vtls/libcurlu_la-mbedtls_threadlock.lo
CC vtls/libcurlu_la-openssl.lo
CC vtls/libcurlu_la-rustls.lo
CC vtls/libcurlu_la-schannel.lo
CC vtls/libcurlu_la-schannel_verify.lo
CC vtls/libcurlu_la-vtls.lo
CC vtls/libcurlu_la-vtls_scache.lo
CC vtls/libcurlu_la-vtls_spack.lo
CC vtls/libcurlu_la-wolfssl.lo
CC vtls/libcurlu_la-x509asn1.lo
CC vquic/libcurlu_la-curl_ngtcp2.lo
CC vquic/libcurlu_la-curl_osslq.lo
CC vquic/libcurlu_la-curl_quiche.lo
CC vquic/libcurlu_la-vquic.lo
CC vquic/libcurlu_la-vquic-tls.lo
CC vssh/libcurlu_la-libssh.lo
CC vssh/libcurlu_la-libssh2.lo
CC vssh/libcurlu_la-curl_path.lo
CC vssh/libcurlu_la-wolfssh.lo
CC curlx/libcurlu_la-base64.lo
CC curlx/libcurlu_la-dynbuf.lo
CC curlx/libcurlu_la-inet_ntop.lo
CC curlx/libcurlu_la-multibyte.lo
CC curlx/libcurlu_la-inet_pton.lo
CC curlx/libcurlu_la-nonblock.lo
CC curlx/libcurlu_la-strparse.lo
CC curlx/libcurlu_la-timediff.lo
CC curlx/libcurlu_la-timeval.lo
CC curlx/libcurlu_la-version_win32.lo
CC curlx/libcurlu_la-wait.lo
CC curlx/libcurlu_la-warnless.lo
CC curlx/libcurlu_la-winapi.lo
UNITPR unitprotos.h
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-cipher_suite.lo
CC vtls/libcurl_la-gtls.lo
CC vtls/libcurl_la-hostcheck.lo
CC vtls/libcurl_la-keylog.lo
CC vtls/libcurl_la-mbedtls.lo
CC vtls/libcurl_la-mbedtls_threadlock.lo
CC vtls/libcurl_la-openssl.lo
CC vtls/libcurl_la-rustls.lo
CC vtls/libcurl_la-schannel.lo
CC vtls/libcurl_la-schannel_verify.lo
CC vtls/libcurl_la-vtls.lo
CC vtls/libcurl_la-vtls_scache.lo
CC vtls/libcurl_la-vtls_spack.lo
CC vtls/libcurl_la-wolfssl.lo
CC vtls/libcurl_la-x509asn1.lo
CC vquic/libcurl_la-curl_ngtcp2.lo
CC vquic/libcurl_la-curl_osslq.lo
CC vquic/libcurl_la-curl_quiche.lo
CC vquic/libcurl_la-vquic.lo
CC vquic/libcurl_la-vquic-tls.lo
CC vssh/libcurl_la-libssh.lo
CC vssh/libcurl_la-libssh2.lo
CC vssh/libcurl_la-curl_path.lo
CC vssh/libcurl_la-wolfssh.lo
CC curlx/libcurl_la-base64.lo
CC curlx/libcurl_la-dynbuf.lo
CC curlx/libcurl_la-inet_ntop.lo
CC curlx/libcurl_la-inet_pton.lo
CC curlx/libcurl_la-nonblock.lo
CC curlx/libcurl_la-multibyte.lo
CC curlx/libcurl_la-strparse.lo
CC curlx/libcurl_la-timediff.lo
CC curlx/libcurl_la-timeval.lo
CC curlx/libcurl_la-version_win32.lo
CC curlx/libcurl_la-wait.lo
CC curlx/libcurl_la-warnless.lo
CC curlx/libcurl_la-winapi.lo
CCLD libcurlu.la
CCLD libcurl.la
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/lib'
Making all in docs
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in .
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
make[2]: Nothing to be done for 'all-am'.
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in cmdline-opts
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
make[2]: Nothing to be done for 'all'.
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/cmdline-opts'
Making all in libcurl
make[2]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
Making all in opts
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
make[3]: Nothing to be done for 'all'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl/opts'
make[3]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[3]: Nothing to be done for 'all-am'.
make[3]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[2]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs/libcurl'
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/docs'
Making all in src
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/src'
CC curl-terminal.o
CC curl-config2setopts.o
CC curl-slist_wc.o
CC curl-tool_bname.o
CC curl-tool_cb_dbg.o
CC curl-tool_cb_hdr.o
CC curl-tool_cb_prg.o
CC curl-tool_cb_rea.o
CC curl-tool_cb_see.o
CC curl-tool_cb_soc.o
CC curl-tool_cb_wrt.o
CC curl-tool_cfgable.o
CC curl-tool_dirhie.o
CC curl-tool_doswin.o
CC curl-tool_easysrc.o
CC curl-tool_filetime.o
CC curl-tool_findfile.o
CC curl-tool_formparse.o
CC curl-tool_getparam.o
CC curl-tool_getpass.o
CC curl-tool_help.o
CC curl-tool_helpers.o
CC curl-tool_listhelp.o
CC curl-tool_libinfo.o
CC curl-tool_ipfs.o
CC curl-tool_msgs.o
CC curl-tool_main.o
CC curl-tool_operate.o
CC curl-tool_paramhlp.o
CC curl-tool_parsecfg.o
CC curl-tool_operhlp.o
CC curl-tool_progress.o
CC curl-tool_ssls.o
CC curl-tool_setopt.o
CC curl-tool_stderr.o
CC curl-tool_strdup.o
CC curl-tool_urlglob.o
CC curl-tool_util.o
CC curl-tool_vms.o
CC curl-tool_writeout.o
CC curl-tool_xattr.o
CC curl-tool_writeout_json.o
echo '/* !checksrc! disable COPYRIGHT all */' > tool_hugehelp.c; \
echo '#include "tool_hugehelp.h"' >> tool_hugehelp.c
CC curl-var.o
echo '/* !checksrc! disable COPYRIGHT all */' > tool_ca_embed.c
echo 'extern const void *curl_ca_embed; const void *curl_ca_embed;' >> tool_ca_embed.c
CC curlinfo.o
CC libcurltool_la-config2setopts.lo
CC libcurltool_la-slist_wc.lo
CC libcurltool_la-terminal.lo
CC libcurltool_la-tool_bname.lo
CC libcurltool_la-tool_cb_dbg.lo
CC libcurltool_la-tool_cb_hdr.lo
CC libcurltool_la-tool_cb_prg.lo
CC libcurltool_la-tool_cb_rea.lo
CC libcurltool_la-tool_cb_see.lo
CC libcurltool_la-tool_cb_soc.lo
CC libcurltool_la-tool_cb_wrt.lo
CC libcurltool_la-tool_cfgable.lo
CC libcurltool_la-tool_dirhie.lo
CC libcurltool_la-tool_doswin.lo
CC libcurltool_la-tool_easysrc.lo
CC libcurltool_la-tool_filetime.lo
CC libcurltool_la-tool_findfile.lo
CC libcurltool_la-tool_formparse.lo
CC libcurltool_la-tool_getparam.lo
CC libcurltool_la-tool_getpass.lo
CC libcurltool_la-tool_help.lo
CC libcurltool_la-tool_helpers.lo
CC libcurltool_la-tool_ipfs.lo
CC libcurltool_la-tool_libinfo.lo
CC libcurltool_la-tool_listhelp.lo
CC libcurltool_la-tool_main.lo
CC libcurltool_la-tool_msgs.lo
CC libcurltool_la-tool_operate.lo
CC libcurltool_la-tool_operhlp.lo
CC libcurltool_la-tool_paramhlp.lo
CC libcurltool_la-tool_parsecfg.lo
CC libcurltool_la-tool_progress.lo
CC libcurltool_la-tool_setopt.lo
CC libcurltool_la-tool_stderr.lo
CC libcurltool_la-tool_ssls.lo
CC libcurltool_la-tool_strdup.lo
CC libcurltool_la-tool_urlglob.lo
CC libcurltool_la-tool_util.lo
CC libcurltool_la-tool_vms.lo
CC libcurltool_la-tool_writeout.lo
CC libcurltool_la-tool_writeout_json.lo
CC libcurltool_la-tool_xattr.lo
CC libcurltool_la-var.lo
CC curl-tool_hugehelp.o
CC curl-tool_ca_embed.o
CCLD curlinfo
CCLD curl
CCLD libcurltool.la
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/src'
Making all in scripts
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0/scripts'
make[1]: Nothing to be done for 'all'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0/scripts'
make[1]: Entering directory '/root/asi_db/builds/curl/_worktrees/w0'
make[1]: Nothing to be done for 'all-am'.
make[1]: Leaving directory '/root/asi_db/builds/curl/_worktrees/w0'
Commit Diff GitHub →
.github/workflows/windows.yml +0 -1configure.ac +0 -1tests/CMakeLists.txt +1 -2tests/Makefile.am +1 -1tests/client/.gitignore +0 -6tests/client/CMakeLists.txt +0 -51tests/client/Makefile.am +0 -84tests/client/Makefile.inc +0 -47tests/client/first.c +0 -52tests/client/first.h +0 -268tests/http/Makefile.am +3 -3tests/http/test_02_download.py +17 -17tests/http/test_07_upload.py +8 -8tests/http/test_08_caddy.py +1 -1tests/http/test_09_push.py +1 -1tests/http/test_17_ssl_use.py +1 -1tests/http/test_19_shutdown.py +2 -2tests/http/test_20_websockets.py +7 -7tests/http/testenv/client.py +1 -1tests/libtest/Makefile.inc +10 -0tests/client/h2_pausing.c → tests/libtest/cli_h2_pausing.c +38 -26tests/client/h2_serverpush.c → tests/libtest/cli_h2_serverpush.c +13 -44tests/client/h2_upgrade_extreme.c → tests/libtest/cli_h2_upgrade_extreme.c +11 -10tests/client/hx_download.c → tests/libtest/cli_hx_download.c +23 -17tests/client/hx_upload.c → tests/libtest/cli_hx_upload.c +26 -20tests/client/tls_session_reuse.c → tests/libtest/cli_tls_session_reuse.c +20 -19tests/client/upload_pausing.c → tests/libtest/cli_upload_pausing.c +27 -20tests/client/ws_data.c → tests/libtest/cli_ws_data.c +19 -13tests/client/ws_pingpong.c → tests/libtest/cli_ws_pingpong.c +17 -56tests/libtest/first.c +121 -7tests/libtest/first.h +11 -0tests/libtest/lib1515.c +3 -3tests/libtest/lib1522.c +3 -3tests/libtest/lib1540.c +3 -3tests/libtest/lib1542.c +3 -3tests/libtest/lib1553.c +3 -3tests/libtest/lib1915.c +4 -4tests/libtest/lib2301.c +3 -54tests/libtest/lib2304.c +3 -55tests/libtest/lib2502.c +3 -3tests/libtest/lib2700.c +3 -3tests/libtest/lib3033.c +3 -3tests/libtest/lib500.c +3 -3tests/libtest/lib552.c +5 -95tests/libtest/lib573.c +3 -3tests/libtest/lib753.c +3 -3tests/libtest/testtrace.c +105 -13tests/libtest/testtrace.h +9 -1
.github/workflows/windows.yml+0 -1
| @@ -357,7 +357,6 @@ jobs: | |
| fi | |
| if [ "${MATRIX_BUILD}" != 'cmake' ]; then | |
| # avoid libtool's .exe wrappers for shared builds | |
| - | mv bld/tests/client/.libs/*.exe bld/tests/client || true |
| mv bld/tests/libtest/.libs/*.exe bld/tests/libtest || true | |
| mv bld/tests/server/.libs/*.exe bld/tests/server || true | |
| mv bld/tests/tunit/.libs/*.exe bld/tests/tunit || true | |
configure.ac+0 -1
| @@ -5463,7 +5463,6 @@ AC_CONFIG_FILES([\ | |
| tests/libtest/Makefile \ | |
| tests/unit/Makefile \ | |
| tests/tunit/Makefile \ | |
| - | tests/client/Makefile \ |
| tests/http/config.ini \ | |
| tests/http/Makefile \ | |
| packages/Makefile \ | |
tests/CMakeLists.txt+1 -2
| @@ -40,7 +40,6 @@ if(CURL_CLANG_TIDY) | |
| endif() | |
| add_subdirectory(http) | |
| - | add_subdirectory(client) |
| add_subdirectory(server) | |
| add_subdirectory(libtest) | |
| add_subdirectory(tunit) | |
| @@ -84,7 +83,7 @@ function(curl_add_pytests _targetname _test_flags) | |
| if(BUILD_CURL_EXE) | |
| list(APPEND _depends ${EXE_NAME}) | |
| endif() | |
| - | list(APPEND _depends "clients") |
| + | list(APPEND _depends "libtests") |
| endif() | |
| string(REPLACE " " ";" _test_flags_list "${_test_flags}") | |
| add_custom_target(${_targetname} | |
tests/Makefile.am+1 -1
| @@ -95,7 +95,7 @@ BUILD_UNIT = | |
| DIST_UNIT = unit tunit | |
| endif | |
| - | SUBDIRS = certs data server libtest client http $(BUILD_UNIT) |
| + | SUBDIRS = certs data server libtest http $(BUILD_UNIT) |
| DIST_SUBDIRS = $(SUBDIRS) $(DIST_UNIT) | |
| PERLFLAGS = -I$(srcdir) | |
tests/client/.gitignore+0 -6
| @@ -1,6 +0,0 @@ | |
| - | # Copyright (C) Daniel Stenberg, <[email protected]>, et al. |
| - | # |
| - | # SPDX-License-Identifier: curl |
| - | |
| - | clients |
| - | clients.c |
tests/client/CMakeLists.txt+0 -51
| @@ -1,51 +0,0 @@ | |
| - | #*************************************************************************** |
| - | # _ _ ____ _ |
| - | # Project ___| | | | _ \| | |
| - | # / __| | | | |_) | | |
| - | # | (__| |_| | _ <| |___ |
| - | # \___|\___/|_| \_\_____| |
| - | # |
| - | # Copyright (C) Daniel Stenberg, <[email protected]>, et al. |
| - | # |
| - | # This software is licensed as described in the file COPYING, which |
| - | # you should have received as part of this distribution. The terms |
| - | # are also available at https://curl.se/docs/copyright.html. |
| - | # |
| - | # You may opt to use, copy, modify, merge, publish, distribute and/or sell |
| - | # copies of the Software, and permit persons to whom the Software is |
| - | # furnished to do so, under the terms of the COPYING file. |
| - | # |
| - | # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY |
| - | # KIND, either express or implied. |
| - | # |
| - | # SPDX-License-Identifier: curl |
| - | # |
| - | ########################################################################### |
| - | |
| - | # Get BUNDLE, FIRST_C, FIRST_H, CURLX_C, TESTS_C variables |
| - | curl_transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake") |
| - | include("${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake") |
| - | |
| - | if(LIB_SELECTED STREQUAL LIB_STATIC) |
| - | set(CURLX_C "") # Already exported from the libcurl static build. Skip them. |
| - | endif() |
| - | |
| - | add_custom_command(OUTPUT "${BUNDLE}.c" |
| - | COMMAND ${PERL_EXECUTABLE} "${PROJECT_SOURCE_DIR}/scripts/mk-unity.pl" |
| - | --include ${CURLX_C} --test ${TESTS_C} > "${BUNDLE}.c" |
| - | DEPENDS |
| - | "${PROJECT_SOURCE_DIR}/scripts/mk-unity.pl" "${CMAKE_CURRENT_SOURCE_DIR}/Makefile.inc" |
| - | ${FIRST_C} ${CURLX_C} ${TESTS_C} |
| - | VERBATIM) |
| - | |
| - | add_executable(${BUNDLE} EXCLUDE_FROM_ALL "${BUNDLE}.c") |
| - | add_dependencies(testdeps ${BUNDLE}) |
| - | target_link_libraries(${BUNDLE} ${LIB_SELECTED} ${CURL_LIBS}) |
| - | target_include_directories(${BUNDLE} PRIVATE |
| - | "${PROJECT_BINARY_DIR}/lib" # for "curl_config.h" |
| - | "${PROJECT_SOURCE_DIR}/lib" # for "curl_setup.h", curlx |
| - | "${CMAKE_CURRENT_SOURCE_DIR}" # for the generated bundle source to find included test sources |
| - | ) |
| - | set_target_properties(${BUNDLE} PROPERTIES OUTPUT_NAME "${BUNDLE}" PROJECT_LABEL "Test ${BUNDLE}" UNITY_BUILD OFF C_CLANG_TIDY "") |
| - | |
| - | curl_add_clang_tidy_test_target("${BUNDLE}-clang-tidy" ${BUNDLE} ${FIRST_C} ${TESTS_C}) |
tests/client/Makefile.am+0 -84
| @@ -1,84 +0,0 @@ | |
| - | #*************************************************************************** |
| - | # _ _ ____ _ |
| - | # Project ___| | | | _ \| | |
| - | # / __| | | | |_) | | |
| - | # | (__| |_| | _ <| |___ |
| - | # \___|\___/|_| \_\_____| |
| - | # |
| - | # Copyright (C) Daniel Stenberg, <[email protected]>, et al. |
| - | # |
| - | # This software is licensed as described in the file COPYING, which |
| - | # you should have received as part of this distribution. The terms |
| - | # are also available at https://curl.se/docs/copyright.html. |
| - | # |
| - | # You may opt to use, copy, modify, merge, publish, distribute and/or sell |
| - | # copies of the Software, and permit persons to whom the Software is |
| - | # furnished to do so, under the terms of the COPYING file. |
| - | # |
| - | # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY |
| - | # KIND, either express or implied. |
| - | # |
| - | # SPDX-License-Identifier: curl |
| - | # |
| - | ########################################################################### |
| - | AUTOMAKE_OPTIONS = foreign nostdinc |
| - | |
| - | # Specify our include paths here, and do it relative to $(top_srcdir) and |
| - | # $(top_builddir), to ensure that these paths which belong to the library |
| - | # being currently built and tested are searched before the library which |
| - | # might possibly already be installed in the system. |
| - | # |
| - | # $(top_srcdir)/include is for libcurl's external include files |
| - | # $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file |
| - | # $(top_srcdir)/lib for libcurl's lib/curl_setup.h and other "borrowed" files |
| - | # $(srcdir) for the generated bundle source to find included test sources |
| - | |
| - | AM_CPPFLAGS = -I$(top_srcdir)/include \ |
| - | -I$(top_builddir)/lib \ |
| - | -I$(top_srcdir)/lib \ |
| - | -I$(srcdir) |
| - | |
| - | # Get BUNDLE, FIRST_C, FIRST_H, CURLX_C, TESTS_C variables |
| - | include Makefile.inc |
| - | |
| - | EXTRA_DIST = CMakeLists.txt $(FIRST_C) $(FIRST_H) $(TESTS_C) |
| - | |
| - | CFLAGS += @CURL_CFLAG_EXTRAS@ |
| - | |
| - | # Prevent LIBS from being used for all link targets |
| - | LIBS = $(BLANK_AT_MAKETIME) |
| - | |
| - | if USE_CPPFLAG_CURL_STATICLIB |
| - | AM_CPPFLAGS += -DCURL_STATICLIB |
| - | endif |
| - | |
| - | if USE_CPPFLAG_CURL_STATICLIB |
| - | curlx_c_lib = |
| - | else |
| - | # These are part of the libcurl static lib. Add them here when linking shared. |
| - | curlx_c_lib = $(CURLX_C) |
| - | endif |
| - | $(BUNDLE).c: $(top_srcdir)/scripts/mk-unity.pl Makefile.inc $(FIRST_C) $(curlx_c_lib) $(TESTS_C) |
| - | @PERL@ $(top_srcdir)/scripts/mk-unity.pl --include $(curlx_c_lib) --test $(TESTS_C) > $(BUNDLE).c |
| - | |
| - | noinst_PROGRAMS = $(BUNDLE) |
| - | LDADD = $(top_builddir)/lib/libcurl.la @LIBCURL_PC_LIBS_PRIVATE@ |
| - | CLEANFILES = $(BUNDLE).c |
| - | |
| - | CHECKSRC = $(CS_$(V)) |
| - | CS_0 = @echo " RUN " $@; |
| - | CS_1 = |
| - | CS_ = $(CS_0) |
| - | |
| - | # ignore generated C files since they play by slightly different rules! |
| - | checksrc: |
| - | $(CHECKSRC)(@PERL@ $(top_srcdir)/scripts/checksrc.pl -D$(srcdir) \ |
| - | -W$(srcdir)/$(BUNDLE).c \ |
| - | $(srcdir)/*.[ch]) |
| - | |
| - | if NOT_CURL_CI |
| - | all-local: checksrc |
| - | endif |
| - | |
| - | clean-local: |
| - | rm -f $(BUNDLE) |
tests/client/Makefile.inc+0 -47
| @@ -1,47 +0,0 @@ | |
| - | #*************************************************************************** |
| - | # _ _ ____ _ |
| - | # Project ___| | | | _ \| | |
| - | # / __| | | | |_) | | |
| - | # | (__| |_| | _ <| |___ |
| - | # \___|\___/|_| \_\_____| |
| - | # |
| - | # Copyright (C) Daniel Stenberg, <[email protected]>, et al. |
| - | # |
| - | # This software is licensed as described in the file COPYING, which |
| - | # you should have received as part of this distribution. The terms |
| - | # are also available at https://curl.se/docs/copyright.html. |
| - | # |
| - | # You may opt to use, copy, modify, merge, publish, distribute and/or sell |
| - | # copies of the Software, and permit persons to whom the Software is |
| - | # furnished to do so, under the terms of the COPYING file. |
| - | # |
| - | # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY |
| - | # KIND, either express or implied. |
| - | # |
| - | # SPDX-License-Identifier: curl |
| - | # |
| - | ########################################################################### |
| - | # Shared between CMakeLists.txt and Makefile.am |
| - | |
| - | BUNDLE = clients |
| - | |
| - | # Files referenced from the bundle source |
| - | FIRST_C = first.c |
| - | FIRST_H = first.h |
| - | |
| - | CURLX_C = \ |
| - | ../../lib/curlx/multibyte.c \ |
| - | ../../lib/curlx/timediff.c \ |
| - | ../../lib/curlx/wait.c |
| - | |
| - | # All test clients |
| - | TESTS_C = \ |
| - | h2_pausing.c \ |
| - | h2_serverpush.c \ |
| - | h2_upgrade_extreme.c \ |
| - | hx_download.c \ |
| - | hx_upload.c \ |
| - | tls_session_reuse.c \ |
| - | upload_pausing.c \ |
| - | ws_data.c \ |
| - | ws_pingpong.c |
tests/client/first.c+0 -52
| @@ -1,52 +0,0 @@ | |
| - | /*************************************************************************** |
| - | * _ _ ____ _ |
| - | * Project ___| | | | _ \| | |
| - | * / __| | | | |_) | | |
| - | * | (__| |_| | _ <| |___ |
| - | * \___|\___/|_| \_\_____| |
| - | * |
| - | * Copyright (C) Daniel Stenberg, <[email protected]>, et al. |
| - | * |
| - | * This software is licensed as described in the file COPYING, which |
| - | * you should have received as part of this distribution. The terms |
| - | * are also available at https://curl.se/docs/copyright.html. |
| - | * |
| - | * You may opt to use, copy, modify, merge, publish, distribute and/or sell |
| - | * copies of the Software, and permit persons to whom the Software is |
| - | * furnished to do so, under the terms of the COPYING file. |
| - | * |
| - | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY |
| - | * KIND, either express or implied. |
| - | * |
| - | * SPDX-License-Identifier: curl |
| - | * |
| - | ***************************************************************************/ |
| - | #include "first.h" |
| - | |
| - | int main(int argc, char **argv) |
| - | { |
| - | entry_func_t entry_func; |
| - | char *entry_name; |
| - | size_t tmp; |
| - | |
| - | if(argc < 2) { |
| - | curl_mfprintf(stderr, "Pass clientname as first argument\n"); |
| - | return 1; |
| - | } |
| - | |
| - | entry_name = argv[1]; |
| - | entry_func = NULL; |
| - | for(tmp = 0; s_entries[tmp].ptr; ++tmp) { |
| - | if(strcmp(entry_name, s_entries[tmp].name) == 0) { |
| - | entry_func = s_entries[tmp].ptr; |
| - | break; |
| - | } |
| - | } |
| - | |
| - | if(!entry_func) { |
| - | curl_mfprintf(stderr, "Test '%s' not found.\n", entry_name); |
| - | return 99; |
| - | } |
| - | |
| - | return entry_func(argc - 1, argv + 1); |
| - | } |
tests/client/first.h+0 -268
| @@ -1,268 +0,0 @@ | |
| - | #ifndef HEADER_CLIENT_FIRST_H |
| - | #define HEADER_CLIENT_FIRST_H |
| - | /*************************************************************************** |
| - | * _ _ ____ _ |
| - | * Project ___| | | | _ \| | |
| - | * / __| | | | |_) | | |
| - | * | (__| |_| | _ <| |___ |
| - | * \___|\___/|_| \_\_____| |
| - | * |
| - | * Copyright (C) Daniel Stenberg, <[email protected]>, et al. |
| - | * |
| - | * This software is licensed as described in the file COPYING, which |
| - | * you should have received as part of this distribution. The terms |
| - | * are also available at https://curl.se/docs/copyright.html. |
| - | * |
| - | * You may opt to use, copy, modify, merge, publish, distribute and/or sell |
| - | * copies of the Software, and permit persons to whom the Software is |
| - | * furnished to do so, under the terms of the COPYING file. |
| - | * |
| - | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY |
| - | * KIND, either express or implied. |
| - | * |
| - | * SPDX-License-Identifier: curl |
| - | * |
| - | ***************************************************************************/ |
| - | #define CURL_NO_OLDIES |
| - | |
| - | #include "curl_setup.h" |
| - | |
| - | typedef int (*entry_func_t)(int, char **); |
| - | |
| - | struct entry_s { |
| - | const char *name; |
| - | entry_func_t ptr; |
| - | }; |
| - | |
| - | extern const struct entry_s s_entries[]; |
| - | |
| - | #include <curl/curl.h> |
| - | |
| - | #include <curlx/curlx.h> |
| - | |
| - | #define ERR() \ |
| - | do { \ |
| - | curl_mfprintf(stderr, "something unexpected went wrong - bailing out!\n");\ |
| - | return 2; \ |
| - | } while(0) |
| - | |
| - | static void log_line_start(FILE *log, const char *idsbuf, curl_infotype type) |
| - | { |
| - | /* |
| - | * This is the trace look that is similar to what libcurl makes on its |
| - | * own. |
| - | */ |
| - | static const char * const s_infotype[] = { |
| - | "* ", "< ", "> ", "{ ", "} ", "{ ", "} " |
| - | }; |
| - | if(idsbuf && *idsbuf) |
| - | curl_mfprintf(log, "%s%s", idsbuf, s_infotype[type]); |
| - | else |
| - | fputs(s_infotype[type], log); |
| - | } |
| - | |
| - | #define TRC_IDS_FORMAT_IDS_1 "[%" CURL_FORMAT_CURL_OFF_T "-x] " |
| - | #define TRC_IDS_FORMAT_IDS_2 "[%" CURL_FORMAT_CURL_OFF_T "-%" \ |
| - | CURL_FORMAT_CURL_OFF_T "] " |
| - | /* |
| - | ** callback for CURLOPT_DEBUGFUNCTION |
| - | */ |
| - | static int debug_cb(CURL *handle, curl_infotype type, |
| - | char *data, size_t size, void *userdata) |
| - | { |
| - | FILE *output = stderr; |
| - | static int newl = 0; |
| - | static int traced_data = 0; |
| - | char idsbuf[60]; |
| - | curl_off_t xfer_id, conn_id; |
| - | |
| - | (void)handle; /* not used */ |
| - | (void)userdata; |
| - | |
| - | if(!curl_easy_getinfo(handle, CURLINFO_XFER_ID, &xfer_id) && xfer_id >= 0) { |
| - | if(!curl_easy_getinfo(handle, CURLINFO_CONN_ID, &conn_id) && |
| - | conn_id >= 0) { |
| - | curl_msnprintf(idsbuf, sizeof(idsbuf), TRC_IDS_FORMAT_IDS_2, xfer_id, |
| - | conn_id); |
| - | } |
| - | else { |
| - | curl_msnprintf(idsbuf, sizeof(idsbuf), TRC_IDS_FORMAT_IDS_1, xfer_id); |
| - | } |
| - | } |
| - | else |
| - | idsbuf[0] = 0; |
| - | |
| - | switch(type) { |
| - | case CURLINFO_HEADER_OUT: |
| - | if(size > 0) { |
| - | size_t st = 0; |
| - | size_t i; |
| - | for(i = 0; i < size - 1; i++) { |
| - | if(data[i] == '\n') { /* LF */ |
| - | if(!newl) { |
| - | log_line_start(output, idsbuf, type); |
| - | } |
| - | (void)fwrite(data + st, i - st + 1, 1, output); |
| - | st = i + 1; |
| - | newl = 0; |
| - | } |
| - | } |
| - | if(!newl) |
| - | log_line_start(output, idsbuf, type); |
| - | (void)fwrite(data + st, i - st + 1, 1, output); |
| - | } |
| - | newl = (size && (data[size - 1] != '\n')) ? 1 : 0; |
| - | traced_data = 0; |
| - | break; |
| - | case CURLINFO_TEXT: |
| - | case CURLINFO_HEADER_IN: |
| - | if(!newl) |
| - | log_line_start(output, idsbuf, type); |
| - | (void)fwrite(data, size, 1, output); |
| - | newl = (size && (data[size - 1] != '\n')) ? 1 : 0; |
| - | traced_data = 0; |
| - | break; |
| - | case CURLINFO_DATA_OUT: |
| - | case CURLINFO_DATA_IN: |
| - | case CURLINFO_SSL_DATA_IN: |
| - | case CURLINFO_SSL_DATA_OUT: |
| - | if(!traced_data) { |
| - | if(!newl) |
| - | log_line_start(output, idsbuf, type); |
| - | curl_mfprintf(output, "[%ld bytes data]\n", (long)size); |
| - | newl = 0; |
| - | traced_data = 1; |
| - | } |
| - | break; |
| - | default: /* nada */ |
| - | newl = 0; |
| - | traced_data = 1; |
| - | break; |
| - | } |
| - | |
| - | return 0; |
| - | } |
| - | |
| - | static void dump(const char *text, unsigned char *ptr, size_t size, char nohex) |
| - | { |
| - | size_t i; |
| - | size_t c; |
| - | |
| - | unsigned int width = 0x10; |
| - | |
| - | if(nohex) |
| - | /* without the hex output, we can fit more on screen */ |
| - | width = 0x40; |
| - | |
| - | curl_mfprintf(stderr, "%s, %lu bytes (0x%lx)\n", |
| - | text, (unsigned long)size, (unsigned long)size); |
| - | |
| - | for(i = 0; i < size; i += width) { |
| - | |
| - | curl_mfprintf(stderr, "%4.4lx: ", (unsigned long)i); |
| - | |
| - | if(!nohex) { |
| - | /* hex not disabled, show it */ |
| - | for(c = 0; c < width; c++) |
| - | if(i + c < size) |
| - | curl_mfprintf(stderr, "%02x ", ptr[i + c]); |
| - | else |
| - | fputs(" ", stderr); |
| - | } |
| - | |
| - | for(c = 0; (c < width) && (i + c < size); c++) { |
| - | /* check for 0D0A; if found, skip past and start a new line of output */ |
| - | if(nohex && (i + c + 1 < size) && ptr[i + c] == 0x0D && |
| - | ptr[i + c + 1] == 0x0A) { |
| - | i += (c + 2 - width); |
| - | break; |
| - | } |
| - | curl_mfprintf(stderr, "%c", |
| - | (ptr[i + c] >= 0x20) && (ptr[i + c] < 0x80) ? ptr[i + c] : '.'); |
| - | /* check again for 0D0A, to avoid an extra \n if it's at width */ |
| - | if(nohex && (i + c + 2 < size) && ptr[i + c + 1] == 0x0D && |
| - | ptr[i + c + 2] == 0x0A) { |
| - | i += (c + 3 - width); |
| - | break; |
| - | } |
| - | } |
| - | fputc('\n', stderr); /* newline */ |
| - | } |
| - | } |
| - | |
| - | #ifndef CURL_DISABLE_WEBSOCKETS |
| - | /* just close the connection */ |
| - | static void websocket_close(CURL *curl) |
| - | { |
| - | size_t sent; |
| - | CURLcode result = |
| - | curl_ws_send(curl, "", 0, &sent, 0, CURLWS_CLOSE); |
| - | curl_mfprintf(stderr, "ws: curl_ws_send returned %u, sent %u\n", |
| - | (int)result, (int)sent); |
| - | } |
| - | #endif /* CURL_DISABLE_WEBSOCKETS */ |
| - | |
| - | static int coptind; |
| - | static char *coptarg; |
| - | |
| - | static int cgetopt(int argc, char * const argv[], const char *optstring) |
| - | { |
| - | static int optpos = 1; |
| - | int coptopt; |
| - | char *arg; |
| - | |
| - | if(coptind == 0) { /* Reset? */ |
| - | coptind = !!argc; |
| - | optpos = 1; |
| - | } |
| - | |
| - | arg = argv[coptind]; |
| - | if(arg && strcmp(arg, "--") == 0) { |
| - | coptind++; |
| - | return -1; |
| - | } |
| - | else if(!arg || arg[0] != '-') { |
| - | return -1; |
| - | } |
| - | else { |
| - | const char *opt = strchr(optstring, arg[optpos]); |
| - | coptopt = arg[optpos]; |
| - | if(!opt) { |
| - | if(!arg[++optpos]) { |
| - | coptind++; |
| - | optpos = 1; |
| - | } |
| - | return '?'; |
| - | } |
| - | else if(opt[1] == ':') { |
| - | if(arg[optpos + 1]) { |
| - | coptarg = arg + optpos + 1; |
| - | coptind++; |
| - | optpos = 1; |
| - | return coptopt; |
| - | } |
| - | else if(argv[coptind + 1]) { |
| - | coptarg = argv[coptind + 1]; |
| - | coptind += 2; |
| - | optpos = 1; |
| - | return coptopt; |
| - | } |
| - | else { |
| - | if(!arg[++optpos]) { |
| - | coptind++; |
| - | optpos = 1; |
| - | } |
| - | return *optstring == ':' ? ':' : '?'; |
| - | } |
| - | } |
| - | else { |
| - | if(!arg[++optpos]) { |
| - | coptind++; |
| - | optpos = 1; |
| - | } |
| - | return coptopt; |
| - | } |
| - | } |
| - | } |
| - | |
| - | #endif /* HEADER_CLIENT_FIRST_H */ |
tests/http/Makefile.am+3 -3
| @@ -72,7 +72,7 @@ clean-local: | |
| rm -rf *.pyc __pycache__ | |
| rm -rf gen | |
| - | check: clients |
| + | check: libtests |
| - | clients: |
| - | @(cd ../client; $(MAKE) check) |
| + | libtests: |
| + | @(cd ../libtests; $(MAKE) check) |
tests/http/test_02_download.py+17 -17
| @@ -312,7 +312,7 @@ class TestDownload: | |
| count = 2 | |
| docname = 'data-10m' | |
| url = f'https://localhost:{env.https_port}/{docname}' | |
| - | client = LocalClient(name='hx_download', env=env) |
| + | client = LocalClient(name='cli_hx_download', env=env) |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| r = client.run(args=[ | |
| @@ -335,7 +335,7 @@ class TestDownload: | |
| run_env['CURL_DEBUG'] = 'multi,http/2' | |
| if swin_max > 0: | |
| run_env['CURL_H2_STREAM_WIN_MAX'] = f'{swin_max}' | |
| - | client = LocalClient(name='hx_download', env=env, run_env=run_env) |
| + | client = LocalClient(name='cli_hx_download', env=env, run_env=run_env) |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| r = client.run(args=[ | |
| @@ -355,7 +355,7 @@ class TestDownload: | |
| max_parallel = 5 | |
| docname = 'data-10m' | |
| url = f'https://localhost:{env.https_port}/{docname}' | |
| - | client = LocalClient(name='hx_download', env=env) |
| + | client = LocalClient(name='cli_hx_download', env=env) |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| r = client.run(args=[ | |
| @@ -383,7 +383,7 @@ class TestDownload: | |
| pause_offset = 12 * 1024 | |
| docname = 'data-1m' | |
| url = f'https://localhost:{env.https_port}/{docname}' | |
| - | client = LocalClient(name='hx_download', env=env) |
| + | client = LocalClient(name='cli_hx_download', env=env) |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| r = client.run(args=[ | |
| @@ -412,7 +412,7 @@ class TestDownload: | |
| abort_offset = 12 * 1024 | |
| docname = 'data-1m' | |
| url = f'https://localhost:{env.https_port}/{docname}' | |
| - | client = LocalClient(name='hx_download', env=env) |
| + | client = LocalClient(name='cli_hx_download', env=env) |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| r = client.run(args=[ | |
| @@ -441,7 +441,7 @@ class TestDownload: | |
| fail_offset = 12 * 1024 | |
| docname = 'data-1m' | |
| url = f'https://localhost:{env.https_port}/{docname}' | |
| - | client = LocalClient(name='hx_download', env=env) |
| + | client = LocalClient(name='cli_hx_download', env=env) |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| r = client.run(args=[ | |
| @@ -475,7 +475,7 @@ class TestDownload: | |
| # before protocol switch has happened | |
| def test_02_25_h2_upgrade_x(self, env: Env, httpd): | |
| url = f'http://localhost:{env.http_port}/data-100k' | |
| - | client = LocalClient(name='h2_upgrade_extreme', env=env, timeout=15) |
| + | client = LocalClient(name='cli_h2_upgrade_extreme', env=env, timeout=15) |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| r = client.run(args=[url]) | |
| @@ -488,10 +488,10 @@ class TestDownload: | |
| if proto == 'h3' and not env.have_h3(): | |
| pytest.skip("h3 not supported") | |
| url = f'https://{env.authority_for(env.domain1, proto)}/data-100k' | |
| - | client = LocalClient(name='tls_session_reuse', env=env) |
| + | client = LocalClient(name='cli_tls_session_reuse', env=env) |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| - | r = client.run(args=[proto, url]) |
| + | r = client.run(args=[url, proto]) |
| r.check_exit_code(0) | |
| # test on paused transfers, based on issue #11982 | |
| @@ -501,7 +501,7 @@ class TestDownload: | |
| pytest.skip("h3 not supported") | |
| url = f'https://{env.authority_for(env.domain1, proto)}' \ | |
| '/curltest/tweak/?&chunks=6&chunk_size=8000' | |
| - | client = LocalClient(env=env, name='h2_pausing') |
| + | client = LocalClient(env=env, name='cli_h2_pausing') |
| r = client.run(args=['-V', proto, url]) | |
| r.check_exit_code(0) | |
| @@ -512,7 +512,7 @@ class TestDownload: | |
| pytest.skip("h3 not supported") | |
| url = f'https://{env.authority_for(env.domain1, proto)}' \ | |
| '/curltest/tweak/?error=502' | |
| - | client = LocalClient(env=env, name='h2_pausing') |
| + | client = LocalClient(env=env, name='cli_h2_pausing') |
| r = client.run(args=['-V', proto, url]) | |
| r.check_exit_code(0) | |
| @@ -523,7 +523,7 @@ class TestDownload: | |
| pytest.skip("h3 not supported") | |
| url = f'https://{env.authority_for(env.domain1, proto)}' \ | |
| '/curltest/tweak/?status=200&chunks=1&chunk_size=100' | |
| - | client = LocalClient(env=env, name='h2_pausing') |
| + | client = LocalClient(env=env, name='cli_h2_pausing') |
| r = client.run(args=['-V', proto, url]) | |
| r.check_exit_code(0) | |
| @@ -562,7 +562,7 @@ class TestDownload: | |
| count = 2 | |
| docname = 'data-10m' | |
| url = f'https://localhost:{env.https_port}/{docname}' | |
| - | client = LocalClient(name='hx_download', env=env) |
| + | client = LocalClient(name='cli_hx_download', env=env) |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| r = client.run(args=[ | |
| @@ -617,7 +617,7 @@ class TestDownload: | |
| if proto != 'h3': | |
| port = env.nghttpx_https_port | |
| url = f'https://{env.domain1}:{port}/{docname}' | |
| - | client = LocalClient(name='hx_download', env=env) |
| + | client = LocalClient(name='cli_hx_download', env=env) |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| r = client.run(args=[ | |
| @@ -663,7 +663,7 @@ class TestDownload: | |
| url = f'https://{env.domain1}:{port}/{docname}' | |
| run_env = os.environ.copy() | |
| run_env['CURL_DEBUG'] = 'multi' | |
| - | client = LocalClient(name='hx_download', env=env, run_env=run_env) |
| + | client = LocalClient(name='cli_hx_download', env=env, run_env=run_env) |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| r = client.run(args=[ | |
| @@ -701,7 +701,7 @@ class TestDownload: | |
| url = f'https://{env.domain1}:{port}/{docname}' | |
| run_env = os.environ.copy() | |
| run_env['CURL_DEBUG'] = 'multi' | |
| - | client = LocalClient(name='hx_download', env=env, run_env=run_env) |
| + | client = LocalClient(name='cli_hx_download', env=env, run_env=run_env) |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| r = client.run(args=[ | |
| @@ -743,7 +743,7 @@ class TestDownload: | |
| pause_offset = 1024 * 1024 | |
| docname = 'bomb-100m.txt.var' | |
| url = f'https://localhost:{env.https_port}/{docname}' | |
| - | client = LocalClient(name='hx_download', env=env) |
| + | client = LocalClient(name='cli_hx_download', env=env) |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| r = client.run(args=[ | |
tests/http/test_07_upload.py+8 -8
| @@ -166,7 +166,7 @@ class TestUpload: | |
| count = 2 | |
| upload_size = 128*1024 | |
| url = f'https://localhost:{env.https_port}/curltest/put' | |
| - | client = LocalClient(name='hx_upload', env=env) |
| + | client = LocalClient(name='cli_hx_upload', env=env) |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| r = client.run(args=[ | |
| @@ -182,7 +182,7 @@ class TestUpload: | |
| count = 2 | |
| upload_size = 128*1024 | |
| url = f'https://localhost:{env.https_port}/curltest/put' | |
| - | client = LocalClient(name='hx_upload', env=env) |
| + | client = LocalClient(name='cli_hx_upload', env=env) |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| r = client.run(args=[ | |
| @@ -198,7 +198,7 @@ class TestUpload: | |
| count = 2 | |
| upload_size = 128*1024 | |
| url = f'https://localhost:{env.https_port}/curltest/echo' | |
| - | client = LocalClient(name='hx_upload', env=env) |
| + | client = LocalClient(name='cli_hx_upload', env=env) |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| r = client.run(args=[ | |
| @@ -503,7 +503,7 @@ class TestUpload: | |
| def test_07_42a_upload_disconnect(self, env: Env, httpd, nghttpx, proto): | |
| if proto == 'h3' and not env.have_h3(): | |
| pytest.skip("h3 not supported") | |
| - | client = LocalClient(name='upload_pausing', env=env, timeout=60) |
| + | client = LocalClient(name='cli_upload_pausing', env=env, timeout=60) |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=[0-0]&die_after=0' | |
| @@ -523,7 +523,7 @@ class TestUpload: | |
| def test_07_42b_upload_disconnect(self, env: Env, httpd, nghttpx, proto): | |
| if proto == 'h3' and not env.have_h3(): | |
| pytest.skip("h3 not supported") | |
| - | client = LocalClient(name='upload_pausing', env=env, timeout=60) |
| + | client = LocalClient(name='cli_upload_pausing', env=env, timeout=60) |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=0&just_die=1' | |
| @@ -538,7 +538,7 @@ class TestUpload: | |
| def test_07_42c_upload_disconnect(self, env: Env, httpd, nghttpx, proto): | |
| if proto == 'h3' and not env.have_h3(): | |
| pytest.skip("h3 not supported") | |
| - | client = LocalClient(name='upload_pausing', env=env, timeout=60) |
| + | client = LocalClient(name='cli_upload_pausing', env=env, timeout=60) |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| url = f'https://{env.authority_for(env.domain1, proto)}/curltest/echo?id=0&die_after_100=1' | |
| @@ -572,7 +572,7 @@ class TestUpload: | |
| count = 1 | |
| upload_size = 128*1024 | |
| url = f'https://localhost:{env.https_port}/curltest/put-redir-{httpcode}' | |
| - | client = LocalClient(name='hx_upload', env=env) |
| + | client = LocalClient(name='cli_hx_upload', env=env) |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| r = client.run(args=[ | |
| @@ -700,7 +700,7 @@ class TestUpload: | |
| if proto != 'h3': | |
| port = env.nghttpx_https_port | |
| url = f'https://{env.domain1}:{port}/curltest/put' | |
| - | client = LocalClient(name='hx_upload', env=env) |
| + | client = LocalClient(name='cli_hx_upload', env=env) |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| r = client.run(args=[ | |
tests/http/test_08_caddy.py+1 -1
| @@ -199,7 +199,7 @@ class TestCaddy: | |
| count = 2 | |
| docname = 'data10k.data' | |
| url = f'https://{env.domain1}:{caddy.port}/{docname}' | |
| - | client = LocalClient(name='hx_download', env=env) |
| + | client = LocalClient(name='cli_hx_download', env=env) |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| r = client.run(args=[ | |
tests/http/test_09_push.py+1 -1
| @@ -76,7 +76,7 @@ class TestPush: | |
| self.httpd_configure(env, httpd) | |
| # use localhost as we do not have resolve support in local client | |
| url = f'https://localhost:{env.https_port}/push/data1' | |
| - | client = LocalClient(name='h2_serverpush', env=env) |
| + | client = LocalClient(name='cli_h2_serverpush', env=env) |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| r = client.run(args=[url]) | |
tests/http/test_17_ssl_use.py+1 -1
| @@ -377,7 +377,7 @@ class TestSSLUse: | |
| count = 2 | |
| docname = 'data-10k' | |
| url = f'https://localhost:{env.https_port}/{docname}' | |
| - | client = LocalClient(name='hx_download', env=env) |
| + | client = LocalClient(name='cli_hx_download', env=env) |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| r = client.run(args=[ | |
tests/http/test_19_shutdown.py+2 -2
| @@ -112,7 +112,7 @@ class TestShutdown: | |
| count = 10 | |
| docname = 'data.json' | |
| url = f'https://localhost:{env.https_port}/{docname}' | |
| - | client = LocalClient(name='hx_download', env=env, run_env={ |
| + | client = LocalClient(name='cli_hx_download', env=env, run_env={ |
| 'CURL_GRACEFUL_SHUTDOWN': '2000', | |
| 'CURL_DEBUG': 'ssl,multi' | |
| }) | |
| @@ -185,7 +185,7 @@ class TestShutdown: | |
| count = 500 | |
| docname = 'data.json' | |
| url = f'https://localhost:{env.https_port}/{docname}' | |
| - | client = LocalClient(name='hx_download', env=env, run_env={ |
| + | client = LocalClient(name='cli_hx_download', env=env, run_env={ |
| 'CURL_GRACEFUL_SHUTDOWN': '2000', | |
| 'CURL_DEBUG': 'ssl,multi' | |
| }) | |
tests/http/test_20_websockets.py+7 -7
| @@ -109,7 +109,7 @@ class TestWebsockets: | |
| def test_20_02_pingpong_small(self, env: Env, ws_echo): | |
| payload = 125 * "x" | |
| - | client = LocalClient(env=env, name='ws_pingpong') |
| + | client = LocalClient(env=env, name='cli_ws_pingpong') |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| url = f'ws://localhost:{env.ws_port}/' | |
| @@ -119,7 +119,7 @@ class TestWebsockets: | |
| # the python websocket server does not like 'large' control frames | |
| def test_20_03_pingpong_too_large(self, env: Env, ws_echo): | |
| payload = 127 * "x" | |
| - | client = LocalClient(env=env, name='ws_pingpong') |
| + | client = LocalClient(env=env, name='cli_ws_pingpong') |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| url = f'ws://localhost:{env.ws_port}/' | |
| @@ -127,7 +127,7 @@ class TestWebsockets: | |
| r.check_exit_code(100) # CURLE_TOO_LARGE | |
| def test_20_04_data_small(self, env: Env, ws_echo): | |
| - | client = LocalClient(env=env, name='ws_data') |
| + | client = LocalClient(env=env, name='cli_ws_data') |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| url = f'ws://localhost:{env.ws_port}/' | |
| @@ -135,7 +135,7 @@ class TestWebsockets: | |
| r.check_exit_code(0) | |
| def test_20_05_data_med(self, env: Env, ws_echo): | |
| - | client = LocalClient(env=env, name='ws_data') |
| + | client = LocalClient(env=env, name='cli_ws_data') |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| url = f'ws://localhost:{env.ws_port}/' | |
| @@ -143,7 +143,7 @@ class TestWebsockets: | |
| r.check_exit_code(0) | |
| def test_20_06_data_large(self, env: Env, ws_echo): | |
| - | client = LocalClient(env=env, name='ws_data') |
| + | client = LocalClient(env=env, name='cli_ws_data') |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| url = f'ws://localhost:{env.ws_port}/' | |
| @@ -153,7 +153,7 @@ class TestWebsockets: | |
| def test_20_07_data_large_small_recv(self, env: Env, ws_echo): | |
| run_env = os.environ.copy() | |
| run_env['CURL_WS_CHUNK_SIZE'] = '1024' | |
| - | client = LocalClient(env=env, name='ws_data', run_env=run_env) |
| + | client = LocalClient(env=env, name='cli_ws_data', run_env=run_env) |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| url = f'ws://localhost:{env.ws_port}/' | |
| @@ -165,7 +165,7 @@ class TestWebsockets: | |
| def test_20_08_data_very_large(self, env: Env, ws_echo): | |
| run_env = os.environ.copy() | |
| run_env['CURL_WS_CHUNK_EAGAIN'] = '8192' | |
| - | client = LocalClient(env=env, name='ws_data', run_env=run_env) |
| + | client = LocalClient(env=env, name='cli_ws_data', run_env=run_env) |
| if not client.exists(): | |
| pytest.skip(f'example client not built: {client.name}') | |
| url = f'ws://localhost:{env.ws_port}/' | |
tests/http/testenv/client.py+1 -1
| @@ -44,7 +44,7 @@ class LocalClient: | |
| timeout: Optional[float] = None, | |
| run_env: Optional[Dict[str,str]] = None): | |
| self.name = name | |
| - | self.path = os.path.join(env.build_dir, 'tests/client/clients') |
| + | self.path = os.path.join(env.build_dir, 'tests/libtest/libtests') |
| self.env = env | |
| self._run_env = run_env | |
| self._timeout = timeout if timeout else env.test_timeout | |
tests/libtest/Makefile.inc+10 -0
| @@ -44,6 +44,16 @@ CURLX_C = \ | |
| # All libtest programs | |
| TESTS_C = \ | |
| + | cli_h2_pausing.c \ |
| + | cli_h2_serverpush.c \ |
| + | cli_h2_upgrade_extreme.c \ |
| + | cli_hx_download.c \ |
| + | cli_hx_upload.c \ |
| + | cli_tls_session_reuse.c \ |
| + | cli_upload_pausing.c \ |
| + | cli_ws_data.c \ |
| + | cli_ws_pingpong.c \ |
| + | \ |
| lib500.c lib501.c lib502.c lib503.c lib504.c lib505.c lib506.c lib507.c \ | |
| lib508.c lib509.c lib510.c lib511.c lib512.c lib513.c lib514.c lib515.c \ | |
| lib516.c lib517.c lib518.c lib519.c lib520.c lib521.c lib523.c lib524.c \ | |
tests/client/h2_pausing.c → tests/libtest/cli_h2_pausing.c+38 -26
| @@ -25,6 +25,9 @@ | |
| */ | |
| #include "first.h" | |
| + | #include "testtrace.h" |
| + | #include "memdebug.h" |
| + | |
| static void usage_h2_pausing(const char *msg) | |
| { | |
| if(msg) | |
| @@ -77,7 +80,13 @@ static size_t cb(char *data, size_t size, size_t nmemb, void *clientp) | |
| return realsize; | |
| } | |
| - | static int test_h2_pausing(int argc, char *argv[]) |
| + | #define CLI_ERR() \ |
| + | do { \ |
| + | curl_mfprintf(stderr, "something unexpected went wrong - bailing out!\n");\ |
| + | return (CURLcode)2; \ |
| + | } while(0) |
| + | |
| + | static CURLcode test_cli_h2_pausing(const char *URL) |
| { | |
| struct handle handles[2]; | |
| CURLM *multi_handle; | |
| @@ -85,21 +94,24 @@ static int test_h2_pausing(int argc, char *argv[]) | |
| size_t i; | |
| CURLMsg *msg; | |
| int rounds = 0; | |
| - | int rc = 0; |
| + | CURLcode rc = CURLE_OK; |
| CURLU *cu; | |
| struct curl_slist *resolve = NULL; | |
| char resolve_buf[1024]; | |
| - | char *url, *host = NULL, *port = NULL; |
| + | const char *url; |
| + | char *host = NULL, *port = NULL; |
| int all_paused = 0; | |
| int resume_round = -1; | |
| - | int http_version = CURL_HTTP_VERSION_2_0; |
| + | long http_version = CURL_HTTP_VERSION_2_0; |
| int ch; | |
| - | while((ch = cgetopt(argc, argv, "hV:")) != -1) { |
| + | (void)URL; |
| + | |
| + | while((ch = cgetopt(test_argc, test_argv, "hV:")) != -1) { |
| switch(ch) { | |
| case 'h': | |
| usage_h2_pausing(NULL); | |
| - | return 2; |
| + | return (CURLcode)2; |
| case 'V': { | |
| if(!strcmp("http/1.1", coptarg)) | |
| http_version = CURL_HTTP_VERSION_1_1; | |
| @@ -109,23 +121,23 @@ static int test_h2_pausing(int argc, char *argv[]) | |
| http_version = CURL_HTTP_VERSION_3ONLY; | |
| else { | |
| usage_h2_pausing("invalid http version"); | |
| - | return 1; |
| + | return (CURLcode)1; |
| } | |
| break; | |
| } | |
| default: | |
| usage_h2_pausing("invalid option"); | |
| - | return 1; |
| + | return (CURLcode)1; |
| } | |
| } | |
| - | argc -= coptind; |
| - | argv += coptind; |
| + | test_argc -= coptind; |
| + | test_argv += coptind; |
| - | if(argc != 1) { |
| + | if(test_argc != 1) { |
| curl_mfprintf(stderr, "ERROR: need URL as argument\n"); | |
| - | return 2; |
| + | return (CURLcode)2; |
| } | |
| - | url = argv[0]; |
| + | url = test_argv[0]; |
| curl_global_init(CURL_GLOBAL_DEFAULT); | |
| curl_global_trace("ids,time,http/2,http/3"); | |
| @@ -133,19 +145,19 @@ static int test_h2_pausing(int argc, char *argv[]) | |
| cu = curl_url(); | |
| if(!cu) { | |
| curl_mfprintf(stderr, "out of memory\n"); | |
| - | return 1; |
| + | return (CURLcode)1; |
| } | |
| if(curl_url_set(cu, CURLUPART_URL, url, 0)) { | |
| curl_mfprintf(stderr, "not a URL: '%s'\n", url); | |
| - | return 1; |
| + | return (CURLcode)1; |
| } | |
| if(curl_url_get(cu, CURLUPART_HOST, &host, 0)) { | |
| curl_mfprintf(stderr, "could not get host of '%s'\n", url); | |
| - | return 1; |
| + | return (CURLcode)1; |
| } | |
| if(curl_url_get(cu, CURLUPART_PORT, &port, 0)) { | |
| curl_mfprintf(stderr, "could not get port of '%s'\n", url); | |
| - | return 1; |
| + | return (CURLcode)1; |
| } | |
| memset(&resolve, 0, sizeof(resolve)); | |
| curl_msnprintf(resolve_buf, sizeof(resolve_buf)-1, "%s:%s:127.0.0.1", | |
| @@ -165,30 +177,30 @@ static int test_h2_pausing(int argc, char *argv[]) | |
| != CURLE_OK || | |
| curl_easy_setopt(handles[i].h, CURLOPT_FOLLOWLOCATION, 1L) != CURLE_OK || | |
| curl_easy_setopt(handles[i].h, CURLOPT_VERBOSE, 1L) != CURLE_OK || | |
| - | curl_easy_setopt(handles[i].h, CURLOPT_DEBUGFUNCTION, debug_cb) |
| + | curl_easy_setopt(handles[i].h, CURLOPT_DEBUGFUNCTION, cli_debug_cb) |
| != CURLE_OK || | |
| curl_easy_setopt(handles[i].h, CURLOPT_SSL_VERIFYPEER, 0L) != CURLE_OK || | |
| curl_easy_setopt(handles[i].h, CURLOPT_RESOLVE, resolve) != CURLE_OK || | |
| curl_easy_setopt(handles[i].h, CURLOPT_PIPEWAIT, 1L) || | |
| curl_easy_setopt(handles[i].h, CURLOPT_URL, url) != CURLE_OK) { | |
| - | ERR(); |
| + | CLI_ERR(); |
| } | |
| - | curl_easy_setopt(handles[i].h, CURLOPT_HTTP_VERSION, (long)http_version); |
| + | curl_easy_setopt(handles[i].h, CURLOPT_HTTP_VERSION, http_version); |
| } | |
| multi_handle = curl_multi_init(); | |
| if(!multi_handle) | |
| - | ERR(); |
| + | CLI_ERR(); |
| for(i = 0; i < CURL_ARRAYSIZE(handles); i++) { | |
| if(curl_multi_add_handle(multi_handle, handles[i].h) != CURLM_OK) | |
| - | ERR(); |
| + | CLI_ERR(); |
| } | |
| for(rounds = 0;; rounds++) { | |
| curl_mfprintf(stderr, "INFO: multi_perform round %d\n", rounds); | |
| if(curl_multi_perform(multi_handle, &still_running) != CURLM_OK) | |
| - | ERR(); |
| + | CLI_ERR(); |
| if(!still_running) { | |
| int as_expected = 1; | |
| @@ -216,13 +228,13 @@ static int test_h2_pausing(int argc, char *argv[]) | |
| if(!as_expected) { | |
| curl_mfprintf(stderr, "ERROR: handles not in expected state " | |
| "after %d rounds\n", rounds); | |
| - | rc = 1; |
| + | rc = (CURLcode)1; |
| } | |
| break; | |
| } | |
| if(curl_multi_poll(multi_handle, NULL, 0, 100, &numfds) != CURLM_OK) | |
| - | ERR(); |
| + | CLI_ERR(); |
| /* !checksrc! disable EQUALSNULL 1 */ | |
| while((msg = curl_multi_info_read(multi_handle, &msgs_left)) != NULL) { | |
| @@ -233,7 +245,7 @@ static int test_h2_pausing(int argc, char *argv[]) | |
| curl_mfprintf(stderr, "ERROR: [%d] done, pauses=%d, resumed=%d, " | |
| "result %d - wtf?\n", (int)i, handles[i].paused, | |
| handles[i].resumed, msg->data.result); | |
| - | rc = 1; |
| + | rc = (CURLcode)1; |
| goto out; | |
| } | |
| } | |
tests/client/h2_serverpush.c → tests/libtest/cli_h2_serverpush.c+13 -44
| @@ -23,41 +23,8 @@ | |
| ***************************************************************************/ | |
| #include "first.h" | |
| - | static int my_trace(CURL *handle, curl_infotype type, |
| - | char *data, size_t size, void *userp) |
| - | { |
| - | const char *text; |
| - | (void)handle; /* prevent compiler warning */ |
| - | (void)userp; |
| - | switch(type) { |
| - | case CURLINFO_TEXT: |
| - | curl_mfprintf(stderr, "== Info: %s", data); |
| - | return 0; |
| - | case CURLINFO_HEADER_OUT: |
| - | text = "=> Send header"; |
| - | break; |
| - | case CURLINFO_DATA_OUT: |
| - | text = "=> Send data"; |
| - | break; |
| - | case CURLINFO_SSL_DATA_OUT: |
| - | text = "=> Send SSL data"; |
| - | break; |
| - | case CURLINFO_HEADER_IN: |
| - | text = "<= Recv header"; |
| - | break; |
| - | case CURLINFO_DATA_IN: |
| - | text = "<= Recv data"; |
| - | break; |
| - | case CURLINFO_SSL_DATA_IN: |
| - | text = "<= Recv SSL data"; |
| - | break; |
| - | default: /* in case a new one is introduced to shock us */ |
| - | return 0; |
| - | } |
| - | |
| - | dump(text, (unsigned char *)data, size, 1); |
| - | return 0; |
| - | } |
| + | #include "testtrace.h" |
| + | #include "memdebug.h" |
| static FILE *out_download; | |
| @@ -76,7 +43,8 @@ static int setup_h2_serverpush(CURL *hnd, const char *url) | |
| /* please be verbose */ | |
| curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L); | |
| - | curl_easy_setopt(hnd, CURLOPT_DEBUGFUNCTION, my_trace); |
| + | curl_easy_setopt(hnd, CURLOPT_DEBUGFUNCTION, libtest_debug_cb); |
| + | curl_easy_setopt(hnd, CURLOPT_DEBUGDATA, &debug_config); |
| /* wait for pipe connection to confirm */ | |
| curl_easy_setopt(hnd, CURLOPT_PIPEWAIT, 1L); | |
| @@ -139,19 +107,20 @@ out: | |
| /* | |
| * Download a file over HTTP/2, take care of server push. | |
| */ | |
| - | static int test_h2_serverpush(int argc, char *argv[]) |
| + | static CURLcode test_cli_h2_serverpush(const char *URL) |
| { | |
| CURL *easy; | |
| CURLM *multi_handle; | |
| int transfers = 1; /* we start with one */ | |
| struct CURLMsg *m; | |
| - | const char *url; |
| - | if(argc != 2) { |
| + | debug_config.nohex = 1; |
| + | debug_config.tracetime = 0; |
| + | |
| + | if(!URL) { |
| curl_mfprintf(stderr, "need URL as argument\n"); | |
| - | return 2; |
| + | return (CURLcode)2; |
| } | |
| - | url = argv[1]; |
| multi_handle = curl_multi_init(); | |
| curl_multi_setopt(multi_handle, CURLMOPT_PIPELINING, CURLPIPE_MULTIPLEX); | |
| @@ -159,10 +128,10 @@ static int test_h2_serverpush(int argc, char *argv[]) | |
| curl_multi_setopt(multi_handle, CURLMOPT_PUSHDATA, &transfers); | |
| easy = curl_easy_init(); | |
| - | if(setup_h2_serverpush(easy, url)) { |
| + | if(setup_h2_serverpush(easy, URL)) { |
| fclose(out_download); | |
| curl_mfprintf(stderr, "failed\n"); | |
| - | return 1; |
| + | return (CURLcode)1; |
| } | |
| curl_multi_add_handle(multi_handle, easy); | |
| @@ -201,5 +170,5 @@ static int test_h2_serverpush(int argc, char *argv[]) | |
| if(out_push) | |
| fclose(out_push); | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
tests/client/h2_upgrade_extreme.c → tests/libtest/cli_h2_upgrade_extreme.c+11 -10
| @@ -23,6 +23,9 @@ | |
| ***************************************************************************/ | |
| #include "first.h" | |
| + | #include "testtrace.h" |
| + | #include "memdebug.h" |
| + | |
| static size_t write_h2_upg_extreme_cb(char *ptr, size_t size, size_t nmemb, | |
| void *opaque) | |
| { | |
| @@ -31,9 +34,8 @@ static size_t write_h2_upg_extreme_cb(char *ptr, size_t size, size_t nmemb, | |
| return size * nmemb; | |
| } | |
| - | static int test_h2_upgrade_extreme(int argc, char *argv[]) |
| + | static CURLcode test_cli_h2_upgrade_extreme(const char *URL) |
| { | |
| - | const char *url; |
| CURLM *multi = NULL; | |
| CURL *easy; | |
| CURLMcode mc; | |
| @@ -41,14 +43,13 @@ static int test_h2_upgrade_extreme(int argc, char *argv[]) | |
| CURLMsg *msg; | |
| int msgs_in_queue; | |
| char range[128]; | |
| - | int exitcode = 1; |
| + | CURLcode exitcode = (CURLcode)1; |
| - | if(argc != 2) { |
| - | curl_mfprintf(stderr, "%s URL\n", argv[0]); |
| - | return 2; |
| + | if(!URL) { |
| + | curl_mfprintf(stderr, "need URL as argument\n"); |
| + | return (CURLcode)2; |
| } | |
| - | url = argv[1]; |
| multi = curl_multi_init(); | |
| if(!multi) { | |
| curl_mfprintf(stderr, "curl_multi_init failed\n"); | |
| @@ -64,8 +65,8 @@ static int test_h2_upgrade_extreme(int argc, char *argv[]) | |
| goto cleanup; | |
| } | |
| curl_easy_setopt(easy, CURLOPT_VERBOSE, 1L); | |
| - | curl_easy_setopt(easy, CURLOPT_DEBUGFUNCTION, debug_cb); |
| - | curl_easy_setopt(easy, CURLOPT_URL, url); |
| + | curl_easy_setopt(easy, CURLOPT_DEBUGFUNCTION, cli_debug_cb); |
| + | curl_easy_setopt(easy, CURLOPT_URL, URL); |
| curl_easy_setopt(easy, CURLOPT_NOSIGNAL, 1L); | |
| curl_easy_setopt(easy, CURLOPT_AUTOREFERER, 1L); | |
| curl_easy_setopt(easy, CURLOPT_FAILONERROR, 1L); | |
| @@ -143,7 +144,7 @@ static int test_h2_upgrade_extreme(int argc, char *argv[]) | |
| } while(running_handles > 0 || start_count); | |
| curl_mfprintf(stderr, "exiting\n"); | |
| - | exitcode = 0; |
| + | exitcode = CURLE_OK; |
| cleanup: | |
tests/client/hx_download.c → tests/libtest/cli_hx_download.c+23 -17
| @@ -23,6 +23,9 @@ | |
| ***************************************************************************/ | |
| #include "first.h" | |
| + | #include "testtrace.h" |
| + | #include "memdebug.h" |
| + | |
| static int verbose_d = 1; | |
| struct transfer_d { | |
| @@ -140,7 +143,7 @@ static int setup_hx_download(CURL *hnd, const char *url, struct transfer_d *t, | |
| /* please be verbose */ | |
| if(verbose_d) { | |
| curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L); | |
| - | curl_easy_setopt(hnd, CURLOPT_DEBUGFUNCTION, debug_cb); |
| + | curl_easy_setopt(hnd, CURLOPT_DEBUGFUNCTION, cli_debug_cb); |
| } | |
| /* wait for pipe connection to confirm */ | |
| @@ -175,7 +178,7 @@ static void usage_hx_download(const char *msg) | |
| /* | |
| * Download a file over HTTP/2, take care of server push. | |
| */ | |
| - | static int test_hx_download(int argc, char *argv[]) |
| + | static CURLcode test_cli_hx_download(const char *URL) |
| { | |
| CURLM *multi_handle; | |
| struct CURLMsg *m; | |
| @@ -188,20 +191,23 @@ static int test_hx_download(int argc, char *argv[]) | |
| size_t fail_offset = 0; | |
| int abort_paused = 0, use_earlydata = 0; | |
| struct transfer_d *t; | |
| - | int http_version = CURL_HTTP_VERSION_2_0; |
| + | long http_version = CURL_HTTP_VERSION_2_0; |
| int ch; | |
| struct curl_slist *host = NULL; | |
| char *resolve = NULL; | |
| size_t max_host_conns = 0; | |
| size_t max_total_conns = 0; | |
| int fresh_connect = 0; | |
| - | int result = 0; |
| + | CURLcode result = CURLE_OK; |
| + | |
| + | (void)URL; |
| - | while((ch = cgetopt(argc, argv, "aefhm:n:xA:F:M:P:r:T:V:")) != -1) { |
| + | while((ch = cgetopt(test_argc, test_argv, "aefhm:n:xA:F:M:P:r:T:V:")) |
| + | != -1) { |
| switch(ch) { | |
| case 'h': | |
| usage_hx_download(NULL); | |
| - | result = 2; |
| + | result = (CURLcode)2; |
| goto cleanup; | |
| case 'a': | |
| abort_paused = 1; | |
| @@ -249,29 +255,29 @@ static int test_hx_download(int argc, char *argv[]) | |
| http_version = CURL_HTTP_VERSION_3ONLY; | |
| else { | |
| usage_hx_download("invalid http version"); | |
| - | result = 1; |
| + | result = (CURLcode)1; |
| goto cleanup; | |
| } | |
| break; | |
| } | |
| default: | |
| usage_hx_download("invalid option"); | |
| - | result = 1; |
| + | result = (CURLcode)1; |
| goto cleanup; | |
| } | |
| } | |
| - | argc -= coptind; |
| - | argv += coptind; |
| + | test_argc -= coptind; |
| + | test_argv += coptind; |
| curl_global_init(CURL_GLOBAL_DEFAULT); | |
| curl_global_trace("ids,time,http/2,http/3"); | |
| - | if(argc != 1) { |
| + | if(test_argc != 1) { |
| usage_hx_download("not enough arguments"); | |
| - | result = 2; |
| + | result = (CURLcode)2; |
| goto cleanup; | |
| } | |
| - | url = argv[0]; |
| + | url = test_argv[0]; |
| if(resolve) | |
| host = curl_slist_append(NULL, resolve); | |
| @@ -279,7 +285,7 @@ static int test_hx_download(int argc, char *argv[]) | |
| share = curl_share_init(); | |
| if(!share) { | |
| curl_mfprintf(stderr, "error allocating share\n"); | |
| - | result = 1; |
| + | result = (CURLcode)1; |
| goto cleanup; | |
| } | |
| curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_COOKIE); | |
| @@ -292,7 +298,7 @@ static int test_hx_download(int argc, char *argv[]) | |
| transfer_d = calloc(transfer_count_d, sizeof(*transfer_d)); | |
| if(!transfer_d) { | |
| curl_mfprintf(stderr, "error allocating transfer structs\n"); | |
| - | result = 1; |
| + | result = (CURLcode)1; |
| goto cleanup; | |
| } | |
| @@ -320,7 +326,7 @@ static int test_hx_download(int argc, char *argv[]) | |
| setup_hx_download(t->easy, url, t, http_version, host, share, | |
| use_earlydata, fresh_connect)) { | |
| curl_mfprintf(stderr, "[t-%d] FAILED setup\n", (int)i); | |
| - | result = 1; |
| + | result = (CURLcode)1; |
| goto cleanup; | |
| } | |
| curl_multi_add_handle(multi_handle, t->easy); | |
| @@ -403,7 +409,7 @@ static int test_hx_download(int argc, char *argv[]) | |
| setup_hx_download(t->easy, url, t, http_version, host, share, | |
| use_earlydata, fresh_connect)) { | |
| curl_mfprintf(stderr, "[t-%d] FAILED setup\n", (int)i); | |
| - | result = 1; |
| + | result = (CURLcode)1; |
| goto cleanup; | |
| } | |
| curl_multi_add_handle(multi_handle, t->easy); | |
tests/client/hx_upload.c → tests/libtest/cli_hx_upload.c+26 -20
| @@ -23,6 +23,9 @@ | |
| ***************************************************************************/ | |
| #include "first.h" | |
| + | #include "testtrace.h" |
| + | #include "memdebug.h" |
| + | |
| static int verbose_u = 1; | |
| struct transfer_u { | |
| @@ -175,7 +178,7 @@ static int setup_hx_upload(CURL *hnd, const char *url, struct transfer_u *t, | |
| /* please be verbose */ | |
| if(verbose_u) { | |
| curl_easy_setopt(hnd, CURLOPT_VERBOSE, 1L); | |
| - | curl_easy_setopt(hnd, CURLOPT_DEBUGFUNCTION, debug_cb); |
| + | curl_easy_setopt(hnd, CURLOPT_DEBUGFUNCTION, cli_debug_cb); |
| } | |
| /* wait for pipe connection to confirm */ | |
| @@ -207,7 +210,7 @@ static void usage_hx_upload(const char *msg) | |
| /* | |
| * Download a file over HTTP/2, take care of server push. | |
| */ | |
| - | static int test_hx_upload(int argc, char *argv[]) |
| + | static CURLcode test_cli_hx_upload(const char *URL) |
| { | |
| CURLM *multi_handle; | |
| CURLSH *share; | |
| @@ -224,16 +227,19 @@ static int test_hx_upload(int argc, char *argv[]) | |
| int use_earlydata = 0; | |
| int announce_length = 0; | |
| struct transfer_u *t; | |
| - | int http_version = CURL_HTTP_VERSION_2_0; |
| + | long http_version = CURL_HTTP_VERSION_2_0; |
| struct curl_slist *host = NULL; | |
| const char *resolve = NULL; | |
| int ch; | |
| - | while((ch = cgetopt(argc, argv, "aefhlm:n:A:F:M:P:r:RS:V:")) != -1) { |
| + | (void)URL; |
| + | |
| + | while((ch = cgetopt(test_argc, test_argv, "aefhlm:n:A:F:M:P:r:RS:V:")) |
| + | != -1) { |
| switch(ch) { | |
| case 'h': | |
| usage_hx_upload(NULL); | |
| - | return 2; |
| + | return (CURLcode)2; |
| case 'a': | |
| abort_paused = 1; | |
| break; | |
| @@ -282,31 +288,31 @@ static int test_hx_upload(int argc, char *argv[]) | |
| http_version = CURL_HTTP_VERSION_3ONLY; | |
| else { | |
| usage_hx_upload("invalid http version"); | |
| - | return 1; |
| + | return (CURLcode)1; |
| } | |
| break; | |
| } | |
| default: | |
| usage_hx_upload("invalid option"); | |
| - | return 1; |
| + | return (CURLcode)1; |
| } | |
| } | |
| - | argc -= coptind; |
| - | argv += coptind; |
| + | test_argc -= coptind; |
| + | test_argv += coptind; |
| if(max_parallel > 1 && reuse_easy) { | |
| usage_hx_upload("cannot mix -R and -P"); | |
| - | return 2; |
| + | return (CURLcode)2; |
| } | |
| curl_global_init(CURL_GLOBAL_DEFAULT); | |
| curl_global_trace("ids,time,http/2,http/3"); | |
| - | if(argc != 1) { |
| + | if(test_argc != 1) { |
| usage_hx_upload("not enough arguments"); | |
| - | return 2; |
| + | return (CURLcode)2; |
| } | |
| - | url = argv[0]; |
| + | url = test_argv[0]; |
| if(resolve) | |
| host = curl_slist_append(NULL, resolve); | |
| @@ -314,7 +320,7 @@ static int test_hx_upload(int argc, char *argv[]) | |
| share = curl_share_init(); | |
| if(!share) { | |
| curl_mfprintf(stderr, "error allocating share\n"); | |
| - | return 1; |
| + | return (CURLcode)1; |
| } | |
| curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_COOKIE); | |
| curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_DNS); | |
| @@ -326,7 +332,7 @@ static int test_hx_upload(int argc, char *argv[]) | |
| transfer_u = calloc(transfer_count_u, sizeof(*transfer_u)); | |
| if(!transfer_u) { | |
| curl_mfprintf(stderr, "error allocating transfer structs\n"); | |
| - | return 1; |
| + | return (CURLcode)1; |
| } | |
| active_transfers = 0; | |
| @@ -345,7 +351,7 @@ static int test_hx_upload(int argc, char *argv[]) | |
| CURLcode rc = CURLE_OK; | |
| if(!easy) { | |
| curl_mfprintf(stderr, "failed to init easy handle\n"); | |
| - | return 1; |
| + | return (CURLcode)1; |
| } | |
| for(i = 0; i < transfer_count_u; ++i) { | |
| t = &transfer_u[i]; | |
| @@ -353,7 +359,7 @@ static int test_hx_upload(int argc, char *argv[]) | |
| if(setup_hx_upload(t->easy, url, t, http_version, host, share, | |
| use_earlydata, announce_length)) { | |
| curl_mfprintf(stderr, "[t-%d] FAILED setup\n", (int)i); | |
| - | return 1; |
| + | return (CURLcode)1; |
| } | |
| curl_mfprintf(stderr, "[t-%d] STARTING\n", t->idx); | |
| @@ -375,7 +381,7 @@ static int test_hx_upload(int argc, char *argv[]) | |
| if(!t->easy || setup_hx_upload(t->easy, url, t, http_version, host, | |
| share, use_earlydata, announce_length)) { | |
| curl_mfprintf(stderr, "[t-%d] FAILED setup\n", (int)i); | |
| - | return 1; |
| + | return (CURLcode)1; |
| } | |
| curl_multi_add_handle(multi_handle, t->easy); | |
| t->started = 1; | |
| @@ -460,7 +466,7 @@ static int test_hx_upload(int argc, char *argv[]) | |
| host, share, use_earlydata, | |
| announce_length)) { | |
| curl_mfprintf(stderr, "[t-%d] FAILED setup\n", (int)i); | |
| - | return 1; |
| + | return (CURLcode)1; |
| } | |
| curl_multi_add_handle(multi_handle, t->easy); | |
| t->started = 1; | |
| @@ -494,5 +500,5 @@ static int test_hx_upload(int argc, char *argv[]) | |
| free(transfer_u); | |
| curl_share_cleanup(share); | |
| - | return 0; |
| + | return CURLE_OK; |
| } | |
tests/client/tls_session_reuse.c → tests/libtest/cli_tls_session_reuse.c+20 -19
| @@ -23,6 +23,9 @@ | |
| ***************************************************************************/ | |
| #include "first.h" | |
| + | #include "testtrace.h" |
| + | #include "memdebug.h" |
| + | |
| static int tse_found_tls_session = FALSE; | |
| static size_t write_tse_cb(char *ptr, size_t size, size_t nmemb, void *opaque) | |
| @@ -67,7 +70,7 @@ static CURL *tse_add_transfer(CURLM *multi, CURLSH *share, | |
| return NULL; | |
| } | |
| curl_easy_setopt(easy, CURLOPT_VERBOSE, 1L); | |
| - | curl_easy_setopt(easy, CURLOPT_DEBUGFUNCTION, debug_cb); |
| + | curl_easy_setopt(easy, CURLOPT_DEBUGFUNCTION, cli_debug_cb); |
| curl_easy_setopt(easy, CURLOPT_URL, url); | |
| curl_easy_setopt(easy, CURLOPT_SHARE, share); | |
| curl_easy_setopt(easy, CURLOPT_NOSIGNAL, 1L); | |
| @@ -92,9 +95,8 @@ static CURL *tse_add_transfer(CURLM *multi, CURLSH *share, | |
| return easy; | |
| } | |
| - | static int test_tls_session_reuse(int argc, char *argv[]) |
| + | static CURLcode test_cli_tls_session_reuse(const char *URL) |
| { | |
| - | const char *url; |
| CURLM *multi = NULL; | |
| CURLMcode mc; | |
| int running_handles = 0, numfds; | |
| @@ -106,35 +108,34 @@ static int test_tls_session_reuse(int argc, char *argv[]) | |
| int msgs_in_queue; | |
| int add_more, waits, ongoing = 0; | |
| char *host = NULL, *port = NULL; | |
| - | int http_version = CURL_HTTP_VERSION_1_1; |
| - | int exitcode = 1; |
| + | long http_version = CURL_HTTP_VERSION_1_1; |
| + | CURLcode exitcode = (CURLcode)1; |
| - | if(argc != 3) { |
| - | curl_mfprintf(stderr, "%s proto URL\n", argv[0]); |
| - | return 2; |
| + | if(!URL || !libtest_arg2) { |
| + | curl_mfprintf(stderr, "need args: URL proto\n"); |
| + | return (CURLcode)2; |
| } | |
| - | if(!strcmp("h2", argv[1])) |
| + | if(!strcmp("h2", libtest_arg2)) |
| http_version = CURL_HTTP_VERSION_2; | |
| - | else if(!strcmp("h3", argv[1])) |
| + | else if(!strcmp("h3", libtest_arg2)) |
| http_version = CURL_HTTP_VERSION_3ONLY; | |
| - | url = argv[2]; |
| cu = curl_url(); | |
| if(!cu) { | |
| curl_mfprintf(stderr, "out of memory\n"); | |
| - | return 1; |
| + | return (CURLcode)1; |
| } | |
| - | if(curl_url_set(cu, CURLUPART_URL, url, 0)) { |
| - | curl_mfprintf(stderr, "not a URL: '%s'\n", url); |
| + | if(curl_url_set(cu, CURLUPART_URL, URL, 0)) { |
| + | curl_mfprintf(stderr, "not a URL: '%s'\n", URL); |
| goto cleanup; | |
| } | |
| if(curl_url_get(cu, CURLUPART_HOST, &host, 0)) { | |
| - | curl_mfprintf(stderr, "could not get host of '%s'\n", url); |
| + | curl_mfprintf(stderr, "could not get host of '%s'\n", URL); |
| goto cleanup; | |
| } | |
| if(curl_url_get(cu, CURLUPART_PORT, &port, 0)) { | |
| - | curl_mfprintf(stderr, "could not get port of '%s'\n", url); |
| + | curl_mfprintf(stderr, "could not get port of '%s'\n", URL); |
| goto cleanup; | |
| } | |
| @@ -156,7 +157,7 @@ static int test_tls_session_reuse(int argc, char *argv[]) | |
| curl_share_setopt(share, CURLSHOPT_SHARE, CURL_LOCK_DATA_SSL_SESSION); | |
| - | if(!tse_add_transfer(multi, share, resolve, url, http_version)) |
| + | if(!tse_add_transfer(multi, share, resolve, URL, http_version)) |
| goto cleanup; | |
| ++ongoing; | |
| add_more = 6; | |
| @@ -183,7 +184,7 @@ static int test_tls_session_reuse(int argc, char *argv[]) | |
| } | |
| else { | |
| while(add_more) { | |
| - | if(!tse_add_transfer(multi, share, resolve, url, http_version)) |
| + | if(!tse_add_transfer(multi, share, resolve, URL, http_version)) |
| goto cleanup; | |
| ++ongoing; | |
| --add_more; | |
| @@ -234,7 +235,7 @@ static int test_tls_session_reuse(int argc, char *argv[]) | |
| } | |
| curl_mfprintf(stderr, "exiting\n"); | |
| - | exitcode = 0; |
| + | exitcode = CURLE_OK; |
| cleanup: | |
tests/client/upload_pausing.c → tests/libtest/cli_upload_pausing.c+27 -20
| @@ -25,6 +25,9 @@ | |
| */ | |
| #include "first.h" | |
| + | #include "testtrace.h" |
| + | #include "memdebug.h" |
| + | |
| static size_t total_read = 0; | |
| static size_t read_callback(char *ptr, size_t size, size_t nmemb, | |
| @@ -80,18 +83,21 @@ static void usage_upload_pausing(const char *msg) | |
| ); | |
| } | |
| - | static int test_upload_pausing(int argc, char *argv[]) |
| + | static CURLcode test_cli_upload_pausing(const char *URL) |
| { | |
| CURL *curl; | |
| CURLcode rc = CURLE_OK; | |
| CURLU *cu; | |
| struct curl_slist *resolve = NULL; | |
| char resolve_buf[1024]; | |
| - | char *url, *host = NULL, *port = NULL; |
| + | const char *url; |
| + | char *host = NULL, *port = NULL; |
| long http_version = CURL_HTTP_VERSION_1_1; | |
| int ch; | |
| - | while((ch = cgetopt(argc, argv, "V:")) != -1) { |
| + | (void)URL; |
| + | |
| + | while((ch = cgetopt(test_argc, test_argv, "V:")) != -1) { |
| switch(ch) { | |
| case 'V': { | |
| if(!strcmp("http/1.1", coptarg)) | |
| @@ -102,23 +108,23 @@ static int test_upload_pausing(int argc, char *argv[]) | |
| http_version = CURL_HTTP_VERSION_3ONLY; | |
| else { | |
| usage_upload_pausing("invalid http version"); | |
| - | return 1; |
| + | return (CURLcode)1; |
| } | |
| break; | |
| } | |
| default: | |
| usage_upload_pausing("invalid option"); | |
| - | return 1; |
| + | return (CURLcode)1; |
| } | |
| } | |
| - | argc -= coptind; |
| - | argv += coptind; |
| + | test_argc -= coptind; |
| + | test_argv += coptind; |
| - | if(argc != 1) { |
| + | if(test_argc != 1) { |
| usage_upload_pausing("not enough arguments"); | |
| - | return 2; |
| + | return (CURLcode)2; |
| } | |
| - | url = argv[0]; |
| + | url = test_argv[0]; |
| curl_global_init(CURL_GLOBAL_DEFAULT); | |
| curl_global_trace("ids,time"); | |
| @@ -126,19 +132,19 @@ static int test_upload_pausing(int argc, char *argv[]) | |
| cu = curl_url(); | |
| if(!cu) { | |
| curl_mfprintf(stderr, "out of memory\n"); | |
| - | return 1; |
| + | return (CURLcode)1; |
| } | |
| if(curl_url_set(cu, CURLUPART_URL, url, 0)) { | |
| curl_mfprintf(stderr, "not a URL: '%s'\n", url); | |
| - | return 1; |
| + | return (CURLcode)1; |
| } | |
| if(curl_url_get(cu, CURLUPART_HOST, &host, 0)) { | |
| curl_mfprintf(stderr, "could not get host of '%s'\n", url); | |
| - | return 1; |
| + | return (CURLcode)1; |
| } | |
| if(curl_url_get(cu, CURLUPART_PORT, &port, 0)) { | |
| curl_mfprintf(stderr, "could not get port of '%s'\n", url); | |
| - | return 1; |
| + | return (CURLcode)1; |
| } | |
| memset(&resolve, 0, sizeof(resolve)); | |
| curl_msnprintf(resolve_buf, sizeof(resolve_buf)-1, "%s:%s:127.0.0.1", | |
| @@ -148,7 +154,7 @@ static int test_upload_pausing(int argc, char *argv[]) | |
| curl = curl_easy_init(); | |
| if(!curl) { | |
| curl_mfprintf(stderr, "out of memory\n"); | |
| - | return 1; |
| + | return (CURLcode)1; |
| } | |
| /* We want to use our own read function. */ | |
| curl_easy_setopt(curl, CURLOPT_READFUNCTION, read_callback); | |
| @@ -172,10 +178,11 @@ static int test_upload_pausing(int argc, char *argv[]) | |
| curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L); | |
| if(curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L) != CURLE_OK || | |
| - | curl_easy_setopt(curl, CURLOPT_DEBUGFUNCTION, debug_cb) |
| - | != CURLE_OK || |
| - | curl_easy_setopt(curl, CURLOPT_RESOLVE, resolve) != CURLE_OK) |
| - | ERR(); |
| + | curl_easy_setopt(curl, CURLOPT_DEBUGFUNCTION, cli_debug_cb) != CURLE_OK || |
| + | curl_easy_setopt(curl, CURLOPT_RESOLVE, resolve) != CURLE_OK) { |
| + | curl_mfprintf(stderr, "something unexpected went wrong - bailing out!\n"); |
| + | return (CURLcode)2; |
| + | } |
| curl_easy_setopt(curl, CURLOPT_URL, url); | |
| curl_easy_setopt(curl, CURLOPT_HTTP_VERSION, http_version); | |
| @@ -192,5 +199,5 @@ static int test_upload_pausing(int argc, char *argv[]) | |
| curl_url_cleanup(cu); | |
| curl_global_cleanup(); | |
| - | return (int)rc; |
| + | return rc; |
| } | |
tests/client/ws_data.c → tests/libtest/cli_ws_data.c+19 -13
| @@ -23,6 +23,9 @@ | |
| ***************************************************************************/ | |
| #include "first.h" | |
| + | #include "testtrace.h" |
| + | #include "memdebug.h" |
| + | |
| #ifndef CURL_DISABLE_WEBSOCKETS | |
| static CURLcode check_recv(const struct curl_ws_frame *frame, | |
| @@ -144,8 +147,10 @@ static CURLcode data_echo(CURL *curl, size_t count, | |
| if(memcmp(send_buf, recv_buf, len)) { | |
| curl_mfprintf(stderr, "recv_data: data differs\n"); | |
| - | dump("expected:", (unsigned char *)send_buf, len, 0); |
| - | dump("received:", (unsigned char *)recv_buf, len, 0); |
| + | debug_dump("", "expected:", stderr, |
| + | (const unsigned char *)send_buf, len, 0); |
| + | debug_dump("", "received:", stderr, |
| + | (const unsigned char *)recv_buf, len, 0); |
| r = CURLE_RECV_ERROR; | |
| goto out; | |
| } | |
| @@ -153,7 +158,7 @@ static CURLcode data_echo(CURL *curl, size_t count, | |
| out: | |
| if(!r) | |
| - | websocket_close(curl); |
| + | ws_close(curl); |
| free(send_buf); | |
| free(recv_buf); | |
| return r; | |
| @@ -172,7 +177,7 @@ static void usage_ws_data(const char *msg) | |
| #endif | |
| - | static int test_ws_data(int argc, char *argv[]) |
| + | static CURLcode test_cli_ws_data(const char *URL) |
| { | |
| #ifndef CURL_DISABLE_WEBSOCKETS | |
| CURL *curl; | |
| @@ -181,7 +186,9 @@ static int test_ws_data(int argc, char *argv[]) | |
| size_t plen_min = 0, plen_max = 0, count = 1; | |
| int ch; | |
| - | while((ch = cgetopt(argc, argv, "c:hm:M:")) != -1) { |
| + | (void)URL; |
| + | |
| + | while((ch = cgetopt(test_argc, test_argv, "c:hm:M:")) != -1) { |
| switch(ch) { | |
| case 'h': | |
| usage_ws_data(NULL); | |
| @@ -202,8 +209,8 @@ static int test_ws_data(int argc, char *argv[]) | |
| goto cleanup; | |
| } | |
| } | |
| - | argc -= coptind; |
| - | argv += coptind; |
| + | test_argc -= coptind; |
| + | test_argv += coptind; |
| if(!plen_max) | |
| plen_max = plen_min; | |
| @@ -215,12 +222,12 @@ static int test_ws_data(int argc, char *argv[]) | |
| goto cleanup; | |
| } | |
| - | if(argc != 1) { |
| + | if(test_argc != 1) { |
| usage_ws_data(NULL); | |
| res = CURLE_BAD_FUNCTION_ARGUMENT; | |
| goto cleanup; | |
| } | |
| - | url = argv[0]; |
| + | url = test_argv[0]; |
| curl_global_init(CURL_GLOBAL_ALL); | |
| @@ -243,12 +250,11 @@ static int test_ws_data(int argc, char *argv[]) | |
| cleanup: | |
| curl_global_cleanup(); | |
| - | return (int)res; |
| + | return res; |
| #else /* !CURL_DISABLE_WEBSOCKETS */ | |
| - | (void)argc; |
| - | (void)argv; |
| + | (void)URL; |
| curl_mfprintf(stderr, "WebSockets not enabled in libcurl\n"); | |
| - | return 1; |
| + | return (CURLcode)1; |
| #endif /* CURL_DISABLE_WEBSOCKETS */ | |
| } | |
tests/client/ws_pingpong.c → tests/libtest/cli_ws_pingpong.c+17 -56
| @@ -23,91 +23,53 @@ | |
| ***************************************************************************/ | |
| #include "first.h" | |
| - | #ifndef CURL_DISABLE_WEBSOCKETS |
| - | |
| - | static CURLcode ping(CURL *curl, const char *send_payload) |
| - | { |
| - | size_t sent; |
| - | CURLcode result = |
| - | curl_ws_send(curl, send_payload, strlen(send_payload), &sent, 0, |
| - | CURLWS_PING); |
| - | curl_mfprintf(stderr, "ws: curl_ws_send returned %u, sent %u\n", |
| - | (int)result, (int)sent); |
| - | |
| - | return result; |
| - | } |
| - | |
| - | static CURLcode recv_pong(CURL *curl, const char *expected_payload) |
| - | { |
| - | size_t rlen; |
| - | const struct curl_ws_frame *meta; |
| - | char buffer[256]; |
| - | CURLcode result = curl_ws_recv(curl, buffer, sizeof(buffer), &rlen, &meta); |
| - | if(result) { |
| - | curl_mfprintf(stderr, "ws: curl_ws_recv returned %u, received %ld\n", |
| - | (int)result, (long)rlen); |
| - | return result; |
| - | } |
| - | |
| - | if(!(meta->flags & CURLWS_PONG)) { |
| - | curl_mfprintf(stderr, "recv_pong: wrong frame, got %d bytes rflags %x\n", |
| - | (int)rlen, meta->flags); |
| - | return CURLE_RECV_ERROR; |
| - | } |
| + | #include "testtrace.h" |
| + | #include "memdebug.h" |
| - | curl_mfprintf(stderr, "ws: got PONG back\n"); |
| - | if(rlen == strlen(expected_payload) && |
| - | !memcmp(expected_payload, buffer, rlen)) { |
| - | curl_mfprintf(stderr, "ws: got the same payload back\n"); |
| - | return CURLE_OK; |
| - | } |
| - | curl_mfprintf(stderr, "ws: did NOT get the same payload back\n"); |
| - | return CURLE_RECV_ERROR; |
| - | } |
| + | #ifndef CURL_DISABLE_WEBSOCKETS |
| static CURLcode pingpong(CURL *curl, const char *payload) | |
| { | |
| CURLcode res; | |
| int i; | |
| - | res = ping(curl, payload); |
| + | res = ws_send_ping(curl, payload); |
| if(res) | |
| return res; | |
| for(i = 0; i < 10; ++i) { | |
| curl_mfprintf(stderr, "Receive pong\n"); | |
| - | res = recv_pong(curl, payload); |
| + | res = ws_recv_pong(curl, payload); |
| if(res == CURLE_AGAIN) { | |
| curlx_wait_ms(100); | |
| continue; | |
| } | |
| - | websocket_close(curl); |
| + | ws_close(curl); |
| return res; | |
| } | |
| - | websocket_close(curl); |
| + | ws_close(curl); |
| return CURLE_RECV_ERROR; | |
| } | |
| #endif | |
| - | static int test_ws_pingpong(int argc, char *argv[]) |
| + | static CURLcode test_cli_ws_pingpong(const char *URL) |
| { | |
| #ifndef CURL_DISABLE_WEBSOCKETS | |
| CURL *curl; | |
| CURLcode res = CURLE_OK; | |
| - | const char *url, *payload; |
| + | const char *payload; |
| - | if(argc != 3) { |
| - | curl_mfprintf(stderr, "usage: ws-pingpong url payload\n"); |
| - | return 2; |
| + | if(!URL || !libtest_arg2) { |
| + | curl_mfprintf(stderr, "need args: URL payload\n"); |
| + | return (CURLcode)2; |
| } | |
| - | url = argv[1]; |
| - | payload = argv[2]; |
| + | payload = libtest_arg2; |
| curl_global_init(CURL_GLOBAL_ALL); | |
| curl = curl_easy_init(); | |
| if(curl) { | |
| - | curl_easy_setopt(curl, CURLOPT_URL, url); |
| + | curl_easy_setopt(curl, CURLOPT_URL, URL); |
| /* use the callback style */ | |
| curl_easy_setopt(curl, CURLOPT_USERAGENT, "ws-pingpong"); | |
| @@ -122,12 +84,11 @@ static int test_ws_pingpong(int argc, char *argv[]) | |
| curl_easy_cleanup(curl); | |
| } | |
| curl_global_cleanup(); | |
| - | return (int)res; |
| + | return res; |
| #else /* !CURL_DISABLE_WEBSOCKETS */ | |
| - | (void)argc; |
| - | (void)argv; |
| + | (void)URL; |
| curl_mfprintf(stderr, "WebSockets not enabled in libcurl\n"); | |
| - | return 1; |
| + | return (CURLcode)1; |
| #endif /* CURL_DISABLE_WEBSOCKETS */ | |
| } | |
tests/libtest/first.c+121 -7
| @@ -61,6 +61,69 @@ struct curltime tv_test_start; /* for test timing */ | |
| int unitfail; /* for unittests */ | |
| + | int coptind; |
| + | const char *coptarg; |
| + | |
| + | int cgetopt(int argc, const char * const argv[], const char *optstring) |
| + | { |
| + | static int optpos = 1; |
| + | int coptopt; |
| + | const char *arg; |
| + | |
| + | if(coptind == 0) { /* Reset? */ |
| + | coptind = !!argc; |
| + | optpos = 1; |
| + | } |
| + | |
| + | arg = argv[coptind]; |
| + | if(arg && strcmp(arg, "--") == 0) { |
| + | coptind++; |
| + | return -1; |
| + | } |
| + | else if(!arg || arg[0] != '-') { |
| + | return -1; |
| + | } |
| + | else { |
| + | const char *opt = strchr(optstring, arg[optpos]); |
| + | coptopt = arg[optpos]; |
| + | if(!opt) { |
| + | if(!arg[++optpos]) { |
| + | coptind++; |
| + | optpos = 1; |
| + | } |
| + | return '?'; |
| + | } |
| + | else if(opt[1] == ':') { |
| + | if(arg[optpos + 1]) { |
| + | coptarg = arg + optpos + 1; |
| + | coptind++; |
| + | optpos = 1; |
| + | return coptopt; |
| + | } |
| + | else if(argv[coptind + 1]) { |
| + | coptarg = argv[coptind + 1]; |
| + | coptind += 2; |
| + | optpos = 1; |
| + | return coptopt; |
| + | } |
| + | else { |
| + | if(!arg[++optpos]) { |
| + | coptind++; |
| + | optpos = 1; |
| + | } |
| + | return *optstring == ':' ? ':' : '?'; |
| + | } |
| + | } |
| + | else { |
| + | if(!arg[++optpos]) { |
| + | coptind++; |
| + | optpos = 1; |
| + | } |
| + | return coptopt; |
| + | } |
| + | } |
| + | } |
| + | |
| #ifdef CURLDEBUG | |
| static void memory_tracking_init(void) | |
| { | |
| @@ -97,10 +160,59 @@ char *hexdump(const unsigned char *buf, size_t len) | |
| return dump; | |
| } | |
| + | #ifndef CURL_DISABLE_WEBSOCKETS |
| + | CURLcode ws_send_ping(CURL *curl, const char *send_payload) |
| + | { |
| + | size_t sent; |
| + | CURLcode result = curl_ws_send(curl, send_payload, strlen(send_payload), |
| + | &sent, 0, CURLWS_PING); |
| + | curl_mfprintf(stderr, "ws: curl_ws_send returned %u, sent %zu\n", |
| + | result, sent); |
| + | return result; |
| + | } |
| + | |
| + | CURLcode ws_recv_pong(CURL *curl, const char *expected_payload) |
| + | { |
| + | size_t rlen; |
| + | const struct curl_ws_frame *meta; |
| + | char buffer[256]; |
| + | CURLcode result = curl_ws_recv(curl, buffer, sizeof(buffer), &rlen, &meta); |
| + | if(result) { |
| + | curl_mfprintf(stderr, "ws: curl_ws_recv returned %u, received %zd\n", |
| + | result, rlen); |
| + | return result; |
| + | } |
| + | |
| + | if(!(meta->flags & CURLWS_PONG)) { |
| + | curl_mfprintf(stderr, "recv_pong: wrong frame, got %zd bytes rflags %x\n", |
| + | rlen, meta->flags); |
| + | return CURLE_RECV_ERROR; |
| + | } |
| + | |
| + | curl_mfprintf(stderr, "ws: got PONG back\n"); |
| + | if(rlen == strlen(expected_payload) && |
| + | !memcmp(expected_payload, buffer, rlen)) { |
| + | curl_mfprintf(stderr, "ws: got the same payload back\n"); |
| + | return CURLE_OK; /* lib2304 returned 'result' here. Intentional? */ |
| + | } |
| + | curl_mfprintf(stderr, "ws: did NOT get the same payload back\n"); |
| + | return CURLE_RECV_ERROR; |
| + | } |
| + | |
| + | /* just close the connection */ |
| + | void ws_close(CURL *curl) |
| + | { |
| + | size_t sent; |
| + | CURLcode result = curl_ws_send(curl, "", 0, &sent, 0, CURLWS_CLOSE); |
| + | curl_mfprintf(stderr, "ws: curl_ws_send returned %u, sent %zu\n", |
| + | result, sent); |
| + | } |
| + | #endif /* CURL_DISABLE_WEBSOCKETS */ |
| + | |
| int main(int argc, const char **argv) | |
| { | |
| - | const char *URL; |
| + | const char *URL = ""; |
| CURLcode result; | |
| entry_func_t entry_func; | |
| const char *entry_name; | |
| @@ -126,8 +238,9 @@ int main(int argc, const char **argv) | |
| test_argc = argc - 1; | |
| test_argv = argv + 1; | |
| - | if(argc < 3) { |
| - | curl_mfprintf(stderr, "Pass testname and URL as arguments please\n"); |
| + | if(argc < 2) { |
| + | curl_mfprintf(stderr, "Pass testname " |
| + | "(and URL as argument for numbered tests) please\n"); |
| return 1; | |
| } | |
| @@ -145,6 +258,11 @@ int main(int argc, const char **argv) | |
| return 1; | |
| } | |
| + | if(argc > 2) { |
| + | URL = argv[2]; |
| + | curl_mfprintf(stderr, "URL: %s\n", URL); |
| + | } |
| + | |
| if(argc > 3) | |
| libtest_arg2 = argv[3]; | |
| @@ -154,16 +272,12 @@ int main(int argc, const char **argv) | |
| if(argc > 5) | |
| libtest_arg4 = argv[5]; | |
| - | URL = argv[2]; /* provide this to the rest */ |
| - | |
| env = getenv("CURL_TESTNUM"); | |
| if(env) | |
| testnum = atoi(env); | |
| else | |
| testnum = 0; | |
| - | curl_mfprintf(stderr, "URL: %s\n", URL); |
| - | |
| result = entry_func(URL); | |
| curl_mfprintf(stderr, "Test ended with result %d\n", result); | |
tests/libtest/first.h+11 -0
| @@ -79,11 +79,22 @@ extern const char **test_argv; | |
| extern int testnum; | |
| extern struct curltime tv_test_start; /* for test timing */ | |
| + | extern int coptind; |
| + | extern const char *coptarg; |
| + | int cgetopt(int argc, const char * const argv[], const char *optstring); |
| + | |
| extern int select_wrapper(int nfds, fd_set *rd, fd_set *wr, fd_set *exc, | |
| struct timeval *tv); | |
| extern char *hexdump(const unsigned char *buffer, size_t len); | |
| + | #ifndef CURL_DISABLE_WEBSOCKETS |
| + | CURLcode ws_send_ping(CURL *curl, const char *send_payload); |
| + | CURLcode ws_recv_pong(CURL *curl, const char *expected_payload); |
| + | /* just close the connection */ |
| + | void ws_close(CURL *curl); |
| + | #endif |
| + | |
| /* | |
| ** TEST_ERR_* values must within the CURLcode range to not cause compiler | |
| ** errors. | |
tests/libtest/lib1515.c+3 -3
| @@ -52,9 +52,9 @@ static CURLcode do_one_request(CURLM *m, const char *URL, const char *resolve) | |
| easy_setopt(curls, CURLOPT_RESOLVE, resolve_list); | |
| easy_setopt(curls, CURLOPT_DNS_CACHE_TIMEOUT, DNS_TIMEOUT); | |
| - | libtest_debug_config.nohex = 1; |
| - | libtest_debug_config.tracetime = 1; |
| - | easy_setopt(curls, CURLOPT_DEBUGDATA, &libtest_debug_config); |
| + | debug_config.nohex = 1; |
| + | debug_config.tracetime = 1; |
| + | easy_setopt(curls, CURLOPT_DEBUGDATA, &debug_config); |
| easy_setopt(curls, CURLOPT_DEBUGFUNCTION, libtest_debug_cb); | |
| easy_setopt(curls, CURLOPT_VERBOSE, 1L); | |
tests/libtest/lib1522.c+3 -3
| @@ -60,9 +60,9 @@ static CURLcode test_lib1522(const char *URL) | |
| curl_easy_setopt(curl, CURLOPT_POSTFIELDS, g_Data); | |
| curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, (long)sizeof(g_Data)); | |
| - | libtest_debug_config.nohex = 1; |
| - | libtest_debug_config.tracetime = 1; |
| - | test_setopt(curl, CURLOPT_DEBUGDATA, &libtest_debug_config); |
| + | debug_config.nohex = 1; |
| + | debug_config.tracetime = 1; |
| + | test_setopt(curl, CURLOPT_DEBUGDATA, &debug_config); |
| test_setopt(curl, CURLOPT_DEBUGFUNCTION, libtest_debug_cb); | |
| test_setopt(curl, CURLOPT_VERBOSE, 1L); | |
tests/libtest/lib1540.c+3 -3
| @@ -106,9 +106,9 @@ static CURLcode test_lib1540(const char *URL) | |
| easy_setopt(curls, CURLOPT_XFERINFODATA, &st); | |
| easy_setopt(curls, CURLOPT_NOPROGRESS, 0L); | |
| - | libtest_debug_config.nohex = 1; |
| - | libtest_debug_config.tracetime = 1; |
| - | test_setopt(curls, CURLOPT_DEBUGDATA, &libtest_debug_config); |
| + | debug_config.nohex = 1; |
| + | debug_config.tracetime = 1; |
| + | test_setopt(curls, CURLOPT_DEBUGDATA, &debug_config); |
| easy_setopt(curls, CURLOPT_DEBUGFUNCTION, libtest_debug_cb); | |
| easy_setopt(curls, CURLOPT_VERBOSE, 1L); | |
tests/libtest/lib1542.c+3 -3
| @@ -46,9 +46,9 @@ static CURLcode test_lib1542(const char *URL) | |
| easy_setopt(easy, CURLOPT_URL, URL); | |
| - | libtest_debug_config.nohex = 1; |
| - | libtest_debug_config.tracetime = 0; |
| - | easy_setopt(easy, CURLOPT_DEBUGDATA, &libtest_debug_config); |
| + | debug_config.nohex = 1; |
| + | debug_config.tracetime = 0; |
| + | easy_setopt(easy, CURLOPT_DEBUGDATA, &debug_config); |
| easy_setopt(easy, CURLOPT_DEBUGFUNCTION, libtest_debug_cb); | |
| easy_setopt(easy, CURLOPT_VERBOSE, 1L); | |
tests/libtest/lib1553.c+3 -3
| @@ -71,9 +71,9 @@ static CURLcode test_lib1553(const char *URL) | |
| easy_setopt(curls, CURLOPT_XFERINFOFUNCTION, t1553_xferinfo); | |
| easy_setopt(curls, CURLOPT_NOPROGRESS, 1L); | |
| - | libtest_debug_config.nohex = 1; |
| - | libtest_debug_config.tracetime = 1; |
| - | test_setopt(curls, CURLOPT_DEBUGDATA, &libtest_debug_config); |
| + | debug_config.nohex = 1; |
| + | debug_config.tracetime = 1; |
| + | test_setopt(curls, CURLOPT_DEBUGDATA, &debug_config); |
| easy_setopt(curls, CURLOPT_DEBUGFUNCTION, libtest_debug_cb); | |
| easy_setopt(curls, CURLOPT_VERBOSE, 1L); | |
tests/libtest/lib1915.c+4 -4
| @@ -103,8 +103,8 @@ static CURLcode test_lib1915(const char *URL) | |
| global_init(CURL_GLOBAL_ALL); | |
| - | libtest_debug_config.nohex = 1; |
| - | libtest_debug_config.tracetime = 1; |
| + | debug_config.nohex = 1; |
| + | debug_config.tracetime = 1; |
| easy_init(hnd); | |
| easy_setopt(hnd, CURLOPT_URL, URL); | |
| @@ -114,7 +114,7 @@ static CURLcode test_lib1915(const char *URL) | |
| easy_setopt(hnd, CURLOPT_HSTSWRITEFUNCTION, hstswrite); | |
| easy_setopt(hnd, CURLOPT_HSTSWRITEDATA, &st); | |
| easy_setopt(hnd, CURLOPT_HSTS_CTRL, CURLHSTS_ENABLE); | |
| - | easy_setopt(hnd, CURLOPT_DEBUGDATA, &libtest_debug_config); |
| + | easy_setopt(hnd, CURLOPT_DEBUGDATA, &debug_config); |
| easy_setopt(hnd, CURLOPT_DEBUGFUNCTION, libtest_debug_cb); | |
| easy_setopt(hnd, CURLOPT_VERBOSE, 1L); | |
| res = curl_easy_perform(hnd); | |
| @@ -133,7 +133,7 @@ static CURLcode test_lib1915(const char *URL) | |
| easy_setopt(hnd, CURLOPT_HSTSWRITEFUNCTION, hstswrite); | |
| easy_setopt(hnd, CURLOPT_HSTSWRITEDATA, &st); | |
| easy_setopt(hnd, CURLOPT_HSTS_CTRL, CURLHSTS_ENABLE); | |
| - | easy_setopt(hnd, CURLOPT_DEBUGDATA, &libtest_debug_config); |
| + | easy_setopt(hnd, CURLOPT_DEBUGDATA, &debug_config); |
| easy_setopt(hnd, CURLOPT_DEBUGFUNCTION, libtest_debug_cb); | |
| easy_setopt(hnd, CURLOPT_VERBOSE, 1L); | |
| res = curl_easy_perform(hnd); | |
tests/libtest/lib2301.c+3 -54
| @@ -25,70 +25,19 @@ | |
| #ifndef CURL_DISABLE_WEBSOCKETS | |
| #if 0 | |
| - | |
| - | static CURLcode t2301_send_ping(CURL *curl, const char *send_payload) |
| - | { |
| - | size_t sent; |
| - | CURLcode result = |
| - | curl_ws_send(curl, send_payload, strlen(send_payload), &sent, CURLWS_PING); |
| - | curl_mfprintf(stderr, |
| - | "ws: curl_ws_send returned %d, sent %d\n", result, (int)sent); |
| - | |
| - | return result; |
| - | } |
| - | |
| - | static CURLcode t2301_recv_pong(CURL *curl, const char *expected_payload) |
| - | { |
| - | size_t rlen; |
| - | unsigned int rflags; |
| - | char buffer[256]; |
| - | CURLcode result = |
| - | curl_ws_recv(curl, buffer, sizeof(buffer), &rlen, &rflags); |
| - | if(rflags & CURLWS_PONG) { |
| - | int same = 0; |
| - | curl_mfprintf(stderr, "ws: got PONG back\n"); |
| - | if(rlen == strlen(expected_payload)) { |
| - | if(!memcmp(expected_payload, buffer, rlen)) { |
| - | curl_mfprintf(stderr, "ws: got the same payload back\n"); |
| - | same = 1; |
| - | } |
| - | } |
| - | if(!same) |
| - | curl_mfprintf(stderr, "ws: did NOT get the same payload back\n"); |
| - | } |
| - | else { |
| - | curl_mfprintf(stderr, "recv_pong: got %d bytes rflags %x\n", |
| - | (int)rlen, rflags); |
| - | } |
| - | curl_mfprintf(stderr, "ws: curl_ws_recv returned %d, received %d\n", result, |
| - | (int)rlen); |
| - | return result; |
| - | } |
| - | |
| - | /* just close the connection */ |
| - | static void t2301_websocket_close(CURL *curl) |
| - | { |
| - | size_t sent; |
| - | CURLcode result = |
| - | curl_ws_send(curl, "", 0, &sent, CURLWS_CLOSE); |
| - | curl_mfprintf(stderr, |
| - | "ws: curl_ws_send returned %d, sent %d\n", result, (int)sent); |
| - | } |
| - | |
| static void t2301_websocket(CURL *curl) | |
| { | |
| int i = 0; | |
| curl_mfprintf(stderr, "ws: websocket() starts\n"); | |
| do { | |
| - | if(t2301_send_ping(curl, "foobar")) |
| + | if(ws_send_ping(curl, "foobar")) |
| return; | |
| - | if(t2301_recv_pong(curl, "foobar")) |
| + | if(ws_recv_pong(curl, "foobar")) |
| return; | |
| curlx_wait_ms(2000); | |
| } while(i++ < 10); | |
| - | t2301_websocket_close(curl); |
| + | ws_close(curl); |
| } | |
| - | |
| #endif | |
| static size_t t2301_write_cb(char *b, size_t size, size_t nitems, void *p) | |
tests/libtest/lib2304.c+3 -55
| @@ -24,48 +24,6 @@ | |
| #include "first.h" | |
| #ifndef CURL_DISABLE_WEBSOCKETS | |
| - | |
| - | static CURLcode t2304_send_ping(CURL *curl, const char *send_payload) |
| - | { |
| - | size_t sent; |
| - | CURLcode result = |
| - | curl_ws_send(curl, send_payload, strlen(send_payload), &sent, 0, |
| - | CURLWS_PING); |
| - | curl_mfprintf(stderr, |
| - | "ws: curl_ws_send returned %d, sent %d\n", result, (int)sent); |
| - | |
| - | return result; |
| - | } |
| - | |
| - | static CURLcode t2304_recv_pong(CURL *curl, const char *expected_payload) |
| - | { |
| - | size_t rlen; |
| - | const struct curl_ws_frame *meta; |
| - | char buffer[256]; |
| - | CURLcode result = curl_ws_recv(curl, buffer, sizeof(buffer), &rlen, &meta); |
| - | if(!result) { |
| - | if(meta->flags & CURLWS_PONG) { |
| - | int same = 0; |
| - | curl_mfprintf(stderr, "ws: got PONG back\n"); |
| - | if(rlen == strlen(expected_payload)) { |
| - | if(!memcmp(expected_payload, buffer, rlen)) { |
| - | curl_mfprintf(stderr, "ws: got the same payload back\n"); |
| - | same = 1; |
| - | } |
| - | } |
| - | if(!same) |
| - | curl_mfprintf(stderr, "ws: did NOT get the same payload back\n"); |
| - | } |
| - | else { |
| - | curl_mfprintf(stderr, "recv_pong: got %d bytes rflags %x\n", (int)rlen, |
| - | meta->flags); |
| - | } |
| - | } |
| - | curl_mfprintf(stderr, "ws: curl_ws_recv returned %d, received %d\n", result, |
| - | (int)rlen); |
| - | return result; |
| - | } |
| - | |
| static CURLcode recv_any(CURL *curl) | |
| { | |
| size_t rlen; | |
| @@ -80,16 +38,6 @@ static CURLcode recv_any(CURL *curl) | |
| return CURLE_OK; | |
| } | |
| - | /* just close the connection */ |
| - | static void t2304_websocket_close(CURL *curl) |
| - | { |
| - | size_t sent; |
| - | CURLcode result = |
| - | curl_ws_send(curl, "", 0, &sent, 0, CURLWS_CLOSE); |
| - | curl_mfprintf(stderr, |
| - | "ws: curl_ws_send returned %d, sent %u\n", result, (int)sent); |
| - | } |
| - | |
| static void t2304_websocket(CURL *curl) | |
| { | |
| int i = 0; | |
| @@ -97,16 +45,16 @@ static void t2304_websocket(CURL *curl) | |
| do { | |
| recv_any(curl); | |
| curl_mfprintf(stderr, "Send ping\n"); | |
| - | if(t2304_send_ping(curl, "foobar")) |
| + | if(ws_send_ping(curl, "foobar")) |
| return; | |
| curl_mfprintf(stderr, "Receive pong\n"); | |
| - | if(t2304_recv_pong(curl, "foobar")) { |
| + | if(ws_recv_pong(curl, "foobar")) { |
| curl_mprintf("Connection closed\n"); | |
| return; | |
| } | |
| curlx_wait_ms(2000); | |
| } while(i++ < 10); | |
| - | t2304_websocket_close(curl); |
| + | ws_close(curl); |
| } | |
| #endif | |
tests/libtest/lib2502.c+3 -3
| @@ -75,9 +75,9 @@ static CURLcode test_lib2502(const char *URL) | |
| /* wait for first connection established to see if we can share it */ | |
| easy_setopt(curl[i], CURLOPT_PIPEWAIT, 1L); | |
| /* go verbose */ | |
| - | libtest_debug_config.nohex = 1; |
| - | libtest_debug_config.tracetime = 0; |
| - | test_setopt(curl[i], CURLOPT_DEBUGDATA, &libtest_debug_config); |
| + | debug_config.nohex = 1; |
| + | debug_config.tracetime = 0; |
| + | test_setopt(curl[i], CURLOPT_DEBUGDATA, &debug_config); |
| easy_setopt(curl[i], CURLOPT_DEBUGFUNCTION, libtest_debug_cb); | |
| easy_setopt(curl[i], CURLOPT_VERBOSE, 1L); | |
| /* include headers */ | |
tests/libtest/lib2700.c+3 -3
| @@ -222,9 +222,9 @@ static CURLcode test_lib2700(const char *URL) | |
| easy_setopt(curl, CURLOPT_URL, URL); | |
| easy_setopt(curl, CURLOPT_USERAGENT, "client/test2700"); | |
| - | libtest_debug_config.nohex = 1; |
| - | libtest_debug_config.tracetime = 1; |
| - | easy_setopt(curl, CURLOPT_DEBUGDATA, &libtest_debug_config); |
| + | debug_config.nohex = 1; |
| + | debug_config.tracetime = 1; |
| + | easy_setopt(curl, CURLOPT_DEBUGDATA, &debug_config); |
| easy_setopt(curl, CURLOPT_DEBUGFUNCTION, libtest_debug_cb); | |
| easy_setopt(curl, CURLOPT_VERBOSE, 1L); | |
| easy_setopt(curl, CURLOPT_CONNECT_ONLY, 2L); | |
tests/libtest/lib3033.c+3 -3
| @@ -45,7 +45,7 @@ static CURLcode t3033_req_test(CURLM *multi, CURL *easy, | |
| curl_easy_reset(easy); | |
| curl_easy_setopt(easy, CURLOPT_URL, URL); | |
| - | easy_setopt(easy, CURLOPT_DEBUGDATA, &libtest_debug_config); |
| + | easy_setopt(easy, CURLOPT_DEBUGDATA, &debug_config); |
| easy_setopt(easy, CURLOPT_DEBUGFUNCTION, libtest_debug_cb); | |
| easy_setopt(easy, CURLOPT_VERBOSE, 1L); | |
| @@ -107,8 +107,8 @@ static CURLcode test_lib3033(const char *URL) | |
| multi_init(multi); | |
| easy_init(curl); | |
| - | libtest_debug_config.nohex = 1; |
| - | libtest_debug_config.tracetime = 1; |
| + | debug_config.nohex = 1; |
| + | debug_config.tracetime = 1; |
| res = t3033_req_test(multi, curl, URL, 0); | |
| if(res != CURLE_OK) | |
tests/libtest/lib500.c+3 -3
| @@ -73,9 +73,9 @@ static CURLcode test_lib500(const char *URL) | |
| test_setopt(curl, CURLOPT_URL, URL); | |
| test_setopt(curl, CURLOPT_HEADER, 1L); | |
| - | libtest_debug_config.nohex = 1; |
| - | libtest_debug_config.tracetime = 1; |
| - | test_setopt(curl, CURLOPT_DEBUGDATA, &libtest_debug_config); |
| + | debug_config.nohex = 1; |
| + | debug_config.tracetime = 1; |
| + | test_setopt(curl, CURLOPT_DEBUGDATA, &debug_config); |
| test_setopt(curl, CURLOPT_DEBUGFUNCTION, libtest_debug_cb); | |
| test_setopt(curl, CURLOPT_VERBOSE, 1L); | |
tests/libtest/lib552.c+5 -95
| @@ -27,99 +27,9 @@ | |
| #include "first.h" | |
| + | #include "testtrace.h" |
| #include "memdebug.h" | |
| - | struct t552_testdata { |
| - | char trace_ascii; /* 1 or 0 */ |
| - | }; |
| - | |
| - | static void dump(const char *text, |
| - | FILE *stream, unsigned char *ptr, size_t size, |
| - | char nohex) |
| - | { |
| - | size_t i; |
| - | size_t c; |
| - | |
| - | unsigned int width = 0x10; |
| - | |
| - | if(nohex) |
| - | /* without the hex output, we can fit more on screen */ |
| - | width = 0x40; |
| - | |
| - | curl_mfprintf(stream, "%s, %zu bytes (0x%zx)\n", text, size, size); |
| - | |
| - | for(i = 0; i < size; i += width) { |
| - | |
| - | curl_mfprintf(stream, "%04zx: ", i); |
| - | |
| - | if(!nohex) { |
| - | /* hex not disabled, show it */ |
| - | for(c = 0; c < width; c++) |
| - | if(i + c < size) |
| - | curl_mfprintf(stream, "%02x ", ptr[i + c]); |
| - | else |
| - | fputs(" ", stream); |
| - | } |
| - | |
| - | for(c = 0; (c < width) && (i + c < size); c++) { |
| - | /* check for 0D0A; if found, skip past and start a new line of output */ |
| - | if(nohex && (i + c + 1 < size) && ptr[i + c] == 0x0D && |
| - | ptr[i + c + 1] == 0x0A) { |
| - | i += (c + 2 - width); |
| - | break; |
| - | } |
| - | curl_mfprintf(stream, "%c", |
| - | (ptr[i + c] >= 0x20) && (ptr[i + c] < 0x80) ? ptr[i + c] : '.'); |
| - | /* check again for 0D0A, to avoid an extra \n if it's at width */ |
| - | if(nohex && (i + c + 2 < size) && ptr[i + c + 1] == 0x0D && |
| - | ptr[i + c + 2] == 0x0A) { |
| - | i += (c + 3 - width); |
| - | break; |
| - | } |
| - | } |
| - | fputc('\n', stream); /* newline */ |
| - | } |
| - | fflush(stream); |
| - | } |
| - | |
| - | static int my_trace(CURL *handle, curl_infotype type, |
| - | char *data, size_t size, |
| - | void *userp) |
| - | { |
| - | struct t552_testdata *config = (struct t552_testdata *)userp; |
| - | const char *text; |
| - | (void)handle; /* prevent compiler warning */ |
| - | |
| - | switch(type) { |
| - | case CURLINFO_TEXT: |
| - | curl_mfprintf(stderr, "== Info: %s", (char *)data); |
| - | return 0; |
| - | case CURLINFO_HEADER_OUT: |
| - | text = "=> Send header"; |
| - | break; |
| - | case CURLINFO_DATA_OUT: |
| - | text = "=> Send data"; |
| - | break; |
| - | case CURLINFO_SSL_DATA_OUT: |
| - | text = "=> Send SSL data"; |
| - | break; |
| - | case CURLINFO_HEADER_IN: |
| - | text = "<= Recv header"; |
| - | break; |
| - | case CURLINFO_DATA_IN: |
| - | text = "<= Recv data"; |
| - | break; |
| - | case CURLINFO_SSL_DATA_IN: |
| - | text = "<= Recv SSL data"; |
| - | break; |
| - | default: /* in case a new one is introduced to shock us */ |
| - | return 0; |
| - | } |
| - | |
| - | dump(text, stderr, (unsigned char *)data, size, config->trace_ascii); |
| - | return 0; |
| - | } |
| - | |
| static size_t current_offset = 0; | |
| static char databuf[70000]; /* MUST be more than 64k OR | |
| MAX_INITIAL_POST_SIZE */ | |
| @@ -161,17 +71,17 @@ static CURLcode test_lib552(const char *URL) | |
| { | |
| CURL *curl; | |
| CURLcode res = CURLE_OK; | |
| - | struct t552_testdata config; |
| size_t i; | |
| static const char fill[] = "test data"; | |
| - | config.trace_ascii = 1; /* enable ASCII tracing */ |
| + | debug_config.nohex = 1; |
| + | debug_config.tracetime = 0; |
| global_init(CURL_GLOBAL_ALL); | |
| easy_init(curl); | |
| - | test_setopt(curl, CURLOPT_DEBUGFUNCTION, my_trace); |
| - | test_setopt(curl, CURLOPT_DEBUGDATA, &config); |
| + | test_setopt(curl, CURLOPT_DEBUGFUNCTION, libtest_debug_cb); |
| + | test_setopt(curl, CURLOPT_DEBUGDATA, &debug_config); |
| /* the DEBUGFUNCTION has no effect until we enable VERBOSE */ | |
| test_setopt(curl, CURLOPT_VERBOSE, 1L); | |
tests/libtest/lib573.c+3 -3
| @@ -53,9 +53,9 @@ static CURLcode test_lib573(const char *URL) | |
| easy_setopt(c, CURLOPT_HEADER, 1L); | |
| easy_setopt(c, CURLOPT_URL, URL); | |
| - | libtest_debug_config.nohex = 1; |
| - | libtest_debug_config.tracetime = 1; |
| - | easy_setopt(c, CURLOPT_DEBUGDATA, &libtest_debug_config); |
| + | debug_config.nohex = 1; |
| + | debug_config.tracetime = 1; |
| + | easy_setopt(c, CURLOPT_DEBUGDATA, &debug_config); |
| easy_setopt(c, CURLOPT_DEBUGFUNCTION, libtest_debug_cb); | |
| easy_setopt(c, CURLOPT_VERBOSE, 1L); | |
tests/libtest/lib753.c+3 -3
| @@ -83,7 +83,7 @@ static bool t753_setup(const char *URL, const char *name, | |
| easy_setopt(easy, CURLOPT_HEADERDATA, st); | |
| easy_setopt(easy, CURLOPT_NOPROGRESS, 1L); | |
| - | easy_setopt(easy, CURLOPT_DEBUGDATA, &libtest_debug_config); |
| + | easy_setopt(easy, CURLOPT_DEBUGDATA, &debug_config); |
| easy_setopt(easy, CURLOPT_DEBUGFUNCTION, libtest_debug_cb); | |
| easy_setopt(easy, CURLOPT_VERBOSE, 1L); | |
| @@ -107,8 +107,8 @@ static CURLcode test_lib753(const char *URL) | |
| start_test_timing(); | |
| - | libtest_debug_config.nohex = 1; |
| - | libtest_debug_config.tracetime = 1; |
| + | debug_config.nohex = 1; |
| + | debug_config.tracetime = 1; |
| curl_global_init(CURL_GLOBAL_DEFAULT); | |
tests/libtest/testtrace.c+105 -13
| @@ -25,14 +25,14 @@ | |
| #include "memdebug.h" | |
| - | struct libtest_trace_cfg libtest_debug_config; |
| + | struct libtest_trace_cfg debug_config; |
| static time_t epoch_offset; /* for test time tracing */ | |
| static int known_offset; /* for test time tracing */ | |
| - | static void libtest_debug_dump(const char *timebuf, const char *text, |
| - | FILE *stream, const unsigned char *ptr, |
| - | size_t size, int nohex) |
| + | void debug_dump(const char *timebuf, const char *text, |
| + | FILE *stream, const unsigned char *ptr, |
| + | size_t size, int nohex) |
| { | |
| size_t i; | |
| size_t c; | |
| @@ -61,9 +61,8 @@ static void libtest_debug_dump(const char *timebuf, const char *text, | |
| for(c = 0; (c < width) && (i + c < size); c++) { | |
| /* check for 0D0A; if found, skip past and start a new line of output */ | |
| - | if(nohex && |
| - | (i + c + 1 < size) && (ptr[i + c] == 0x0D) && |
| - | (ptr[i + c + 1] == 0x0A)) { |
| + | if(nohex && (i + c + 1 < size) && ptr[i + c] == 0x0D && |
| + | ptr[i + c + 1] == 0x0A) { |
| i += (c + 2 - width); | |
| break; | |
| } | |
| @@ -71,9 +70,8 @@ static void libtest_debug_dump(const char *timebuf, const char *text, | |
| ((ptr[i + c] >= 0x20) && (ptr[i + c] < 0x80)) ? | |
| ptr[i + c] : '.'); | |
| /* check again for 0D0A, to avoid an extra \n if it's at width */ | |
| - | if(nohex && |
| - | (i + c + 2 < size) && (ptr[i + c + 1] == 0x0D) && |
| - | (ptr[i + c + 2] == 0x0A)) { |
| + | if(nohex && (i + c + 2 < size) && ptr[i + c + 1] == 0x0D && |
| + | ptr[i + c + 2] == 0x0A) { |
| i += (c + 3 - width); | |
| break; | |
| } | |
| @@ -114,7 +112,7 @@ int libtest_debug_cb(CURL *handle, curl_infotype type, | |
| switch(type) { | |
| case CURLINFO_TEXT: | |
| - | curl_mfprintf(stderr, "%s== Info: %s", timestr, (char *)data); |
| + | curl_mfprintf(stderr, "%s== Info: %s", timestr, data); |
| return 0; | |
| case CURLINFO_HEADER_OUT: | |
| text = "=> Send header"; | |
| @@ -138,7 +136,101 @@ int libtest_debug_cb(CURL *handle, curl_infotype type, | |
| return 0; | |
| } | |
| - | libtest_debug_dump(timebuf, text, stderr, (unsigned char *)data, size, |
| - | trace_cfg->nohex); |
| + | debug_dump(timebuf, text, stderr, (const unsigned char *)data, size, |
| + | trace_cfg->nohex); |
| + | return 0; |
| + | } |
| + | |
| + | static void log_line_start(FILE *log, const char *idsbuf, curl_infotype type) |
| + | { |
| + | /* |
| + | * This is the trace look that is similar to what libcurl makes on its |
| + | * own. |
| + | */ |
| + | static const char * const s_infotype[] = { |
| + | "* ", "< ", "> ", "{ ", "} ", "{ ", "} " |
| + | }; |
| + | if(idsbuf && *idsbuf) |
| + | curl_mfprintf(log, "%s%s", idsbuf, s_infotype[type]); |
| + | else |
| + | fputs(s_infotype[type], log); |
| + | } |
| + | |
| + | /* callback for CURLOPT_DEBUGFUNCTION (used in client tests) */ |
| + | int cli_debug_cb(CURL *handle, curl_infotype type, |
| + | char *data, size_t size, void *userp) |
| + | { |
| + | FILE *output = stderr; |
| + | static int newl = 0; |
| + | static int traced_data = 0; |
| + | char idsbuf[60]; |
| + | curl_off_t xfer_id, conn_id; |
| + | |
| + | (void)handle; /* not used */ |
| + | (void)userp; |
| + | |
| + | if(!curl_easy_getinfo(handle, CURLINFO_XFER_ID, &xfer_id) && xfer_id >= 0) { |
| + | if(!curl_easy_getinfo(handle, CURLINFO_CONN_ID, &conn_id) && |
| + | conn_id >= 0) { |
| + | curl_msnprintf(idsbuf, sizeof(idsbuf), |
| + | "[%" CURL_FORMAT_CURL_OFF_T "-" |
| + | "%" CURL_FORMAT_CURL_OFF_T "] ", xfer_id, conn_id); |
| + | } |
| + | else { |
| + | curl_msnprintf(idsbuf, sizeof(idsbuf), |
| + | "[%" CURL_FORMAT_CURL_OFF_T "-x] ", xfer_id); |
| + | } |
| + | } |
| + | else |
| + | idsbuf[0] = 0; |
| + | |
| + | switch(type) { |
| + | case CURLINFO_HEADER_OUT: |
| + | if(size > 0) { |
| + | size_t st = 0; |
| + | size_t i; |
| + | for(i = 0; i < size - 1; i++) { |
| + | if(data[i] == '\n') { /* LF */ |
| + | if(!newl) { |
| + | log_line_start(output, idsbuf, type); |
| + | } |
| + | (void)fwrite(data + st, i - st + 1, 1, output); |
| + | st = i + 1; |
| + | newl = 0; |
| + | } |
| + | } |
| + | if(!newl) |
| + | log_line_start(output, idsbuf, type); |
| + | (void)fwrite(data + st, i - st + 1, 1, output); |
| + | } |
| + | newl = (size && (data[size - 1] != '\n')) ? 1 : 0; |
| + | traced_data = 0; |
| + | break; |
| + | case CURLINFO_TEXT: |
| + | case CURLINFO_HEADER_IN: |
| + | if(!newl) |
| + | log_line_start(output, idsbuf, type); |
| + | (void)fwrite(data, size, 1, output); |
| + | newl = (size && (data[size - 1] != '\n')) ? 1 : 0; |
| + | traced_data = 0; |
| + | break; |
| + | case CURLINFO_DATA_OUT: |
| + | case CURLINFO_DATA_IN: |
| + | case CURLINFO_SSL_DATA_IN: |
| + | case CURLINFO_SSL_DATA_OUT: |
| + | if(!traced_data) { |
| + | if(!newl) |
| + | log_line_start(output, idsbuf, type); |
| + | curl_mfprintf(output, "[%ld bytes data]\n", (long)size); |
| + | newl = 0; |
| + | traced_data = 1; |
| + | } |
| + | break; |
| + | default: /* nada */ |
| + | newl = 0; |
| + | traced_data = 1; |
| + | break; |
| + | } |
| + | |
| return 0; | |
| } | |
tests/libtest/testtrace.h+9 -1
| @@ -25,14 +25,22 @@ | |
| ***************************************************************************/ | |
| #include "first.h" | |
| + | void debug_dump(const char *timebuf, const char *text, |
| + | FILE *stream, const unsigned char *ptr, |
| + | size_t size, int nohex); |
| + | |
| struct libtest_trace_cfg { | |
| int tracetime; /* 0 represents FALSE, anything else TRUE */ | |
| int nohex; /* 0 represents FALSE, anything else TRUE */ | |
| }; | |
| - | extern struct libtest_trace_cfg libtest_debug_config; |
| + | extern struct libtest_trace_cfg debug_config; |
| int libtest_debug_cb(CURL *handle, curl_infotype type, | |
| char *data, size_t size, void *userp); | |
| + | /* callback for CURLOPT_DEBUGFUNCTION (client tests) */ |
| + | int cli_debug_cb(CURL *handle, curl_infotype type, |
| + | char *data, size_t size, void *userp); |
| + | |
| #endif /* HEADER_LIBTEST_TESTTRACE_H */ | |