From eb9e35f72a9a1bffdf66826ba7b2fc7e2a203729 Mon Sep 17 00:00:00 2001 From: Hongfei Xu Date: Sat, 8 Oct 2022 11:54:40 +0800 Subject: [PATCH] October 2022 update --- scripts/install_Opt.sh | 2 +- toolchain-mipsel/build_toolchain_O3 | 8 +- tools/patch.py | 2 +- trunk/configs/templates/newifid1_base.config | 2 +- trunk/configs/templates/newifid1_full.config | 2 +- trunk/configs/templates/newifid1_mini.config | 2 +- .../configs/templates/newifimini_base.config | 2 +- .../configs/templates/newifimini_mini.config | 2 +- trunk/configs/templates/newifiy1s_base.config | 2 +- trunk/configs/templates/newifiy1s_mini.config | 2 +- trunk/configs/templates/psg1218_base.config | 2 +- trunk/configs/templates/psg1218_mini.config | 2 +- trunk/configs/templates/psg1218_net.config | 2 +- .../configs/templates/psg1218_srouter.config | 2 +- trunk/configs/templates/ykl1_full.config | 2 +- trunk/libs/libcurl/curl-7.x/CHANGES | 7784 ++++ .../curl-7.x/CMake/CMakeConfigurableFile.in | 4 +- .../curl-7.x/CMake/CurlSymbolHiding.cmake | 4 +- trunk/libs/libcurl/curl-7.x/CMake/CurlTests.c | 73 +- .../libcurl/curl-7.x/CMake/FindBearSSL.cmake | 4 +- .../libcurl/curl-7.x/CMake/FindBrotli.cmake | 4 +- .../libcurl/curl-7.x/CMake/FindCARES.cmake | 4 +- .../libs/libcurl/curl-7.x/CMake/FindGSS.cmake | 4 +- .../libcurl/curl-7.x/CMake/FindLibPSL.cmake | 45 + .../libcurl/curl-7.x/CMake/FindLibSSH2.cmake | 4 +- .../libcurl/curl-7.x/CMake/FindMSH3.cmake | 70 + .../libcurl/curl-7.x/CMake/FindMbedTLS.cmake | 6 +- .../libcurl/curl-7.x/CMake/FindNGHTTP2.cmake | 4 +- .../libcurl/curl-7.x/CMake/FindNGHTTP3.cmake | 4 +- .../libcurl/curl-7.x/CMake/FindNGTCP2.cmake | 6 +- .../libs/libcurl/curl-7.x/CMake/FindNSS.cmake | 4 +- .../libcurl/curl-7.x/CMake/FindQUICHE.cmake | 4 +- .../libcurl/curl-7.x/CMake/FindWolfSSL.cmake | 4 +- .../libcurl/curl-7.x/CMake/FindZstd.cmake | 4 +- .../libs/libcurl/curl-7.x/CMake/Macros.cmake | 4 +- .../libcurl/curl-7.x/CMake/OtherTests.cmake | 9 +- .../CMake/Platforms/WindowsCache.cmake | 30 +- .../libcurl/curl-7.x/CMake/Utilities.cmake | 4 +- .../curl-7.x/CMake/cmake_uninstall.cmake.in | 4 +- .../curl-7.x/CMake/curl-config.cmake.in | 4 +- trunk/libs/libcurl/curl-7.x/CMakeLists.txt | 317 +- trunk/libs/libcurl/curl-7.x/COPYING | 22 + trunk/libs/libcurl/curl-7.x/MacOSX-Framework | 8 +- trunk/libs/libcurl/curl-7.x/Makefile | 31 +- trunk/libs/libcurl/curl-7.x/Makefile.am | 328 +- trunk/libs/libcurl/curl-7.x/Makefile.in | 396 +- trunk/libs/libcurl/curl-7.x/README | 55 + trunk/libs/libcurl/curl-7.x/RELEASE-NOTES | 379 + trunk/libs/libcurl/curl-7.x/acinclude.m4 | 323 +- trunk/libs/libcurl/curl-7.x/aclocal.m4 | 12 +- trunk/libs/libcurl/curl-7.x/buildconf | 4 + trunk/libs/libcurl/curl-7.x/buildconf.bat | 4 +- trunk/libs/libcurl/curl-7.x/config.guess | 1500 +- trunk/libs/libcurl/curl-7.x/config.sub | 2609 +- trunk/libs/libcurl/curl-7.x/configure | 7302 ++-- trunk/libs/libcurl/curl-7.x/configure.ac | 605 +- trunk/libs/libcurl/curl-7.x/curl-config.in | 8 +- trunk/libs/libcurl/curl-7.x/docs/ALTSVC.md | 2 +- trunk/libs/libcurl/curl-7.x/docs/BINDINGS.md | 37 +- trunk/libs/libcurl/curl-7.x/docs/BUFREF.md | 4 +- .../libs/libcurl/curl-7.x/docs/BUG-BOUNTY.md | 67 +- trunk/libs/libcurl/curl-7.x/docs/BUGS.md | 77 +- trunk/libs/libcurl/curl-7.x/docs/CHECKSRC.md | 30 +- trunk/libs/libcurl/curl-7.x/docs/CIPHERS.md | 81 +- .../libs/libcurl/curl-7.x/docs/CMakeLists.txt | 4 +- .../libs/libcurl/curl-7.x/docs/CODE_REVIEW.md | 16 +- .../libs/libcurl/curl-7.x/docs/CODE_STYLE.md | 25 +- .../libs/libcurl/curl-7.x/docs/CONTRIBUTE.md | 151 +- .../libcurl/curl-7.x/docs/CURL-DISABLE.md | 4 + trunk/libs/libcurl/curl-7.x/docs/DEPRECATE.md | 37 +- trunk/libs/libcurl/curl-7.x/docs/DYNBUF.md | 16 +- trunk/libs/libcurl/curl-7.x/docs/ECH.md | 135 - .../libcurl/curl-7.x/docs/EXPERIMENTAL.md | 3 +- trunk/libs/libcurl/curl-7.x/docs/FAQ | 435 +- trunk/libs/libcurl/curl-7.x/docs/FEATURES.md | 31 +- .../libs/libcurl/curl-7.x/docs/GOVERNANCE.md | 14 +- trunk/libs/libcurl/curl-7.x/docs/HELP-US.md | 18 +- trunk/libs/libcurl/curl-7.x/docs/HISTORY.md | 26 +- trunk/libs/libcurl/curl-7.x/docs/HSTS.md | 2 +- .../libcurl/curl-7.x/docs/HTTP-COOKIES.md | 37 +- trunk/libs/libcurl/curl-7.x/docs/HTTP2.md | 10 +- trunk/libs/libcurl/curl-7.x/docs/HTTP3.md | 220 +- trunk/libs/libcurl/curl-7.x/docs/HYPER.md | 24 +- .../libs/libcurl/curl-7.x/docs/INSTALL.cmake | 14 +- trunk/libs/libcurl/curl-7.x/docs/INSTALL.md | 140 +- trunk/libs/libcurl/curl-7.x/docs/INTERNALS.md | 1067 +- trunk/libs/libcurl/curl-7.x/docs/KNOWN_BUGS | 359 +- .../libs/libcurl/curl-7.x/docs/MAIL-ETIQUETTE | 68 +- trunk/libs/libcurl/curl-7.x/docs/MQTT.md | 2 +- trunk/libs/libcurl/curl-7.x/docs/Makefile.am | 7 +- trunk/libs/libcurl/curl-7.x/docs/Makefile.in | 26 +- .../libcurl/curl-7.x/docs/NEW-PROTOCOL.md | 18 +- .../curl-7.x/docs/PARALLEL-TRANSFERS.md | 4 +- trunk/libs/libcurl/curl-7.x/docs/README.md | 4 +- .../curl-7.x/docs/RELEASE-PROCEDURE.md | 24 +- trunk/libs/libcurl/curl-7.x/docs/ROADMAP.md | 2 +- trunk/libs/libcurl/curl-7.x/docs/RUSTLS.md | 6 +- .../libcurl/curl-7.x/docs/SECURITY-PROCESS.md | 121 +- .../libcurl/curl-7.x/docs/SSL-PROBLEMS.md | 14 +- trunk/libs/libcurl/curl-7.x/docs/SSLCERTS.md | 24 +- trunk/libs/libcurl/curl-7.x/docs/THANKS | 207 +- trunk/libs/libcurl/curl-7.x/docs/TODO | 297 +- .../curl-7.x/docs/TheArtOfHttpScripting.md | 118 +- .../libs/libcurl/curl-7.x/docs/URL-SYNTAX.md | 62 +- trunk/libs/libcurl/curl-7.x/docs/VERSIONS.md | 2 +- .../curl-7.x/docs/cmdline-opts/CMakeLists.txt | 4 +- .../curl-7.x/docs/cmdline-opts/MANPAGE.md | 11 + .../curl-7.x/docs/cmdline-opts/Makefile.am | 4 +- .../curl-7.x/docs/cmdline-opts/Makefile.in | 33 +- .../curl-7.x/docs/cmdline-opts/Makefile.inc | 10 +- .../docs/cmdline-opts/abstract-unix-socket.d | 3 + .../curl-7.x/docs/cmdline-opts/alt-svc.d | 3 + .../curl-7.x/docs/cmdline-opts/anyauth.d | 3 + .../curl-7.x/docs/cmdline-opts/append.d | 6 +- .../curl-7.x/docs/cmdline-opts/aws-sigv4.d | 3 + .../curl-7.x/docs/cmdline-opts/basic.d | 3 + .../curl-7.x/docs/cmdline-opts/cacert.d | 6 +- .../curl-7.x/docs/cmdline-opts/capath.d | 6 +- .../curl-7.x/docs/cmdline-opts/cert-status.d | 3 + .../curl-7.x/docs/cmdline-opts/cert-type.d | 11 +- .../libcurl/curl-7.x/docs/cmdline-opts/cert.d | 23 +- .../curl-7.x/docs/cmdline-opts/ciphers.d | 4 + .../docs/cmdline-opts/compressed-ssh.d | 3 + .../curl-7.x/docs/cmdline-opts/compressed.d | 4 + .../curl-7.x/docs/cmdline-opts/config.d | 51 +- .../docs/cmdline-opts/connect-timeout.d | 3 + .../curl-7.x/docs/cmdline-opts/connect-to.d | 2 + .../curl-7.x/docs/cmdline-opts/continue-at.d | 5 +- .../curl-7.x/docs/cmdline-opts/cookie-jar.d | 12 +- .../curl-7.x/docs/cmdline-opts/cookie.d | 23 +- .../curl-7.x/docs/cmdline-opts/create-dirs.d | 4 + .../docs/cmdline-opts/create-file-mode.d | 2 + .../libcurl/curl-7.x/docs/cmdline-opts/crlf.d | 4 + .../curl-7.x/docs/cmdline-opts/crlfile.d | 3 + .../curl-7.x/docs/cmdline-opts/curves.d | 5 +- .../curl-7.x/docs/cmdline-opts/data-ascii.d | 4 + .../curl-7.x/docs/cmdline-opts/data-binary.d | 6 +- .../curl-7.x/docs/cmdline-opts/data-raw.d | 2 + .../docs/cmdline-opts/data-urlencode.d | 6 +- .../libcurl/curl-7.x/docs/cmdline-opts/data.d | 17 +- .../curl-7.x/docs/cmdline-opts/delegation.d | 6 +- .../curl-7.x/docs/cmdline-opts/digest.d | 3 + .../curl-7.x/docs/cmdline-opts/disable-eprt.d | 4 + .../curl-7.x/docs/cmdline-opts/disable-epsv.d | 4 + .../curl-7.x/docs/cmdline-opts/disable.d | 4 + .../cmdline-opts/disallow-username-in-url.d | 8 +- .../docs/cmdline-opts/dns-interface.d | 2 + .../docs/cmdline-opts/dns-ipv4-addr.d | 2 + .../docs/cmdline-opts/dns-ipv6-addr.d | 2 + .../curl-7.x/docs/cmdline-opts/dns-servers.d | 3 + .../docs/cmdline-opts/doh-cert-status.d | 4 +- .../curl-7.x/docs/cmdline-opts/doh-insecure.d | 4 +- .../curl-7.x/docs/cmdline-opts/doh-url.d | 7 +- .../curl-7.x/docs/cmdline-opts/dump-header.d | 3 + .../curl-7.x/docs/cmdline-opts/egd-file.d | 6 + .../curl-7.x/docs/cmdline-opts/engine.d | 6 +- .../curl-7.x/docs/cmdline-opts/etag-compare.d | 3 + .../curl-7.x/docs/cmdline-opts/etag-save.d | 3 + .../docs/cmdline-opts/expect100-timeout.d | 2 + .../curl-7.x/docs/cmdline-opts/fail-early.d | 3 + .../docs/cmdline-opts/fail-with-body.d | 3 + .../libcurl/curl-7.x/docs/cmdline-opts/fail.d | 16 +- .../curl-7.x/docs/cmdline-opts/false-start.d | 3 + .../curl-7.x/docs/cmdline-opts/form-string.d | 7 +- .../libcurl/curl-7.x/docs/cmdline-opts/form.d | 22 +- .../curl-7.x/docs/cmdline-opts/ftp-account.d | 3 + .../cmdline-opts/ftp-alternative-to-user.d | 3 + .../docs/cmdline-opts/ftp-create-dirs.d | 5 +- .../curl-7.x/docs/cmdline-opts/ftp-method.d | 7 +- .../curl-7.x/docs/cmdline-opts/ftp-pasv.d | 4 +- .../curl-7.x/docs/cmdline-opts/ftp-port.d | 12 +- .../curl-7.x/docs/cmdline-opts/ftp-pret.d | 3 + .../docs/cmdline-opts/ftp-skip-pasv-ip.d | 2 + .../docs/cmdline-opts/ftp-ssl-ccc-mode.d | 2 + .../curl-7.x/docs/cmdline-opts/ftp-ssl-ccc.d | 2 + .../docs/cmdline-opts/ftp-ssl-control.d | 5 +- .../libcurl/curl-7.x/docs/cmdline-opts/gen.pl | 153 +- .../libcurl/curl-7.x/docs/cmdline-opts/get.d | 6 +- .../curl-7.x/docs/cmdline-opts/globoff.d | 4 + .../cmdline-opts/happy-eyeballs-timeout-ms.d | 3 + .../docs/cmdline-opts/haproxy-protocol.d | 3 + .../libcurl/curl-7.x/docs/cmdline-opts/head.d | 4 + .../curl-7.x/docs/cmdline-opts/header.d | 13 +- .../libcurl/curl-7.x/docs/cmdline-opts/help.d | 4 + .../curl-7.x/docs/cmdline-opts/hostpubmd5.d | 3 + .../libcurl/curl-7.x/docs/cmdline-opts/hsts.d | 3 + .../curl-7.x/docs/cmdline-opts/http0.9.d | 5 +- .../curl-7.x/docs/cmdline-opts/http1.0.d | 7 +- .../curl-7.x/docs/cmdline-opts/http1.1.d | 5 +- .../docs/cmdline-opts/http2-prior-knowledge.d | 5 +- .../curl-7.x/docs/cmdline-opts/http2.d | 8 +- .../curl-7.x/docs/cmdline-opts/http3.d | 2 + .../docs/cmdline-opts/ignore-content-length.d | 6 +- .../curl-7.x/docs/cmdline-opts/include.d | 3 + .../curl-7.x/docs/cmdline-opts/insecure.d | 30 +- .../curl-7.x/docs/cmdline-opts/interface.d | 4 +- .../libcurl/curl-7.x/docs/cmdline-opts/ipv4.d | 8 +- .../libcurl/curl-7.x/docs/cmdline-opts/ipv6.d | 8 +- .../docs/cmdline-opts/junk-session-cookies.d | 5 +- .../docs/cmdline-opts/keepalive-time.d | 10 +- .../curl-7.x/docs/cmdline-opts/key-type.d | 4 + .../libcurl/curl-7.x/docs/cmdline-opts/key.d | 11 +- .../libcurl/curl-7.x/docs/cmdline-opts/krb.d | 4 + .../curl-7.x/docs/cmdline-opts/libcurl.d | 3 + .../curl-7.x/docs/cmdline-opts/limit-rate.d | 9 +- .../curl-7.x/docs/cmdline-opts/list-only.d | 5 +- .../curl-7.x/docs/cmdline-opts/local-port.d | 3 + .../docs/cmdline-opts/location-trusted.d | 7 +- .../curl-7.x/docs/cmdline-opts/location.d | 6 +- .../docs/cmdline-opts/login-options.d | 5 +- .../curl-7.x/docs/cmdline-opts/mail-auth.d | 2 + .../curl-7.x/docs/cmdline-opts/mail-from.d | 2 + .../docs/cmdline-opts/mail-rcpt-allowfails.d | 3 + .../curl-7.x/docs/cmdline-opts/mail-rcpt.d | 5 +- .../curl-7.x/docs/cmdline-opts/manual.d | 4 + .../curl-7.x/docs/cmdline-opts/max-filesize.d | 3 + .../curl-7.x/docs/cmdline-opts/max-redirs.d | 4 + .../curl-7.x/docs/cmdline-opts/max-time.d | 11 +- .../curl-7.x/docs/cmdline-opts/metalink.d | 3 + .../curl-7.x/docs/cmdline-opts/negotiate.d | 5 +- .../curl-7.x/docs/cmdline-opts/netrc-file.d | 5 +- .../docs/cmdline-opts/netrc-optional.d | 5 +- .../curl-7.x/docs/cmdline-opts/netrc.d | 16 +- .../libcurl/curl-7.x/docs/cmdline-opts/next.d | 5 +- .../curl-7.x/docs/cmdline-opts/no-alpn.d | 2 + .../curl-7.x/docs/cmdline-opts/no-buffer.d | 4 + .../curl-7.x/docs/cmdline-opts/no-keepalive.d | 4 + .../curl-7.x/docs/cmdline-opts/no-npn.d | 2 + .../docs/cmdline-opts/no-progress-meter.d | 2 + .../curl-7.x/docs/cmdline-opts/no-sessionid.d | 5 +- .../curl-7.x/docs/cmdline-opts/noproxy.d | 5 +- .../curl-7.x/docs/cmdline-opts/ntlm-wb.d | 3 + .../libcurl/curl-7.x/docs/cmdline-opts/ntlm.d | 3 + .../docs/cmdline-opts/oauth2-bearer.d | 6 +- .../curl-7.x/docs/cmdline-opts/output-dir.d | 4 +- .../curl-7.x/docs/cmdline-opts/output.d | 5 +- .../curl-7.x/docs/cmdline-opts/page-footer | 98 +- .../curl-7.x/docs/cmdline-opts/page-header | 26 +- .../docs/cmdline-opts/parallel-immediate.d | 2 + .../curl-7.x/docs/cmdline-opts/parallel-max.d | 2 + .../curl-7.x/docs/cmdline-opts/parallel.d | 3 + .../libcurl/curl-7.x/docs/cmdline-opts/pass.d | 4 + .../curl-7.x/docs/cmdline-opts/path-as-is.d | 3 + .../curl-7.x/docs/cmdline-opts/pinnedpubkey.d | 6 +- .../curl-7.x/docs/cmdline-opts/post301.d | 2 + .../curl-7.x/docs/cmdline-opts/post302.d | 2 + .../curl-7.x/docs/cmdline-opts/post303.d | 2 + .../curl-7.x/docs/cmdline-opts/preproxy.d | 3 + .../curl-7.x/docs/cmdline-opts/progress-bar.d | 4 + .../docs/cmdline-opts/proto-default.d | 3 + .../curl-7.x/docs/cmdline-opts/proto-redir.d | 11 +- .../curl-7.x/docs/cmdline-opts/proto.d | 4 +- .../docs/cmdline-opts/proxy-anyauth.d | 2 + .../curl-7.x/docs/cmdline-opts/proxy-basic.d | 3 + .../curl-7.x/docs/cmdline-opts/proxy-cacert.d | 2 + .../curl-7.x/docs/cmdline-opts/proxy-capath.d | 2 + .../docs/cmdline-opts/proxy-cert-type.d | 3 + .../curl-7.x/docs/cmdline-opts/proxy-cert.d | 3 + .../docs/cmdline-opts/proxy-ciphers.d | 3 + .../docs/cmdline-opts/proxy-crlfile.d | 3 + .../curl-7.x/docs/cmdline-opts/proxy-digest.d | 3 + .../curl-7.x/docs/cmdline-opts/proxy-header.d | 3 + .../docs/cmdline-opts/proxy-insecure.d | 3 + .../docs/cmdline-opts/proxy-key-type.d | 3 + .../curl-7.x/docs/cmdline-opts/proxy-key.d | 4 + .../docs/cmdline-opts/proxy-negotiate.d | 2 + .../curl-7.x/docs/cmdline-opts/proxy-ntlm.d | 3 + .../curl-7.x/docs/cmdline-opts/proxy-pass.d | 3 + .../docs/cmdline-opts/proxy-pinnedpubkey.d | 6 +- .../docs/cmdline-opts/proxy-service-name.d | 3 + .../docs/cmdline-opts/proxy-ssl-allow-beast.d | 3 + .../docs/cmdline-opts/proxy-tls13-ciphers.d | 4 + .../docs/cmdline-opts/proxy-tlsauthtype.d | 3 + .../docs/cmdline-opts/proxy-tlspassword.d | 3 + .../docs/cmdline-opts/proxy-tlsuser.d | 3 + .../curl-7.x/docs/cmdline-opts/proxy-tlsv1.d | 3 + .../curl-7.x/docs/cmdline-opts/proxy-user.d | 8 +- .../curl-7.x/docs/cmdline-opts/proxy.d | 13 +- .../curl-7.x/docs/cmdline-opts/proxy1.0.d | 4 + .../curl-7.x/docs/cmdline-opts/proxytunnel.d | 3 + .../curl-7.x/docs/cmdline-opts/pubkey.d | 4 + .../curl-7.x/docs/cmdline-opts/quote.d | 19 +- .../curl-7.x/docs/cmdline-opts/random-file.d | 10 +- .../curl-7.x/docs/cmdline-opts/range.d | 10 +- .../libcurl/curl-7.x/docs/cmdline-opts/raw.d | 3 + .../curl-7.x/docs/cmdline-opts/referer.d | 9 +- .../docs/cmdline-opts/remote-header-name.d | 19 +- .../docs/cmdline-opts/remote-name-all.d | 3 + .../curl-7.x/docs/cmdline-opts/remote-name.d | 6 +- .../curl-7.x/docs/cmdline-opts/remote-time.d | 4 + .../docs/cmdline-opts/request-target.d | 5 +- .../curl-7.x/docs/cmdline-opts/request.d | 18 +- .../curl-7.x/docs/cmdline-opts/resolve.d | 5 +- .../docs/cmdline-opts/retry-all-errors.d | 11 +- .../docs/cmdline-opts/retry-connrefused.d | 3 + .../curl-7.x/docs/cmdline-opts/retry-delay.d | 3 + .../docs/cmdline-opts/retry-max-time.d | 9 +- .../curl-7.x/docs/cmdline-opts/retry.d | 5 +- .../curl-7.x/docs/cmdline-opts/sasl-authzid.d | 7 +- .../curl-7.x/docs/cmdline-opts/sasl-ir.d | 3 + .../curl-7.x/docs/cmdline-opts/service-name.d | 3 + .../curl-7.x/docs/cmdline-opts/show-error.d | 3 + .../curl-7.x/docs/cmdline-opts/silent.d | 5 +- .../curl-7.x/docs/cmdline-opts/socks4.d | 10 +- .../curl-7.x/docs/cmdline-opts/socks4a.d | 10 +- .../curl-7.x/docs/cmdline-opts/socks5-basic.d | 3 + .../docs/cmdline-opts/socks5-gssapi-nec.d | 5 +- .../docs/cmdline-opts/socks5-gssapi-service.d | 3 + .../docs/cmdline-opts/socks5-gssapi.d | 3 + .../docs/cmdline-opts/socks5-hostname.d | 10 +- .../curl-7.x/docs/cmdline-opts/socks5.d | 10 +- .../curl-7.x/docs/cmdline-opts/speed-limit.d | 6 +- .../curl-7.x/docs/cmdline-opts/speed-time.d | 12 +- .../docs/cmdline-opts/ssl-allow-beast.d | 9 +- .../docs/cmdline-opts/ssl-no-revoke.d | 3 + .../curl-7.x/docs/cmdline-opts/ssl-reqd.d | 13 +- .../cmdline-opts/ssl-revoke-best-effort.d | 3 + .../libcurl/curl-7.x/docs/cmdline-opts/ssl.d | 15 +- .../curl-7.x/docs/cmdline-opts/sslv2.d | 4 +- .../curl-7.x/docs/cmdline-opts/sslv3.d | 4 +- .../curl-7.x/docs/cmdline-opts/stderr.d | 3 + .../docs/cmdline-opts/styled-output.d | 3 + .../cmdline-opts/suppress-connect-headers.d | 5 +- .../curl-7.x/docs/cmdline-opts/tcp-fastopen.d | 3 + .../curl-7.x/docs/cmdline-opts/tcp-nodelay.d | 5 +- .../docs/cmdline-opts/telnet-option.d | 4 + .../curl-7.x/docs/cmdline-opts/tftp-blksize.d | 3 + .../docs/cmdline-opts/tftp-no-options.d | 3 + .../curl-7.x/docs/cmdline-opts/time-cond.d | 6 +- .../curl-7.x/docs/cmdline-opts/tls-max.d | 2 + .../docs/cmdline-opts/tls13-ciphers.d | 4 + .../curl-7.x/docs/cmdline-opts/tlsauthtype.d | 5 +- .../curl-7.x/docs/cmdline-opts/tlspassword.d | 5 +- .../curl-7.x/docs/cmdline-opts/tlsuser.d | 5 +- .../curl-7.x/docs/cmdline-opts/tlsv1.0.d | 7 +- .../curl-7.x/docs/cmdline-opts/tlsv1.1.d | 7 +- .../curl-7.x/docs/cmdline-opts/tlsv1.2.d | 7 +- .../curl-7.x/docs/cmdline-opts/tlsv1.3.d | 3 + .../curl-7.x/docs/cmdline-opts/tlsv1.d | 4 +- .../curl-7.x/docs/cmdline-opts/tr-encoding.d | 3 + .../curl-7.x/docs/cmdline-opts/trace-ascii.d | 10 +- .../curl-7.x/docs/cmdline-opts/trace-time.d | 3 + .../curl-7.x/docs/cmdline-opts/trace.d | 4 + .../curl-7.x/docs/cmdline-opts/unix-socket.d | 3 + .../curl-7.x/docs/cmdline-opts/upload-file.d | 4 + .../libcurl/curl-7.x/docs/cmdline-opts/url.d | 4 + .../curl-7.x/docs/cmdline-opts/use-ascii.d | 4 + .../curl-7.x/docs/cmdline-opts/user-agent.d | 4 + .../libcurl/curl-7.x/docs/cmdline-opts/user.d | 10 +- .../curl-7.x/docs/cmdline-opts/verbose.d | 7 +- .../curl-7.x/docs/cmdline-opts/version.d | 4 + .../curl-7.x/docs/cmdline-opts/write-out.d | 29 +- .../curl-7.x/docs/cmdline-opts/xattr.d | 4 + .../libs/libcurl/curl-7.x/docs/curl-config.1 | 6 +- trunk/libs/libcurl/curl-7.x/docs/curl.1 | 1637 +- .../curl-7.x/docs/examples/10-at-a-time.c | 4 +- .../curl-7.x/docs/examples/Makefile.am | 8 +- .../curl-7.x/docs/examples/Makefile.example | 4 +- .../curl-7.x/docs/examples/Makefile.in | 339 +- .../curl-7.x/docs/examples/Makefile.inc | 9 +- .../curl-7.x/docs/examples/Makefile.m32 | 104 +- .../curl-7.x/docs/examples/Makefile.netware | 436 - .../libcurl/curl-7.x/docs/examples/README.md | 10 +- .../libcurl/curl-7.x/docs/examples/altsvc.c | 4 +- .../curl-7.x/docs/examples/anyauthput.c | 16 +- .../curl-7.x/docs/examples/cacertinmem.c | 4 +- .../libcurl/curl-7.x/docs/examples/certinfo.c | 4 +- .../libcurl/curl-7.x/docs/examples/chkspeed.c | 26 +- .../curl-7.x/docs/examples/cookie_interface.c | 6 +- .../libcurl/curl-7.x/docs/examples/crawler.c | 17 +- .../libcurl/curl-7.x/docs/examples/curlgtk.c | 22 +- .../libcurl/curl-7.x/docs/examples/curlx.c | 574 - .../libcurl/curl-7.x/docs/examples/debug.c | 4 +- .../curl-7.x/docs/examples/ephiperfifo.c | 8 +- .../curl-7.x/docs/examples/evhiperfifo.c | 6 +- .../curl-7.x/docs/examples/externalsocket.c | 6 +- .../curl-7.x/docs/examples/fileupload.c | 18 +- .../libcurl/curl-7.x/docs/examples/fopen.c | 546 - .../curl-7.x/docs/examples/ftp-wildcard.c | 4 +- .../libcurl/curl-7.x/docs/examples/ftpget.c | 6 +- .../curl-7.x/docs/examples/ftpgetinfo.c | 4 +- .../curl-7.x/docs/examples/ftpgetresp.c | 4 +- .../libcurl/curl-7.x/docs/examples/ftpsget.c | 6 +- .../curl-7.x/docs/examples/ftpupload.c | 21 +- .../curl-7.x/docs/examples/ftpuploadfrommem.c | 4 +- .../curl-7.x/docs/examples/ftpuploadresume.c | 6 +- .../libcurl/curl-7.x/docs/examples/getinfo.c | 4 +- .../curl-7.x/docs/examples/getinmemory.c | 8 +- .../curl-7.x/docs/examples/getredirect.c | 4 +- .../curl-7.x/docs/examples/getreferrer.c | 4 +- .../libcurl/curl-7.x/docs/examples/ghiper.c | 6 +- .../curl-7.x/docs/examples/headerapi.c | 81 + .../curl-7.x/docs/examples/hiperfifo.c | 10 +- .../curl-7.x/docs/examples/href_extractor.c | 4 +- .../libcurl/curl-7.x/docs/examples/htmltidy.c | 12 +- .../curl-7.x/docs/examples/htmltitle.cpp | 4 +- .../curl-7.x/docs/examples/http-post.c | 4 +- .../curl-7.x/docs/examples/http2-download.c | 6 +- .../docs/examples/http2-pushinmemory.c | 6 +- .../curl-7.x/docs/examples/http2-serverpush.c | 8 +- .../curl-7.x/docs/examples/http2-upload.c | 8 +- .../curl-7.x/docs/examples/http3-present.c | 4 +- .../libcurl/curl-7.x/docs/examples/http3.c | 6 +- .../curl-7.x/docs/examples/httpcustomheader.c | 6 +- .../docs/examples/httpput-postfields.c | 8 +- .../libcurl/curl-7.x/docs/examples/httpput.c | 16 +- .../libcurl/curl-7.x/docs/examples/https.c | 8 +- .../curl-7.x/docs/examples/imap-append.c | 17 +- .../curl-7.x/docs/examples/imap-authzid.c | 8 +- .../curl-7.x/docs/examples/imap-copy.c | 6 +- .../curl-7.x/docs/examples/imap-create.c | 4 +- .../curl-7.x/docs/examples/imap-delete.c | 4 +- .../curl-7.x/docs/examples/imap-examine.c | 4 +- .../curl-7.x/docs/examples/imap-fetch.c | 6 +- .../curl-7.x/docs/examples/imap-list.c | 4 +- .../curl-7.x/docs/examples/imap-lsub.c | 4 +- .../curl-7.x/docs/examples/imap-multi.c | 4 +- .../curl-7.x/docs/examples/imap-noop.c | 4 +- .../curl-7.x/docs/examples/imap-search.c | 6 +- .../libcurl/curl-7.x/docs/examples/imap-ssl.c | 8 +- .../curl-7.x/docs/examples/imap-store.c | 8 +- .../libcurl/curl-7.x/docs/examples/imap-tls.c | 8 +- .../curl-7.x/docs/examples/makefile.dj | 4 +- .../curl-7.x/docs/examples/multi-app.c | 16 +- .../docs/examples/multi-debugcallback.c | 6 +- .../curl-7.x/docs/examples/multi-double.c | 4 +- .../curl-7.x/docs/examples/multi-event.c | 6 +- .../curl-7.x/docs/examples/multi-formadd.c | 4 +- .../curl-7.x/docs/examples/multi-legacy.c | 6 +- .../curl-7.x/docs/examples/multi-post.c | 4 +- .../curl-7.x/docs/examples/multi-single.c | 15 +- .../libcurl/curl-7.x/docs/examples/multi-uv.c | 6 +- .../curl-7.x/docs/examples/multithread.c | 4 +- .../docs/examples/opensslthreadlock.c | 4 +- .../libcurl/curl-7.x/docs/examples/parseurl.c | 4 +- .../curl-7.x/docs/examples/persistent.c | 4 +- .../curl-7.x/docs/examples/pop3-authzid.c | 8 +- .../curl-7.x/docs/examples/pop3-dele.c | 6 +- .../curl-7.x/docs/examples/pop3-list.c | 4 +- .../curl-7.x/docs/examples/pop3-multi.c | 4 +- .../curl-7.x/docs/examples/pop3-noop.c | 4 +- .../curl-7.x/docs/examples/pop3-retr.c | 6 +- .../libcurl/curl-7.x/docs/examples/pop3-ssl.c | 8 +- .../curl-7.x/docs/examples/pop3-stat.c | 4 +- .../libcurl/curl-7.x/docs/examples/pop3-tls.c | 8 +- .../libcurl/curl-7.x/docs/examples/pop3-top.c | 6 +- .../curl-7.x/docs/examples/pop3-uidl.c | 4 +- .../curl-7.x/docs/examples/post-callback.c | 4 +- .../curl-7.x/docs/examples/postinmemory.c | 8 +- .../curl-7.x/docs/examples/postit2-formadd.c | 6 +- .../libcurl/curl-7.x/docs/examples/postit2.c | 6 +- .../curl-7.x/docs/examples/progressfunc.c | 73 +- .../libcurl/curl-7.x/docs/examples/resolve.c | 4 +- .../libcurl/curl-7.x/docs/examples/rtsp.c | 291 - .../curl-7.x/docs/examples/sampleconv.c | 112 - .../libcurl/curl-7.x/docs/examples/sendrecv.c | 17 +- .../curl-7.x/docs/examples/sepheaders.c | 4 +- .../curl-7.x/docs/examples/sessioninfo.c | 4 +- .../libcurl/curl-7.x/docs/examples/sftpget.c | 10 +- .../curl-7.x/docs/examples/sftpuploadresume.c | 6 +- .../docs/examples/shared-connection-cache.c | 4 +- .../libcurl/curl-7.x/docs/examples/simple.c | 4 +- .../curl-7.x/docs/examples/simplepost.c | 6 +- .../curl-7.x/docs/examples/simplessl.c | 12 +- .../docs/examples/smooth-gtk-thread.c | 76 +- .../curl-7.x/docs/examples/smtp-authzid.c | 26 +- .../curl-7.x/docs/examples/smtp-expn.c | 16 +- .../curl-7.x/docs/examples/smtp-mail.c | 24 +- .../curl-7.x/docs/examples/smtp-mime.c | 32 +- .../curl-7.x/docs/examples/smtp-multi.c | 8 +- .../libcurl/curl-7.x/docs/examples/smtp-ssl.c | 12 +- .../libcurl/curl-7.x/docs/examples/smtp-tls.c | 12 +- .../curl-7.x/docs/examples/smtp-vrfy.c | 18 +- .../curl-7.x/docs/examples/sslbackend.c | 4 +- .../libcurl/curl-7.x/docs/examples/synctime.c | 8 +- .../curl-7.x/docs/examples/threaded-ssl.c | 8 +- .../libcurl/curl-7.x/docs/examples/url2file.c | 4 +- .../libcurl/curl-7.x/docs/examples/urlapi.c | 10 +- .../curl-7.x/docs/examples/usercertinmem.c | 4 +- .../curl-7.x/docs/examples/version-check.pl | 4 +- .../curl-7.x/docs/examples/xmlstream.c | 6 +- .../libs/libcurl/curl-7.x/docs/libcurl/ABI.md | 14 +- .../curl-7.x/docs/libcurl/CMakeLists.txt | 4 +- .../libcurl/curl-7.x/docs/libcurl/Makefile.am | 4 +- .../libcurl/curl-7.x/docs/libcurl/Makefile.in | 34 +- .../curl-7.x/docs/libcurl/Makefile.inc | 7 +- .../curl-7.x/docs/libcurl/curl_easy_cleanup.3 | 28 +- .../docs/libcurl/curl_easy_duphandle.3 | 28 +- .../curl-7.x/docs/libcurl/curl_easy_escape.3 | 31 +- .../curl-7.x/docs/libcurl/curl_easy_getinfo.3 | 51 +- .../curl-7.x/docs/libcurl/curl_easy_header.3 | 154 + .../curl-7.x/docs/libcurl/curl_easy_init.3 | 24 +- .../docs/libcurl/curl_easy_nextheader.3 | 97 + .../docs/libcurl/curl_easy_option_by_id.3 | 13 +- .../docs/libcurl/curl_easy_option_by_name.3 | 13 +- .../docs/libcurl/curl_easy_option_next.3 | 16 +- .../curl-7.x/docs/libcurl/curl_easy_pause.3 | 40 +- .../curl-7.x/docs/libcurl/curl_easy_perform.3 | 39 +- .../curl-7.x/docs/libcurl/curl_easy_recv.3 | 35 +- .../curl-7.x/docs/libcurl/curl_easy_reset.3 | 21 +- .../curl-7.x/docs/libcurl/curl_easy_send.3 | 40 +- .../curl-7.x/docs/libcurl/curl_easy_setopt.3 | 75 +- .../docs/libcurl/curl_easy_strerror.3 | 22 +- .../docs/libcurl/curl_easy_unescape.3 | 38 +- .../curl-7.x/docs/libcurl/curl_easy_upkeep.3 | 30 +- .../curl-7.x/docs/libcurl/curl_escape.3 | 29 +- .../curl-7.x/docs/libcurl/curl_formadd.3 | 75 +- .../curl-7.x/docs/libcurl/curl_formfree.3 | 33 +- .../curl-7.x/docs/libcurl/curl_formget.3 | 13 +- .../libcurl/curl-7.x/docs/libcurl/curl_free.3 | 29 +- .../curl-7.x/docs/libcurl/curl_getdate.3 | 79 +- .../curl-7.x/docs/libcurl/curl_getenv.3 | 29 +- .../docs/libcurl/curl_global_cleanup.3 | 35 +- .../curl-7.x/docs/libcurl/curl_global_init.3 | 47 +- .../docs/libcurl/curl_global_init_mem.3 | 37 +- .../docs/libcurl/curl_global_sslset.3 | 37 +- .../curl-7.x/docs/libcurl/curl_mime_addpart.3 | 25 +- .../curl-7.x/docs/libcurl/curl_mime_data.3 | 42 +- .../curl-7.x/docs/libcurl/curl_mime_data_cb.3 | 41 +- .../curl-7.x/docs/libcurl/curl_mime_encoder.3 | 30 +- .../docs/libcurl/curl_mime_filedata.3 | 37 +- .../docs/libcurl/curl_mime_filename.3 | 27 +- .../curl-7.x/docs/libcurl/curl_mime_free.3 | 27 +- .../curl-7.x/docs/libcurl/curl_mime_headers.3 | 29 +- .../curl-7.x/docs/libcurl/curl_mime_init.3 | 28 +- .../curl-7.x/docs/libcurl/curl_mime_name.3 | 29 +- .../docs/libcurl/curl_mime_subparts.3 | 46 +- .../curl-7.x/docs/libcurl/curl_mime_type.3 | 28 +- .../curl-7.x/docs/libcurl/curl_mprintf.3 | 73 +- .../docs/libcurl/curl_multi_add_handle.3 | 22 +- .../curl-7.x/docs/libcurl/curl_multi_assign.3 | 27 +- .../docs/libcurl/curl_multi_cleanup.3 | 24 +- .../curl-7.x/docs/libcurl/curl_multi_fdset.3 | 27 +- .../docs/libcurl/curl_multi_info_read.3 | 24 +- .../curl-7.x/docs/libcurl/curl_multi_init.3 | 26 +- .../docs/libcurl/curl_multi_perform.3 | 119 +- .../curl-7.x/docs/libcurl/curl_multi_poll.3 | 12 +- .../docs/libcurl/curl_multi_remove_handle.3 | 23 +- .../curl-7.x/docs/libcurl/curl_multi_setopt.3 | 27 +- .../curl-7.x/docs/libcurl/curl_multi_socket.3 | 103 +- .../docs/libcurl/curl_multi_socket_action.3 | 24 +- .../docs/libcurl/curl_multi_strerror.3 | 17 +- .../docs/libcurl/curl_multi_timeout.3 | 35 +- .../curl-7.x/docs/libcurl/curl_multi_wait.3 | 12 +- .../curl-7.x/docs/libcurl/curl_multi_wakeup.3 | 17 +- .../docs/libcurl/curl_share_cleanup.3 | 25 +- .../curl-7.x/docs/libcurl/curl_share_init.3 | 25 +- .../curl-7.x/docs/libcurl/curl_share_setopt.3 | 99 +- .../docs/libcurl/curl_share_strerror.3 | 17 +- .../curl-7.x/docs/libcurl/curl_slist_append.3 | 29 +- .../docs/libcurl/curl_slist_free_all.3 | 21 +- .../curl-7.x/docs/libcurl/curl_strequal.3 | 28 +- .../curl-7.x/docs/libcurl/curl_unescape.3 | 33 +- .../libcurl/curl-7.x/docs/libcurl/curl_url.3 | 18 +- .../curl-7.x/docs/libcurl/curl_url_cleanup.3 | 15 +- .../curl-7.x/docs/libcurl/curl_url_dup.3 | 15 +- .../curl-7.x/docs/libcurl/curl_url_get.3 | 35 +- .../curl-7.x/docs/libcurl/curl_url_set.3 | 49 +- .../curl-7.x/docs/libcurl/curl_url_strerror.3 | 52 + .../curl-7.x/docs/libcurl/curl_version.3 | 22 +- .../curl-7.x/docs/libcurl/curl_version_info.3 | 47 +- .../curl-7.x/docs/libcurl/libcurl-easy.3 | 25 +- .../curl-7.x/docs/libcurl/libcurl-env.3 | 18 +- .../curl-7.x/docs/libcurl/libcurl-errors.3 | 106 +- .../curl-7.x/docs/libcurl/libcurl-multi.3 | 21 +- .../curl-7.x/docs/libcurl/libcurl-security.3 | 139 +- .../curl-7.x/docs/libcurl/libcurl-share.3 | 10 +- .../curl-7.x/docs/libcurl/libcurl-symbols.3 | 4223 +- .../curl-7.x/docs/libcurl/libcurl-thread.3 | 22 +- .../curl-7.x/docs/libcurl/libcurl-tutorial.3 | 233 +- .../curl-7.x/docs/libcurl/libcurl-url.3 | 11 +- .../libcurl/curl-7.x/docs/libcurl/libcurl.3 | 102 +- .../libcurl/curl-7.x/docs/libcurl/libcurl.m4 | 4 +- .../curl-7.x/docs/libcurl/mksymbolsmanpage.pl | 6 +- .../curl-7.x/docs/libcurl/opts/CMakeLists.txt | 4 +- .../docs/libcurl/opts/CURLINFO_ACTIVESOCKET.3 | 10 +- .../libcurl/opts/CURLINFO_APPCONNECT_TIME.3 | 17 +- .../libcurl/opts/CURLINFO_APPCONNECT_TIME_T.3 | 23 +- .../docs/libcurl/opts/CURLINFO_CAINFO.3 | 68 + .../docs/libcurl/opts/CURLINFO_CAPATH.3 | 68 + .../docs/libcurl/opts/CURLINFO_CERTINFO.3 | 10 +- .../libcurl/opts/CURLINFO_CONDITION_UNMET.3 | 17 +- .../docs/libcurl/opts/CURLINFO_CONNECT_TIME.3 | 8 +- .../libcurl/opts/CURLINFO_CONNECT_TIME_T.3 | 15 +- .../opts/CURLINFO_CONTENT_LENGTH_DOWNLOAD.3 | 10 +- .../opts/CURLINFO_CONTENT_LENGTH_DOWNLOAD_T.3 | 10 +- .../opts/CURLINFO_CONTENT_LENGTH_UPLOAD.3 | 10 +- .../opts/CURLINFO_CONTENT_LENGTH_UPLOAD_T.3 | 10 +- .../docs/libcurl/opts/CURLINFO_CONTENT_TYPE.3 | 13 +- .../docs/libcurl/opts/CURLINFO_COOKIELIST.3 | 12 +- .../libcurl/opts/CURLINFO_EFFECTIVE_METHOD.3 | 10 +- .../libcurl/opts/CURLINFO_EFFECTIVE_URL.3 | 12 +- .../docs/libcurl/opts/CURLINFO_FILETIME.3 | 10 +- .../docs/libcurl/opts/CURLINFO_FILETIME_T.3 | 13 +- .../libcurl/opts/CURLINFO_FTP_ENTRY_PATH.3 | 8 +- .../docs/libcurl/opts/CURLINFO_HEADER_SIZE.3 | 8 +- .../libcurl/opts/CURLINFO_HTTPAUTH_AVAIL.3 | 8 +- .../libcurl/opts/CURLINFO_HTTP_CONNECTCODE.3 | 8 +- .../docs/libcurl/opts/CURLINFO_HTTP_VERSION.3 | 10 +- .../docs/libcurl/opts/CURLINFO_LASTSOCKET.3 | 10 +- .../docs/libcurl/opts/CURLINFO_LOCAL_IP.3 | 8 +- .../docs/libcurl/opts/CURLINFO_LOCAL_PORT.3 | 8 +- .../libcurl/opts/CURLINFO_NAMELOOKUP_TIME.3 | 11 +- .../libcurl/opts/CURLINFO_NAMELOOKUP_TIME_T.3 | 11 +- .../docs/libcurl/opts/CURLINFO_NUM_CONNECTS.3 | 8 +- .../docs/libcurl/opts/CURLINFO_OS_ERRNO.3 | 8 +- .../libcurl/opts/CURLINFO_PRETRANSFER_TIME.3 | 11 +- .../opts/CURLINFO_PRETRANSFER_TIME_T.3 | 11 +- .../docs/libcurl/opts/CURLINFO_PRIMARY_IP.3 | 8 +- .../docs/libcurl/opts/CURLINFO_PRIMARY_PORT.3 | 13 +- .../docs/libcurl/opts/CURLINFO_PRIVATE.3 | 8 +- .../docs/libcurl/opts/CURLINFO_PROTOCOL.3 | 12 +- .../libcurl/opts/CURLINFO_PROXYAUTH_AVAIL.3 | 11 +- .../docs/libcurl/opts/CURLINFO_PROXY_ERROR.3 | 6 +- .../opts/CURLINFO_PROXY_SSL_VERIFYRESULT.3 | 11 +- .../libcurl/opts/CURLINFO_REDIRECT_COUNT.3 | 11 +- .../libcurl/opts/CURLINFO_REDIRECT_TIME.3 | 11 +- .../libcurl/opts/CURLINFO_REDIRECT_TIME_T.3 | 11 +- .../docs/libcurl/opts/CURLINFO_REDIRECT_URL.3 | 14 +- .../docs/libcurl/opts/CURLINFO_REFERER.3 | 8 +- .../docs/libcurl/opts/CURLINFO_REQUEST_SIZE.3 | 8 +- .../libcurl/opts/CURLINFO_RESPONSE_CODE.3 | 22 +- .../docs/libcurl/opts/CURLINFO_RETRY_AFTER.3 | 15 +- .../libcurl/opts/CURLINFO_RTSP_CLIENT_CSEQ.3 | 11 +- .../libcurl/opts/CURLINFO_RTSP_CSEQ_RECV.3 | 8 +- .../libcurl/opts/CURLINFO_RTSP_SERVER_CSEQ.3 | 11 +- .../libcurl/opts/CURLINFO_RTSP_SESSION_ID.3 | 8 +- .../docs/libcurl/opts/CURLINFO_SCHEME.3 | 8 +- .../libcurl/opts/CURLINFO_SIZE_DOWNLOAD.3 | 8 +- .../libcurl/opts/CURLINFO_SIZE_DOWNLOAD_T.3 | 11 +- .../docs/libcurl/opts/CURLINFO_SIZE_UPLOAD.3 | 11 +- .../libcurl/opts/CURLINFO_SIZE_UPLOAD_T.3 | 11 +- .../libcurl/opts/CURLINFO_SPEED_DOWNLOAD.3 | 13 +- .../libcurl/opts/CURLINFO_SPEED_DOWNLOAD_T.3 | 11 +- .../docs/libcurl/opts/CURLINFO_SPEED_UPLOAD.3 | 10 +- .../libcurl/opts/CURLINFO_SPEED_UPLOAD_T.3 | 11 +- .../docs/libcurl/opts/CURLINFO_SSL_ENGINES.3 | 12 +- .../libcurl/opts/CURLINFO_SSL_VERIFYRESULT.3 | 11 +- .../opts/CURLINFO_STARTTRANSFER_TIME.3 | 11 +- .../opts/CURLINFO_STARTTRANSFER_TIME_T.3 | 11 +- .../docs/libcurl/opts/CURLINFO_TLS_SESSION.3 | 6 +- .../docs/libcurl/opts/CURLINFO_TLS_SSL_PTR.3 | 8 +- .../docs/libcurl/opts/CURLINFO_TOTAL_TIME.3 | 8 +- .../docs/libcurl/opts/CURLINFO_TOTAL_TIME_T.3 | 11 +- .../opts/CURLMOPT_CHUNK_LENGTH_PENALTY_SIZE.3 | 11 +- .../CURLMOPT_CONTENT_LENGTH_PENALTY_SIZE.3 | 11 +- .../docs/libcurl/opts/CURLMOPT_MAXCONNECTS.3 | 8 +- .../opts/CURLMOPT_MAX_CONCURRENT_STREAMS.3 | 6 +- .../opts/CURLMOPT_MAX_HOST_CONNECTIONS.3 | 11 +- .../opts/CURLMOPT_MAX_PIPELINE_LENGTH.3 | 11 +- .../opts/CURLMOPT_MAX_TOTAL_CONNECTIONS.3 | 11 +- .../docs/libcurl/opts/CURLMOPT_PIPELINING.3 | 8 +- .../opts/CURLMOPT_PIPELINING_SERVER_BL.3 | 11 +- .../opts/CURLMOPT_PIPELINING_SITE_BL.3 | 11 +- .../docs/libcurl/opts/CURLMOPT_PUSHDATA.3 | 6 +- .../docs/libcurl/opts/CURLMOPT_PUSHFUNCTION.3 | 10 +- .../docs/libcurl/opts/CURLMOPT_SOCKETDATA.3 | 6 +- .../libcurl/opts/CURLMOPT_SOCKETFUNCTION.3 | 10 +- .../docs/libcurl/opts/CURLMOPT_TIMERDATA.3 | 8 +- .../libcurl/opts/CURLMOPT_TIMERFUNCTION.3 | 30 +- .../opts/CURLOPT_ABSTRACT_UNIX_SOCKET.3 | 15 +- .../libcurl/opts/CURLOPT_ACCEPTTIMEOUT_MS.3 | 8 +- .../libcurl/opts/CURLOPT_ACCEPT_ENCODING.3 | 12 +- .../docs/libcurl/opts/CURLOPT_ADDRESS_SCOPE.3 | 8 +- .../docs/libcurl/opts/CURLOPT_ALTSVC.3 | 35 +- .../docs/libcurl/opts/CURLOPT_ALTSVC_CTRL.3 | 12 +- .../docs/libcurl/opts/CURLOPT_APPEND.3 | 8 +- .../docs/libcurl/opts/CURLOPT_AUTOREFERER.3 | 8 +- .../docs/libcurl/opts/CURLOPT_AWS_SIGV4.3 | 8 +- .../docs/libcurl/opts/CURLOPT_BUFFERSIZE.3 | 9 +- .../docs/libcurl/opts/CURLOPT_CAINFO.3 | 13 +- .../docs/libcurl/opts/CURLOPT_CAINFO_BLOB.3 | 15 +- .../docs/libcurl/opts/CURLOPT_CAPATH.3 | 11 +- .../docs/libcurl/opts/CURLOPT_CERTINFO.3 | 8 +- .../libcurl/opts/CURLOPT_CHUNK_BGN_FUNCTION.3 | 6 +- .../docs/libcurl/opts/CURLOPT_CHUNK_DATA.3 | 10 +- .../libcurl/opts/CURLOPT_CHUNK_END_FUNCTION.3 | 6 +- .../libcurl/opts/CURLOPT_CLOSESOCKETDATA.3 | 11 +- .../opts/CURLOPT_CLOSESOCKETFUNCTION.3 | 11 +- .../libcurl/opts/CURLOPT_CONNECTTIMEOUT.3 | 8 +- .../libcurl/opts/CURLOPT_CONNECTTIMEOUT_MS.3 | 11 +- .../docs/libcurl/opts/CURLOPT_CONNECT_ONLY.3 | 14 +- .../docs/libcurl/opts/CURLOPT_CONNECT_TO.3 | 6 +- .../opts/CURLOPT_CONV_FROM_NETWORK_FUNCTION.3 | 13 +- .../opts/CURLOPT_CONV_FROM_UTF8_FUNCTION.3 | 13 +- .../opts/CURLOPT_CONV_TO_NETWORK_FUNCTION.3 | 13 +- .../docs/libcurl/opts/CURLOPT_COOKIE.3 | 10 +- .../docs/libcurl/opts/CURLOPT_COOKIEFILE.3 | 10 +- .../docs/libcurl/opts/CURLOPT_COOKIEJAR.3 | 12 +- .../docs/libcurl/opts/CURLOPT_COOKIELIST.3 | 12 +- .../docs/libcurl/opts/CURLOPT_COOKIESESSION.3 | 10 +- .../libcurl/opts/CURLOPT_COPYPOSTFIELDS.3 | 8 +- .../curl-7.x/docs/libcurl/opts/CURLOPT_CRLF.3 | 8 +- .../docs/libcurl/opts/CURLOPT_CRLFILE.3 | 8 +- .../docs/libcurl/opts/CURLOPT_CURLU.3 | 16 +- .../docs/libcurl/opts/CURLOPT_CUSTOMREQUEST.3 | 12 +- .../docs/libcurl/opts/CURLOPT_DEBUGDATA.3 | 10 +- .../docs/libcurl/opts/CURLOPT_DEBUGFUNCTION.3 | 6 +- .../libcurl/opts/CURLOPT_DEFAULT_PROTOCOL.3 | 12 +- .../docs/libcurl/opts/CURLOPT_DIRLISTONLY.3 | 10 +- .../opts/CURLOPT_DISALLOW_USERNAME_IN_URL.3 | 15 +- .../libcurl/opts/CURLOPT_DNS_CACHE_TIMEOUT.3 | 14 +- .../docs/libcurl/opts/CURLOPT_DNS_INTERFACE.3 | 10 +- .../docs/libcurl/opts/CURLOPT_DNS_LOCAL_IP4.3 | 10 +- .../docs/libcurl/opts/CURLOPT_DNS_LOCAL_IP6.3 | 10 +- .../docs/libcurl/opts/CURLOPT_DNS_SERVERS.3 | 8 +- .../opts/CURLOPT_DNS_SHUFFLE_ADDRESSES.3 | 6 +- .../opts/CURLOPT_DNS_USE_GLOBAL_CACHE.3 | 8 +- .../libcurl/opts/CURLOPT_DOH_SSL_VERIFYHOST.3 | 11 +- .../libcurl/opts/CURLOPT_DOH_SSL_VERIFYPEER.3 | 15 +- .../opts/CURLOPT_DOH_SSL_VERIFYSTATUS.3 | 11 +- .../docs/libcurl/opts/CURLOPT_DOH_URL.3 | 26 +- .../docs/libcurl/opts/CURLOPT_EGDSOCKET.3 | 15 +- .../docs/libcurl/opts/CURLOPT_ERRORBUFFER.3 | 16 +- .../opts/CURLOPT_EXPECT_100_TIMEOUT_MS.3 | 6 +- .../docs/libcurl/opts/CURLOPT_FAILONERROR.3 | 8 +- .../docs/libcurl/opts/CURLOPT_FILETIME.3 | 10 +- .../docs/libcurl/opts/CURLOPT_FNMATCH_DATA.3 | 8 +- .../libcurl/opts/CURLOPT_FNMATCH_FUNCTION.3 | 6 +- .../libcurl/opts/CURLOPT_FOLLOWLOCATION.3 | 10 +- .../docs/libcurl/opts/CURLOPT_FORBID_REUSE.3 | 9 +- .../docs/libcurl/opts/CURLOPT_FRESH_CONNECT.3 | 10 +- .../docs/libcurl/opts/CURLOPT_FTPPORT.3 | 10 +- .../docs/libcurl/opts/CURLOPT_FTPSSLAUTH.3 | 8 +- .../docs/libcurl/opts/CURLOPT_FTP_ACCOUNT.3 | 8 +- .../opts/CURLOPT_FTP_ALTERNATIVE_TO_USER.3 | 8 +- .../opts/CURLOPT_FTP_CREATE_MISSING_DIRS.3 | 10 +- .../libcurl/opts/CURLOPT_FTP_FILEMETHOD.3 | 8 +- .../libcurl/opts/CURLOPT_FTP_SKIP_PASV_IP.3 | 8 +- .../docs/libcurl/opts/CURLOPT_FTP_SSL_CCC.3 | 10 +- .../docs/libcurl/opts/CURLOPT_FTP_USE_EPRT.3 | 8 +- .../docs/libcurl/opts/CURLOPT_FTP_USE_EPSV.3 | 8 +- .../docs/libcurl/opts/CURLOPT_FTP_USE_PRET.3 | 8 +- .../libcurl/opts/CURLOPT_GSSAPI_DELEGATION.3 | 8 +- .../opts/CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS.3 | 11 +- .../libcurl/opts/CURLOPT_HAPROXYPROTOCOL.3 | 8 +- .../docs/libcurl/opts/CURLOPT_HEADER.3 | 8 +- .../docs/libcurl/opts/CURLOPT_HEADERDATA.3 | 8 +- .../libcurl/opts/CURLOPT_HEADERFUNCTION.3 | 22 +- .../docs/libcurl/opts/CURLOPT_HEADEROPT.3 | 8 +- .../curl-7.x/docs/libcurl/opts/CURLOPT_HSTS.3 | 6 +- .../docs/libcurl/opts/CURLOPT_HSTSREADDATA.3 | 12 +- .../libcurl/opts/CURLOPT_HSTSREADFUNCTION.3 | 17 +- .../docs/libcurl/opts/CURLOPT_HSTSWRITEDATA.3 | 12 +- .../libcurl/opts/CURLOPT_HSTSWRITEFUNCTION.3 | 23 +- .../docs/libcurl/opts/CURLOPT_HSTS_CTRL.3 | 6 +- .../libcurl/opts/CURLOPT_HTTP09_ALLOWED.3 | 12 +- .../libcurl/opts/CURLOPT_HTTP200ALIASES.3 | 16 +- .../docs/libcurl/opts/CURLOPT_HTTPAUTH.3 | 6 +- .../docs/libcurl/opts/CURLOPT_HTTPGET.3 | 8 +- .../docs/libcurl/opts/CURLOPT_HTTPHEADER.3 | 25 +- .../docs/libcurl/opts/CURLOPT_HTTPPOST.3 | 6 +- .../libcurl/opts/CURLOPT_HTTPPROXYTUNNEL.3 | 8 +- .../opts/CURLOPT_HTTP_CONTENT_DECODING.3 | 6 +- .../opts/CURLOPT_HTTP_TRANSFER_DECODING.3 | 9 +- .../docs/libcurl/opts/CURLOPT_HTTP_VERSION.3 | 22 +- .../opts/CURLOPT_IGNORE_CONTENT_LENGTH.3 | 6 +- .../docs/libcurl/opts/CURLOPT_INFILESIZE.3 | 8 +- .../libcurl/opts/CURLOPT_INFILESIZE_LARGE.3 | 6 +- .../docs/libcurl/opts/CURLOPT_INTERFACE.3 | 8 +- .../libcurl/opts/CURLOPT_INTERLEAVEDATA.3 | 10 +- .../libcurl/opts/CURLOPT_INTERLEAVEFUNCTION.3 | 6 +- .../docs/libcurl/opts/CURLOPT_IOCTLDATA.3 | 10 +- .../docs/libcurl/opts/CURLOPT_IOCTLFUNCTION.3 | 8 +- .../docs/libcurl/opts/CURLOPT_IPRESOLVE.3 | 8 +- .../docs/libcurl/opts/CURLOPT_ISSUERCERT.3 | 8 +- .../libcurl/opts/CURLOPT_ISSUERCERT_BLOB.3 | 13 +- .../opts/CURLOPT_KEEP_SENDING_ON_ERROR.3 | 8 +- .../docs/libcurl/opts/CURLOPT_KEYPASSWD.3 | 8 +- .../docs/libcurl/opts/CURLOPT_KRBLEVEL.3 | 10 +- .../docs/libcurl/opts/CURLOPT_LOCALPORT.3 | 8 +- .../libcurl/opts/CURLOPT_LOCALPORTRANGE.3 | 8 +- .../docs/libcurl/opts/CURLOPT_LOGIN_OPTIONS.3 | 12 +- .../libcurl/opts/CURLOPT_LOW_SPEED_LIMIT.3 | 11 +- .../libcurl/opts/CURLOPT_LOW_SPEED_TIME.3 | 11 +- .../docs/libcurl/opts/CURLOPT_MAIL_AUTH.3 | 8 +- .../docs/libcurl/opts/CURLOPT_MAIL_FROM.3 | 8 +- .../docs/libcurl/opts/CURLOPT_MAIL_RCPT.3 | 6 +- .../opts/CURLOPT_MAIL_RCPT_ALLLOWFAILS.3 | 6 +- .../docs/libcurl/opts/CURLOPT_MAXAGE_CONN.3 | 20 +- .../docs/libcurl/opts/CURLOPT_MAXCONNECTS.3 | 10 +- .../docs/libcurl/opts/CURLOPT_MAXFILESIZE.3 | 8 +- .../libcurl/opts/CURLOPT_MAXFILESIZE_LARGE.3 | 6 +- .../libcurl/opts/CURLOPT_MAXLIFETIME_CONN.3 | 72 + .../docs/libcurl/opts/CURLOPT_MAXREDIRS.3 | 8 +- .../opts/CURLOPT_MAX_RECV_SPEED_LARGE.3 | 8 +- .../opts/CURLOPT_MAX_SEND_SPEED_LARGE.3 | 8 +- .../docs/libcurl/opts/CURLOPT_MIMEPOST.3 | 10 +- .../docs/libcurl/opts/CURLOPT_MIME_OPTIONS.3 | 94 + .../docs/libcurl/opts/CURLOPT_NETRC.3 | 79 +- .../docs/libcurl/opts/CURLOPT_NETRC_FILE.3 | 8 +- .../opts/CURLOPT_NEW_DIRECTORY_PERMS.3 | 6 +- .../libcurl/opts/CURLOPT_NEW_FILE_PERMS.3 | 6 +- .../docs/libcurl/opts/CURLOPT_NOBODY.3 | 8 +- .../docs/libcurl/opts/CURLOPT_NOPROGRESS.3 | 8 +- .../docs/libcurl/opts/CURLOPT_NOPROXY.3 | 10 +- .../docs/libcurl/opts/CURLOPT_NOSIGNAL.3 | 8 +- .../libcurl/opts/CURLOPT_OPENSOCKETDATA.3 | 10 +- .../libcurl/opts/CURLOPT_OPENSOCKETFUNCTION.3 | 6 +- .../docs/libcurl/opts/CURLOPT_PASSWORD.3 | 8 +- .../docs/libcurl/opts/CURLOPT_PATH_AS_IS.3 | 8 +- .../libcurl/opts/CURLOPT_PINNEDPUBLICKEY.3 | 15 +- .../docs/libcurl/opts/CURLOPT_PIPEWAIT.3 | 8 +- .../curl-7.x/docs/libcurl/opts/CURLOPT_PORT.3 | 19 +- .../curl-7.x/docs/libcurl/opts/CURLOPT_POST.3 | 10 +- .../docs/libcurl/opts/CURLOPT_POSTFIELDS.3 | 8 +- .../docs/libcurl/opts/CURLOPT_POSTFIELDSIZE.3 | 8 +- .../opts/CURLOPT_POSTFIELDSIZE_LARGE.3 | 6 +- .../docs/libcurl/opts/CURLOPT_POSTQUOTE.3 | 11 +- .../docs/libcurl/opts/CURLOPT_POSTREDIR.3 | 6 +- .../docs/libcurl/opts/CURLOPT_PREQUOTE.3 | 11 +- .../docs/libcurl/opts/CURLOPT_PREREQDATA.3 | 66 + .../libcurl/opts/CURLOPT_PREREQFUNCTION.3 | 106 + .../docs/libcurl/opts/CURLOPT_PRE_PROXY.3 | 10 +- .../docs/libcurl/opts/CURLOPT_PRIVATE.3 | 8 +- .../docs/libcurl/opts/CURLOPT_PROGRESSDATA.3 | 10 +- .../libcurl/opts/CURLOPT_PROGRESSFUNCTION.3 | 17 +- .../docs/libcurl/opts/CURLOPT_PROTOCOLS.3 | 14 +- .../docs/libcurl/opts/CURLOPT_PROTOCOLS_STR.3 | 83 + .../docs/libcurl/opts/CURLOPT_PROXY.3 | 15 +- .../docs/libcurl/opts/CURLOPT_PROXYAUTH.3 | 8 +- .../docs/libcurl/opts/CURLOPT_PROXYHEADER.3 | 8 +- .../docs/libcurl/opts/CURLOPT_PROXYPASSWORD.3 | 8 +- .../docs/libcurl/opts/CURLOPT_PROXYPORT.3 | 10 +- .../docs/libcurl/opts/CURLOPT_PROXYTYPE.3 | 14 +- .../docs/libcurl/opts/CURLOPT_PROXYUSERNAME.3 | 6 +- .../docs/libcurl/opts/CURLOPT_PROXYUSERPWD.3 | 8 +- .../docs/libcurl/opts/CURLOPT_PROXY_CAINFO.3 | 12 +- .../libcurl/opts/CURLOPT_PROXY_CAINFO_BLOB.3 | 13 +- .../docs/libcurl/opts/CURLOPT_PROXY_CAPATH.3 | 10 +- .../docs/libcurl/opts/CURLOPT_PROXY_CRLFILE.3 | 8 +- .../libcurl/opts/CURLOPT_PROXY_ISSUERCERT.3 | 10 +- .../opts/CURLOPT_PROXY_ISSUERCERT_BLOB.3 | 10 +- .../libcurl/opts/CURLOPT_PROXY_KEYPASSWD.3 | 8 +- .../opts/CURLOPT_PROXY_PINNEDPUBLICKEY.3 | 12 +- .../libcurl/opts/CURLOPT_PROXY_SERVICE_NAME.3 | 11 +- .../docs/libcurl/opts/CURLOPT_PROXY_SSLCERT.3 | 8 +- .../libcurl/opts/CURLOPT_PROXY_SSLCERTTYPE.3 | 15 +- .../libcurl/opts/CURLOPT_PROXY_SSLCERT_BLOB.3 | 15 +- .../docs/libcurl/opts/CURLOPT_PROXY_SSLKEY.3 | 14 +- .../libcurl/opts/CURLOPT_PROXY_SSLKEYTYPE.3 | 8 +- .../libcurl/opts/CURLOPT_PROXY_SSLKEY_BLOB.3 | 8 +- .../libcurl/opts/CURLOPT_PROXY_SSLVERSION.3 | 11 +- .../opts/CURLOPT_PROXY_SSL_CIPHER_LIST.3 | 41 +- .../libcurl/opts/CURLOPT_PROXY_SSL_OPTIONS.3 | 15 +- .../opts/CURLOPT_PROXY_SSL_VERIFYHOST.3 | 11 +- .../opts/CURLOPT_PROXY_SSL_VERIFYPEER.3 | 17 +- .../opts/CURLOPT_PROXY_TLS13_CIPHERS.3 | 15 +- .../opts/CURLOPT_PROXY_TLSAUTH_PASSWORD.3 | 13 +- .../libcurl/opts/CURLOPT_PROXY_TLSAUTH_TYPE.3 | 11 +- .../opts/CURLOPT_PROXY_TLSAUTH_USERNAME.3 | 13 +- .../opts/CURLOPT_PROXY_TRANSFER_MODE.3 | 11 +- .../curl-7.x/docs/libcurl/opts/CURLOPT_PUT.3 | 10 +- .../docs/libcurl/opts/CURLOPT_QUOTE.3 | 11 +- .../docs/libcurl/opts/CURLOPT_RANDOM_FILE.3 | 15 +- .../docs/libcurl/opts/CURLOPT_RANGE.3 | 15 +- .../docs/libcurl/opts/CURLOPT_READDATA.3 | 16 +- .../docs/libcurl/opts/CURLOPT_READFUNCTION.3 | 15 +- .../libcurl/opts/CURLOPT_REDIR_PROTOCOLS.3 | 14 +- .../opts/CURLOPT_REDIR_PROTOCOLS_STR.3 | 90 + .../docs/libcurl/opts/CURLOPT_REFERER.3 | 8 +- .../libcurl/opts/CURLOPT_REQUEST_TARGET.3 | 8 +- .../docs/libcurl/opts/CURLOPT_RESOLVE.3 | 68 +- .../opts/CURLOPT_RESOLVER_START_DATA.3 | 13 +- .../opts/CURLOPT_RESOLVER_START_FUNCTION.3 | 6 +- .../docs/libcurl/opts/CURLOPT_RESUME_FROM.3 | 8 +- .../libcurl/opts/CURLOPT_RESUME_FROM_LARGE.3 | 6 +- .../libcurl/opts/CURLOPT_RTSP_CLIENT_CSEQ.3 | 8 +- .../docs/libcurl/opts/CURLOPT_RTSP_REQUEST.3 | 8 +- .../libcurl/opts/CURLOPT_RTSP_SERVER_CSEQ.3 | 8 +- .../libcurl/opts/CURLOPT_RTSP_SESSION_ID.3 | 8 +- .../libcurl/opts/CURLOPT_RTSP_STREAM_URI.3 | 8 +- .../libcurl/opts/CURLOPT_RTSP_TRANSPORT.3 | 6 +- .../docs/libcurl/opts/CURLOPT_SASL_AUTHZID.3 | 16 +- .../docs/libcurl/opts/CURLOPT_SASL_IR.3 | 8 +- .../docs/libcurl/opts/CURLOPT_SEEKDATA.3 | 14 +- .../docs/libcurl/opts/CURLOPT_SEEKFUNCTION.3 | 8 +- ...UT.3 => CURLOPT_SERVER_RESPONSE_TIMEOUT.3} | 25 +- .../docs/libcurl/opts/CURLOPT_SERVICE_NAME.3 | 17 +- .../docs/libcurl/opts/CURLOPT_SHARE.3 | 10 +- .../docs/libcurl/opts/CURLOPT_SOCKOPTDATA.3 | 10 +- .../libcurl/opts/CURLOPT_SOCKOPTFUNCTION.3 | 8 +- .../docs/libcurl/opts/CURLOPT_SOCKS5_AUTH.3 | 8 +- .../libcurl/opts/CURLOPT_SOCKS5_GSSAPI_NEC.3 | 8 +- .../opts/CURLOPT_SOCKS5_GSSAPI_SERVICE.3 | 11 +- .../libcurl/opts/CURLOPT_SSH_AUTH_TYPES.3 | 10 +- .../libcurl/opts/CURLOPT_SSH_COMPRESSION.3 | 10 +- .../libcurl/opts/CURLOPT_SSH_HOSTKEYDATA.3 | 66 + .../opts/CURLOPT_SSH_HOSTKEYFUNCTION.3 | 88 + .../opts/CURLOPT_SSH_HOST_PUBLIC_KEY_MD5.3 | 8 +- .../opts/CURLOPT_SSH_HOST_PUBLIC_KEY_SHA256.3 | 63 + .../docs/libcurl/opts/CURLOPT_SSH_KEYDATA.3 | 10 +- .../libcurl/opts/CURLOPT_SSH_KEYFUNCTION.3 | 14 +- .../libcurl/opts/CURLOPT_SSH_KNOWNHOSTS.3 | 8 +- .../opts/CURLOPT_SSH_PRIVATE_KEYFILE.3 | 6 +- .../libcurl/opts/CURLOPT_SSH_PUBLIC_KEYFILE.3 | 6 +- .../docs/libcurl/opts/CURLOPT_SSLCERT.3 | 8 +- .../docs/libcurl/opts/CURLOPT_SSLCERTTYPE.3 | 18 +- .../docs/libcurl/opts/CURLOPT_SSLCERT_BLOB.3 | 20 +- .../docs/libcurl/opts/CURLOPT_SSLENGINE.3 | 8 +- .../libcurl/opts/CURLOPT_SSLENGINE_DEFAULT.3 | 8 +- .../docs/libcurl/opts/CURLOPT_SSLKEY.3 | 14 +- .../docs/libcurl/opts/CURLOPT_SSLKEYTYPE.3 | 8 +- .../docs/libcurl/opts/CURLOPT_SSLKEY_BLOB.3 | 8 +- .../docs/libcurl/opts/CURLOPT_SSLVERSION.3 | 8 +- .../libcurl/opts/CURLOPT_SSL_CIPHER_LIST.3 | 39 +- .../docs/libcurl/opts/CURLOPT_SSL_CTX_DATA.3 | 16 +- .../libcurl/opts/CURLOPT_SSL_CTX_FUNCTION.3 | 20 +- .../docs/libcurl/opts/CURLOPT_SSL_EC_CURVES.3 | 8 +- .../libcurl/opts/CURLOPT_SSL_ENABLE_ALPN.3 | 10 +- .../libcurl/opts/CURLOPT_SSL_ENABLE_NPN.3 | 8 +- .../libcurl/opts/CURLOPT_SSL_FALSESTART.3 | 8 +- .../docs/libcurl/opts/CURLOPT_SSL_OPTIONS.3 | 12 +- .../opts/CURLOPT_SSL_SESSIONID_CACHE.3 | 6 +- .../libcurl/opts/CURLOPT_SSL_VERIFYHOST.3 | 8 +- .../libcurl/opts/CURLOPT_SSL_VERIFYPEER.3 | 12 +- .../libcurl/opts/CURLOPT_SSL_VERIFYSTATUS.3 | 8 +- .../docs/libcurl/opts/CURLOPT_STDERR.3 | 13 +- .../libcurl/opts/CURLOPT_STREAM_DEPENDS.3 | 11 +- .../libcurl/opts/CURLOPT_STREAM_DEPENDS_E.3 | 11 +- .../docs/libcurl/opts/CURLOPT_STREAM_WEIGHT.3 | 8 +- .../opts/CURLOPT_SUPPRESS_CONNECT_HEADERS.3 | 6 +- .../docs/libcurl/opts/CURLOPT_TCP_FASTOPEN.3 | 8 +- .../docs/libcurl/opts/CURLOPT_TCP_KEEPALIVE.3 | 8 +- .../docs/libcurl/opts/CURLOPT_TCP_KEEPIDLE.3 | 11 +- .../docs/libcurl/opts/CURLOPT_TCP_KEEPINTVL.3 | 11 +- .../docs/libcurl/opts/CURLOPT_TCP_NODELAY.3 | 8 +- .../docs/libcurl/opts/CURLOPT_TELNETOPTIONS.3 | 10 +- .../docs/libcurl/opts/CURLOPT_TFTP_BLKSIZE.3 | 8 +- .../libcurl/opts/CURLOPT_TFTP_NO_OPTIONS.3 | 8 +- .../docs/libcurl/opts/CURLOPT_TIMECONDITION.3 | 8 +- .../docs/libcurl/opts/CURLOPT_TIMEOUT.3 | 8 +- .../docs/libcurl/opts/CURLOPT_TIMEOUT_MS.3 | 8 +- .../docs/libcurl/opts/CURLOPT_TIMEVALUE.3 | 8 +- .../libcurl/opts/CURLOPT_TIMEVALUE_LARGE.3 | 11 +- .../docs/libcurl/opts/CURLOPT_TLS13_CIPHERS.3 | 21 +- .../libcurl/opts/CURLOPT_TLSAUTH_PASSWORD.3 | 12 +- .../docs/libcurl/opts/CURLOPT_TLSAUTH_TYPE.3 | 10 +- .../libcurl/opts/CURLOPT_TLSAUTH_USERNAME.3 | 12 +- .../docs/libcurl/opts/CURLOPT_TRAILERDATA.3 | 8 +- .../libcurl/opts/CURLOPT_TRAILERFUNCTION.3 | 13 +- .../docs/libcurl/opts/CURLOPT_TRANSFERTEXT.3 | 8 +- .../libcurl/opts/CURLOPT_TRANSFER_ENCODING.3 | 11 +- .../libcurl/opts/CURLOPT_UNIX_SOCKET_PATH.3 | 10 +- .../libcurl/opts/CURLOPT_UNRESTRICTED_AUTH.3 | 22 +- .../libcurl/opts/CURLOPT_UPKEEP_INTERVAL_MS.3 | 11 +- .../docs/libcurl/opts/CURLOPT_UPLOAD.3 | 10 +- .../libcurl/opts/CURLOPT_UPLOAD_BUFFERSIZE.3 | 10 +- .../curl-7.x/docs/libcurl/opts/CURLOPT_URL.3 | 20 +- .../docs/libcurl/opts/CURLOPT_USERAGENT.3 | 8 +- .../docs/libcurl/opts/CURLOPT_USERNAME.3 | 8 +- .../docs/libcurl/opts/CURLOPT_USERPWD.3 | 10 +- .../docs/libcurl/opts/CURLOPT_USE_SSL.3 | 16 +- .../docs/libcurl/opts/CURLOPT_VERBOSE.3 | 10 +- .../docs/libcurl/opts/CURLOPT_WILDCARDMATCH.3 | 28 +- .../docs/libcurl/opts/CURLOPT_WRITEDATA.3 | 18 +- .../docs/libcurl/opts/CURLOPT_WRITEFUNCTION.3 | 10 +- .../docs/libcurl/opts/CURLOPT_XFERINFODATA.3 | 10 +- .../libcurl/opts/CURLOPT_XFERINFOFUNCTION.3 | 17 +- .../libcurl/opts/CURLOPT_XOAUTH2_BEARER.3 | 18 +- .../docs/libcurl/opts/CURLSHOPT_LOCKFUNC.3 | 73 + .../docs/libcurl/opts/CURLSHOPT_SHARE.3 | 100 + .../docs/libcurl/opts/CURLSHOPT_UNLOCKFUNC.3 | 71 + .../docs/libcurl/opts/CURLSHOPT_UNSHARE.3 | 73 + .../docs/libcurl/opts/CURLSHOPT_USERDATA.3 | 57 + .../curl-7.x/docs/libcurl/opts/Makefile.am | 4 +- .../curl-7.x/docs/libcurl/opts/Makefile.in | 121 +- .../curl-7.x/docs/libcurl/opts/Makefile.inc | 98 +- .../curl-7.x/docs/libcurl/symbols-in-versions | 569 +- .../libcurl/curl-7.x/docs/libcurl/symbols.pl | 4 +- .../libs/libcurl/curl-7.x/docs/mk-ca-bundle.1 | 4 +- .../libcurl/curl-7.x/docs/options-in-versions | 6 + .../libs/libcurl/curl-7.x/include/Makefile.am | 4 +- .../libs/libcurl/curl-7.x/include/Makefile.in | 23 +- trunk/libs/libcurl/curl-7.x/include/README.md | 6 + .../libcurl/curl-7.x/include/curl/Makefile.am | 8 +- .../libcurl/curl-7.x/include/curl/Makefile.in | 33 +- .../libs/libcurl/curl-7.x/include/curl/curl.h | 139 +- .../libcurl/curl-7.x/include/curl/curlver.h | 16 +- .../libs/libcurl/curl-7.x/include/curl/easy.h | 4 +- .../libcurl/curl-7.x/include/curl/header.h | 66 + .../libcurl/curl-7.x/include/curl/mprintf.h | 4 +- .../libcurl/curl-7.x/include/curl/multi.h | 8 +- .../libcurl/curl-7.x/include/curl/options.h | 6 +- .../curl-7.x/include/curl/stdcheaders.h | 4 +- .../libcurl/curl-7.x/include/curl/system.h | 22 +- .../curl-7.x/include/curl/typecheck-gcc.h | 19 +- .../libcurl/curl-7.x/include/curl/urlapi.h | 25 +- .../libs/libcurl/curl-7.x/lib/CMakeLists.txt | 14 +- trunk/libs/libcurl/curl-7.x/lib/Makefile.am | 30 +- trunk/libs/libcurl/curl-7.x/lib/Makefile.in | 510 +- trunk/libs/libcurl/curl-7.x/lib/Makefile.inc | 35 +- trunk/libs/libcurl/curl-7.x/lib/Makefile.m32 | 127 +- .../libcurl/curl-7.x/lib/Makefile.netware | 725 - .../libcurl/curl-7.x/lib/Makefile.vxworks | 198 - trunk/libs/libcurl/curl-7.x/lib/altsvc.c | 64 +- trunk/libs/libcurl/curl-7.x/lib/altsvc.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/amigaos.c | 210 +- trunk/libs/libcurl/curl-7.x/lib/amigaos.h | 18 +- trunk/libs/libcurl/curl-7.x/lib/arpa_telnet.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/asyn-ares.c | 50 +- trunk/libs/libcurl/curl-7.x/lib/asyn-thread.c | 19 +- trunk/libs/libcurl/curl-7.x/lib/asyn.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/base64.c | 111 +- trunk/libs/libcurl/curl-7.x/lib/bufref.c | 4 +- trunk/libs/libcurl/curl-7.x/lib/bufref.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/c-hyper.c | 259 +- trunk/libs/libcurl/curl-7.x/lib/c-hyper.h | 5 +- .../libcurl/curl-7.x/lib/config-amigaos.h | 27 +- trunk/libs/libcurl/curl-7.x/lib/config-dos.h | 33 +- trunk/libs/libcurl/curl-7.x/lib/config-mac.h | 22 +- .../libs/libcurl/curl-7.x/lib/config-os400.h | 138 +- .../libs/libcurl/curl-7.x/lib/config-plan9.h | 42 +- .../libs/libcurl/curl-7.x/lib/config-riscos.h | 133 +- trunk/libs/libcurl/curl-7.x/lib/config-tpf.h | 683 - .../libcurl/curl-7.x/lib/config-vxworks.h | 814 - .../libs/libcurl/curl-7.x/lib/config-win32.h | 110 +- .../libcurl/curl-7.x/lib/config-win32ce.h | 80 +- trunk/libs/libcurl/curl-7.x/lib/conncache.c | 78 +- trunk/libs/libcurl/curl-7.x/lib/conncache.h | 7 +- trunk/libs/libcurl/curl-7.x/lib/connect.c | 139 +- trunk/libs/libcurl/curl-7.x/lib/connect.h | 4 +- .../libcurl/curl-7.x/lib/content_encoding.c | 16 +- .../libcurl/curl-7.x/lib/content_encoding.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/cookie.c | 223 +- trunk/libs/libcurl/curl-7.x/lib/cookie.h | 25 +- .../libs/libcurl/curl-7.x/lib/curl_addrinfo.c | 4 +- .../libs/libcurl/curl-7.x/lib/curl_addrinfo.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/curl_base64.h | 11 +- .../libcurl/curl-7.x/lib/curl_config.h.cmake | 209 +- .../libcurl/curl-7.x/lib/curl_config.h.in | 129 +- trunk/libs/libcurl/curl-7.x/lib/curl_ctype.c | 7 +- trunk/libs/libcurl/curl-7.x/lib/curl_ctype.h | 32 +- trunk/libs/libcurl/curl-7.x/lib/curl_des.c | 13 +- trunk/libs/libcurl/curl-7.x/lib/curl_des.h | 13 +- trunk/libs/libcurl/curl-7.x/lib/curl_endian.c | 4 +- trunk/libs/libcurl/curl-7.x/lib/curl_endian.h | 4 +- .../libs/libcurl/curl-7.x/lib/curl_fnmatch.c | 4 +- .../libs/libcurl/curl-7.x/lib/curl_fnmatch.h | 4 +- .../libs/libcurl/curl-7.x/lib/curl_get_line.c | 4 +- .../libs/libcurl/curl-7.x/lib/curl_get_line.h | 4 +- .../libcurl/curl-7.x/lib/curl_gethostname.c | 4 +- .../libcurl/curl-7.x/lib/curl_gethostname.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/curl_gssapi.c | 28 +- trunk/libs/libcurl/curl-7.x/lib/curl_gssapi.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/curl_hmac.h | 6 +- trunk/libs/libcurl/curl-7.x/lib/curl_krb5.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/curl_ldap.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/curl_md4.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/curl_md5.h | 10 +- trunk/libs/libcurl/curl-7.x/lib/curl_memory.h | 4 +- .../libs/libcurl/curl-7.x/lib/curl_memrchr.c | 4 +- .../libs/libcurl/curl-7.x/lib/curl_memrchr.h | 4 +- .../libcurl/curl-7.x/lib/curl_multibyte.c | 14 +- .../libcurl/curl-7.x/lib/curl_multibyte.h | 4 +- .../libcurl/curl-7.x/lib/curl_ntlm_core.c | 78 +- .../libcurl/curl-7.x/lib/curl_ntlm_core.h | 37 +- .../libs/libcurl/curl-7.x/lib/curl_ntlm_wb.c | 4 +- .../libs/libcurl/curl-7.x/lib/curl_ntlm_wb.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/curl_path.c | 6 +- trunk/libs/libcurl/curl-7.x/lib/curl_path.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/curl_printf.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/curl_range.c | 4 +- trunk/libs/libcurl/curl-7.x/lib/curl_range.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/curl_rtmp.c | 6 +- trunk/libs/libcurl/curl-7.x/lib/curl_rtmp.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/curl_sasl.c | 129 +- trunk/libs/libcurl/curl-7.x/lib/curl_sasl.h | 73 +- trunk/libs/libcurl/curl-7.x/lib/curl_setup.h | 87 +- .../libcurl/curl-7.x/lib/curl_setup_once.h | 52 +- trunk/libs/libcurl/curl-7.x/lib/curl_sha256.h | 15 +- trunk/libs/libcurl/curl-7.x/lib/curl_sspi.c | 6 +- trunk/libs/libcurl/curl-7.x/lib/curl_sspi.h | 4 +- .../libs/libcurl/curl-7.x/lib/curl_threads.c | 4 +- .../libs/libcurl/curl-7.x/lib/curl_threads.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/curlx.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/dict.c | 16 +- trunk/libs/libcurl/curl-7.x/lib/dict.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/doh.c | 50 +- trunk/libs/libcurl/curl-7.x/lib/doh.h | 51 +- trunk/libs/libcurl/curl-7.x/lib/dotdot.c | 6 +- trunk/libs/libcurl/curl-7.x/lib/dotdot.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/dynbuf.c | 4 +- trunk/libs/libcurl/curl-7.x/lib/dynbuf.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/easy.c | 130 +- trunk/libs/libcurl/curl-7.x/lib/easy_lock.h | 105 + trunk/libs/libcurl/curl-7.x/lib/easygetopt.c | 4 +- trunk/libs/libcurl/curl-7.x/lib/easyif.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/easyoptions.c | 25 +- trunk/libs/libcurl/curl-7.x/lib/easyoptions.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/escape.c | 43 +- trunk/libs/libcurl/curl-7.x/lib/escape.h | 7 +- trunk/libs/libcurl/curl-7.x/lib/file.c | 35 +- trunk/libs/libcurl/curl-7.x/lib/file.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/fileinfo.c | 4 +- trunk/libs/libcurl/curl-7.x/lib/fileinfo.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/fopen.c | 113 + .../{src/tool_convert.h => lib/fopen.h} | 28 +- trunk/libs/libcurl/curl-7.x/lib/formdata.c | 25 +- trunk/libs/libcurl/curl-7.x/lib/formdata.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/ftp.c | 80 +- trunk/libs/libcurl/curl-7.x/lib/ftp.h | 7 +- .../libs/libcurl/curl-7.x/lib/ftplistparser.c | 4 +- .../libs/libcurl/curl-7.x/lib/ftplistparser.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/getenv.c | 4 +- trunk/libs/libcurl/curl-7.x/lib/getinfo.c | 22 +- trunk/libs/libcurl/curl-7.x/lib/getinfo.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/gopher.c | 6 +- trunk/libs/libcurl/curl-7.x/lib/gopher.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/h2h3.c | 309 + trunk/libs/libcurl/curl-7.x/lib/h2h3.h | 61 + trunk/libs/libcurl/curl-7.x/lib/hash.c | 86 +- trunk/libs/libcurl/curl-7.x/lib/hash.h | 14 +- trunk/libs/libcurl/curl-7.x/lib/headers.c | 386 + trunk/libs/libcurl/curl-7.x/lib/headers.h | 55 + trunk/libs/libcurl/curl-7.x/lib/hmac.c | 8 +- trunk/libs/libcurl/curl-7.x/lib/hostasyn.c | 4 +- trunk/libs/libcurl/curl-7.x/lib/hostip.c | 84 +- trunk/libs/libcurl/curl-7.x/lib/hostip.h | 8 +- trunk/libs/libcurl/curl-7.x/lib/hostip4.c | 10 +- trunk/libs/libcurl/curl-7.x/lib/hostip6.c | 4 +- trunk/libs/libcurl/curl-7.x/lib/hostsyn.c | 4 +- trunk/libs/libcurl/curl-7.x/lib/hsts.c | 61 +- trunk/libs/libcurl/curl-7.x/lib/hsts.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/http.c | 429 +- trunk/libs/libcurl/curl-7.x/lib/http.h | 72 +- trunk/libs/libcurl/curl-7.x/lib/http2.c | 421 +- trunk/libs/libcurl/curl-7.x/lib/http2.h | 4 +- .../libcurl/curl-7.x/lib/http_aws_sigv4.c | 39 +- .../libcurl/curl-7.x/lib/http_aws_sigv4.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/http_chunks.c | 40 +- trunk/libs/libcurl/curl-7.x/lib/http_chunks.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/http_digest.c | 4 +- trunk/libs/libcurl/curl-7.x/lib/http_digest.h | 4 +- .../libcurl/curl-7.x/lib/http_negotiate.c | 6 +- .../libcurl/curl-7.x/lib/http_negotiate.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/http_ntlm.c | 21 +- trunk/libs/libcurl/curl-7.x/lib/http_ntlm.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/http_proxy.c | 174 +- trunk/libs/libcurl/curl-7.x/lib/http_proxy.h | 8 +- trunk/libs/libcurl/curl-7.x/lib/idn_win32.c | 28 +- trunk/libs/libcurl/curl-7.x/lib/if2ip.c | 50 +- trunk/libs/libcurl/curl-7.x/lib/if2ip.h | 16 +- trunk/libs/libcurl/curl-7.x/lib/imap.c | 197 +- trunk/libs/libcurl/curl-7.x/lib/imap.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/inet_ntop.c | 4 +- trunk/libs/libcurl/curl-7.x/lib/inet_ntop.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/inet_pton.c | 8 +- trunk/libs/libcurl/curl-7.x/lib/inet_pton.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/krb5.c | 40 +- trunk/libs/libcurl/curl-7.x/lib/ldap.c | 62 +- trunk/libs/libcurl/curl-7.x/lib/libcurl.plist | 6 +- .../libcurl/curl-7.x/lib/libcurl.plist.in | 35 + trunk/libs/libcurl/curl-7.x/lib/libcurl.rc | 6 +- trunk/libs/libcurl/curl-7.x/lib/llist.c | 8 +- trunk/libs/libcurl/curl-7.x/lib/llist.h | 4 +- .../libs/libcurl/curl-7.x/lib/makefile.amiga | 5 +- trunk/libs/libcurl/curl-7.x/lib/makefile.dj | 4 +- trunk/libs/libcurl/curl-7.x/lib/md4.c | 24 +- trunk/libs/libcurl/curl-7.x/lib/md5.c | 186 +- trunk/libs/libcurl/curl-7.x/lib/memdebug.c | 25 +- trunk/libs/libcurl/curl-7.x/lib/memdebug.h | 46 +- trunk/libs/libcurl/curl-7.x/lib/mime.c | 205 +- trunk/libs/libcurl/curl-7.x/lib/mime.h | 11 +- .../libcurl/curl-7.x/lib/mk-ca-bundle.vbs | 431 - trunk/libs/libcurl/curl-7.x/lib/mprintf.c | 31 +- trunk/libs/libcurl/curl-7.x/lib/mqtt.c | 31 +- trunk/libs/libcurl/curl-7.x/lib/mqtt.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/multi.c | 396 +- trunk/libs/libcurl/curl-7.x/lib/multihandle.h | 6 +- trunk/libs/libcurl/curl-7.x/lib/multiif.h | 17 +- trunk/libs/libcurl/curl-7.x/lib/netrc.c | 92 +- trunk/libs/libcurl/curl-7.x/lib/netrc.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/non-ascii.c | 336 - trunk/libs/libcurl/curl-7.x/lib/non-ascii.h | 61 - trunk/libs/libcurl/curl-7.x/lib/nonblock.c | 6 +- trunk/libs/libcurl/curl-7.x/lib/nonblock.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/nwlib.c | 327 - trunk/libs/libcurl/curl-7.x/lib/nwos.c | 88 - trunk/libs/libcurl/curl-7.x/lib/openldap.c | 1130 +- trunk/libs/libcurl/curl-7.x/lib/parsedate.c | 4 +- trunk/libs/libcurl/curl-7.x/lib/parsedate.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/pingpong.c | 20 +- trunk/libs/libcurl/curl-7.x/lib/pingpong.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/pop3.c | 118 +- trunk/libs/libcurl/curl-7.x/lib/pop3.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/progress.c | 4 +- trunk/libs/libcurl/curl-7.x/lib/progress.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/psl.c | 4 +- trunk/libs/libcurl/curl-7.x/lib/psl.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/quic.h | 8 +- trunk/libs/libcurl/curl-7.x/lib/rand.c | 77 +- trunk/libs/libcurl/curl-7.x/lib/rand.h | 10 +- trunk/libs/libcurl/curl-7.x/lib/rename.c | 4 +- trunk/libs/libcurl/curl-7.x/lib/rename.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/rtsp.c | 43 +- trunk/libs/libcurl/curl-7.x/lib/rtsp.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/select.c | 108 +- trunk/libs/libcurl/curl-7.x/lib/select.h | 19 +- trunk/libs/libcurl/curl-7.x/lib/sendf.c | 126 +- trunk/libs/libcurl/curl-7.x/lib/sendf.h | 16 +- trunk/libs/libcurl/curl-7.x/lib/setopt.c | 322 +- trunk/libs/libcurl/curl-7.x/lib/setopt.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/setup-os400.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/setup-vms.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/setup-win32.h | 16 +- trunk/libs/libcurl/curl-7.x/lib/sha256.c | 151 +- trunk/libs/libcurl/curl-7.x/lib/share.c | 10 +- trunk/libs/libcurl/curl-7.x/lib/share.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/sigpipe.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/slist.c | 4 +- trunk/libs/libcurl/curl-7.x/lib/slist.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/smb.c | 25 +- trunk/libs/libcurl/curl-7.x/lib/smb.h | 6 +- trunk/libs/libcurl/curl-7.x/lib/smtp.c | 132 +- trunk/libs/libcurl/curl-7.x/lib/smtp.h | 8 +- trunk/libs/libcurl/curl-7.x/lib/sockaddr.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/socketpair.c | 4 +- trunk/libs/libcurl/curl-7.x/lib/socketpair.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/socks.c | 37 +- trunk/libs/libcurl/curl-7.x/lib/socks.h | 6 +- .../libs/libcurl/curl-7.x/lib/socks_gssapi.c | 12 +- trunk/libs/libcurl/curl-7.x/lib/socks_sspi.c | 8 +- trunk/libs/libcurl/curl-7.x/lib/speedcheck.c | 4 +- trunk/libs/libcurl/curl-7.x/lib/speedcheck.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/splay.c | 12 +- trunk/libs/libcurl/curl-7.x/lib/splay.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/strcase.c | 200 +- trunk/libs/libcurl/curl-7.x/lib/strcase.h | 15 +- trunk/libs/libcurl/curl-7.x/lib/strdup.c | 4 +- trunk/libs/libcurl/curl-7.x/lib/strdup.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/strerror.c | 152 +- trunk/libs/libcurl/curl-7.x/lib/strerror.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/strtok.c | 4 +- trunk/libs/libcurl/curl-7.x/lib/strtok.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/strtoofft.c | 4 +- trunk/libs/libcurl/curl-7.x/lib/strtoofft.h | 4 +- .../libs/libcurl/curl-7.x/lib/system_win32.c | 8 +- .../libs/libcurl/curl-7.x/lib/system_win32.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/telnet.c | 8 +- trunk/libs/libcurl/curl-7.x/lib/telnet.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/tftp.c | 16 +- trunk/libs/libcurl/curl-7.x/lib/tftp.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/timediff.c | 86 + trunk/libs/libcurl/curl-7.x/lib/timediff.h | 52 + trunk/libs/libcurl/curl-7.x/lib/timeval.c | 4 +- trunk/libs/libcurl/curl-7.x/lib/timeval.h | 12 +- trunk/libs/libcurl/curl-7.x/lib/transfer.c | 234 +- trunk/libs/libcurl/curl-7.x/lib/transfer.h | 7 +- trunk/libs/libcurl/curl-7.x/lib/url.c | 742 +- trunk/libs/libcurl/curl-7.x/lib/url.h | 8 +- trunk/libs/libcurl/curl-7.x/lib/urlapi-int.h | 6 +- trunk/libs/libcurl/curl-7.x/lib/urlapi.c | 512 +- trunk/libs/libcurl/curl-7.x/lib/urldata.h | 315 +- .../libcurl/curl-7.x/lib/vauth/cleartext.c | 4 +- trunk/libs/libcurl/curl-7.x/lib/vauth/cram.c | 4 +- .../libs/libcurl/curl-7.x/lib/vauth/digest.c | 213 +- .../libs/libcurl/curl-7.x/lib/vauth/digest.h | 13 +- .../libcurl/curl-7.x/lib/vauth/digest_sspi.c | 4 +- trunk/libs/libcurl/curl-7.x/lib/vauth/gsasl.c | 4 +- .../libcurl/curl-7.x/lib/vauth/krb5_gssapi.c | 4 +- .../libcurl/curl-7.x/lib/vauth/krb5_sspi.c | 4 +- trunk/libs/libcurl/curl-7.x/lib/vauth/ntlm.c | 110 +- trunk/libs/libcurl/curl-7.x/lib/vauth/ntlm.h | 4 +- .../libcurl/curl-7.x/lib/vauth/ntlm_sspi.c | 4 +- .../libs/libcurl/curl-7.x/lib/vauth/oauth2.c | 4 +- .../curl-7.x/lib/vauth/spnego_gssapi.c | 10 +- .../libcurl/curl-7.x/lib/vauth/spnego_sspi.c | 26 +- trunk/libs/libcurl/curl-7.x/lib/vauth/vauth.c | 4 +- trunk/libs/libcurl/curl-7.x/lib/vauth/vauth.h | 7 +- trunk/libs/libcurl/curl-7.x/lib/version.c | 39 +- .../libs/libcurl/curl-7.x/lib/version_win32.c | 117 +- .../libs/libcurl/curl-7.x/lib/version_win32.h | 5 +- trunk/libs/libcurl/curl-7.x/lib/vquic/msh3.c | 527 + .../lib/{vtls/mesalink.h => vquic/msh3.h} | 24 +- .../libs/libcurl/curl-7.x/lib/vquic/ngtcp2.c | 1202 +- .../libs/libcurl/curl-7.x/lib/vquic/ngtcp2.h | 36 +- .../libs/libcurl/curl-7.x/lib/vquic/quiche.c | 349 +- .../libs/libcurl/curl-7.x/lib/vquic/quiche.h | 10 +- trunk/libs/libcurl/curl-7.x/lib/vquic/vquic.c | 6 +- trunk/libs/libcurl/curl-7.x/lib/vquic/vquic.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/vssh/libssh.c | 84 +- .../libs/libcurl/curl-7.x/lib/vssh/libssh2.c | 276 +- trunk/libs/libcurl/curl-7.x/lib/vssh/ssh.h | 14 +- .../libs/libcurl/curl-7.x/lib/vssh/wolfssh.c | 22 +- .../libs/libcurl/curl-7.x/lib/vtls/bearssl.c | 345 +- .../libs/libcurl/curl-7.x/lib/vtls/bearssl.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/vtls/gskit.c | 110 +- trunk/libs/libcurl/curl-7.x/lib/vtls/gskit.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/vtls/gtls.c | 201 +- trunk/libs/libcurl/curl-7.x/lib/vtls/gtls.h | 10 +- .../curl-7.x/lib/{ => vtls}/hostcheck.c | 120 +- .../curl-7.x/lib/{ => vtls}/hostcheck.h | 10 +- trunk/libs/libcurl/curl-7.x/lib/vtls/keylog.c | 4 +- trunk/libs/libcurl/curl-7.x/lib/vtls/keylog.h | 4 +- .../libs/libcurl/curl-7.x/lib/vtls/mbedtls.c | 198 +- .../libs/libcurl/curl-7.x/lib/vtls/mbedtls.h | 4 +- .../curl-7.x/lib/vtls/mbedtls_threadlock.c | 4 +- .../curl-7.x/lib/vtls/mbedtls_threadlock.h | 4 +- .../libs/libcurl/curl-7.x/lib/vtls/mesalink.c | 674 - trunk/libs/libcurl/curl-7.x/lib/vtls/nss.c | 218 +- trunk/libs/libcurl/curl-7.x/lib/vtls/nssg.h | 4 +- .../libs/libcurl/curl-7.x/lib/vtls/openssl.c | 651 +- .../libs/libcurl/curl-7.x/lib/vtls/openssl.h | 24 +- trunk/libs/libcurl/curl-7.x/lib/vtls/rustls.c | 143 +- trunk/libs/libcurl/curl-7.x/lib/vtls/rustls.h | 4 +- .../libs/libcurl/curl-7.x/lib/vtls/schannel.c | 956 +- .../libs/libcurl/curl-7.x/lib/vtls/schannel.h | 86 +- .../curl-7.x/lib/vtls/schannel_verify.c | 22 +- .../libcurl/curl-7.x/lib/vtls/sectransp.c | 92 +- .../libcurl/curl-7.x/lib/vtls/sectransp.h | 4 +- trunk/libs/libcurl/curl-7.x/lib/vtls/vtls.c | 113 +- trunk/libs/libcurl/curl-7.x/lib/vtls/vtls.h | 27 +- .../libs/libcurl/curl-7.x/lib/vtls/wolfssl.c | 141 +- .../libs/libcurl/curl-7.x/lib/vtls/wolfssl.h | 4 +- .../curl-7.x/lib/{ => vtls}/x509asn1.c | 281 +- .../curl-7.x/lib/{ => vtls}/x509asn1.h | 60 +- trunk/libs/libcurl/curl-7.x/lib/warnless.c | 8 +- trunk/libs/libcurl/curl-7.x/lib/warnless.h | 10 +- trunk/libs/libcurl/curl-7.x/lib/wildcard.c | 4 +- trunk/libs/libcurl/curl-7.x/lib/wildcard.h | 4 +- trunk/libs/libcurl/curl-7.x/libcurl.pc.in | 4 +- trunk/libs/libcurl/curl-7.x/ltmain.sh | 827 +- .../curl-7.x/m4/ax_compile_check_sizeof.m4 | 115 - trunk/libs/libcurl/curl-7.x/m4/curl-amissl.m4 | 43 +- .../libs/libcurl/curl-7.x/m4/curl-bearssl.m4 | 4 +- .../libcurl/curl-7.x/m4/curl-compilers.m4 | 80 +- .../libs/libcurl/curl-7.x/m4/curl-confopts.m4 | 107 +- .../libcurl/curl-7.x/m4/curl-functions.m4 | 862 +- trunk/libs/libcurl/curl-7.x/m4/curl-gnutls.m4 | 4 +- .../libs/libcurl/curl-7.x/m4/curl-mbedtls.m4 | 4 +- .../libs/libcurl/curl-7.x/m4/curl-mesalink.m4 | 107 - trunk/libs/libcurl/curl-7.x/m4/curl-nss.m4 | 4 +- .../libs/libcurl/curl-7.x/m4/curl-openssl.m4 | 312 +- .../libs/libcurl/curl-7.x/m4/curl-override.m4 | 4 +- .../libcurl/curl-7.x/m4/curl-reentrant.m4 | 4 +- trunk/libs/libcurl/curl-7.x/m4/curl-rustls.m4 | 21 +- .../libs/libcurl/curl-7.x/m4/curl-schannel.m4 | 4 +- .../libcurl/curl-7.x/m4/curl-sectransp.m4 | 4 +- .../libcurl/curl-7.x/m4/curl-sysconfig.m4 | 4 +- .../libs/libcurl/curl-7.x/m4/curl-wolfssl.m4 | 20 +- trunk/libs/libcurl/curl-7.x/m4/libtool.m4 | 229 +- trunk/libs/libcurl/curl-7.x/m4/ltoptions.m4 | 4 +- trunk/libs/libcurl/curl-7.x/m4/ltsugar.m4 | 2 +- trunk/libs/libcurl/curl-7.x/m4/ltversion.m4 | 13 +- trunk/libs/libcurl/curl-7.x/m4/lt~obsolete.m4 | 4 +- trunk/libs/libcurl/curl-7.x/m4/xc-am-iface.m4 | 4 +- trunk/libs/libcurl/curl-7.x/m4/xc-cc-check.m4 | 4 +- trunk/libs/libcurl/curl-7.x/m4/xc-lt-iface.m4 | 6 +- trunk/libs/libcurl/curl-7.x/m4/xc-translit.m4 | 4 +- trunk/libs/libcurl/curl-7.x/m4/xc-val-flgs.m4 | 4 +- trunk/libs/libcurl/curl-7.x/m4/zz40-xc-ovr.m4 | 4 +- trunk/libs/libcurl/curl-7.x/m4/zz50-xc-ovr.m4 | 4 +- trunk/libs/libcurl/curl-7.x/m4/zz60-xc-ovr.m4 | 4 +- trunk/libs/libcurl/curl-7.x/maketgz | 16 +- .../curl-7.x/packages/Android/Android.mk | 4 +- .../libcurl/curl-7.x/packages/DOS/common.dj | 8 +- .../libcurl/curl-7.x/packages/Makefile.am | 9 +- .../libcurl/curl-7.x/packages/Makefile.in | 34 +- .../curl-7.x/packages/OS400/README.OS400 | 8 +- .../curl-7.x/packages/OS400/ccsidcurl.c | 4 +- .../curl-7.x/packages/OS400/ccsidcurl.h | 4 +- .../curl-7.x/packages/OS400/chkstrings.c | 4 +- .../curl-7.x/packages/OS400/curl.inc.in | 25 +- .../curl-7.x/packages/OS400/initscript.sh | 12 +- .../curl-7.x/packages/OS400/make-include.sh | 4 +- .../curl-7.x/packages/OS400/make-lib.sh | 4 +- .../curl-7.x/packages/OS400/make-src.sh | 4 +- .../curl-7.x/packages/OS400/make-tests.sh | 4 +- .../curl-7.x/packages/OS400/makefile.sh | 10 +- .../curl-7.x/packages/OS400/os400sys.c | 4 +- .../curl-7.x/packages/OS400/os400sys.h | 4 +- .../libcurl/curl-7.x/packages/TPF/curl.mak | 80 - .../curl-7.x/packages/TPF/maketpf.env_curl | 45 - .../curl-7.x/packages/TPF/maketpf.env_curllib | 77 - .../libcurl/curl-7.x/packages/vms/Makefile.am | 4 +- .../libcurl/curl-7.x/packages/vms/Makefile.in | 27 +- .../packages/vms/backup_gnv_curl_src.com | 4 +- .../packages/vms/build_curl-config_script.com | 3 +- .../curl-7.x/packages/vms/build_gnv_curl.com | 3 +- .../packages/vms/build_gnv_curl_pcsi_desc.com | 3 +- .../packages/vms/build_gnv_curl_pcsi_text.com | 3 +- .../vms/build_gnv_curl_release_notes.com | 4 +- .../packages/vms/build_libcurl_pc.com | 3 +- .../curl-7.x/packages/vms/clean_gnv_curl.com | 6 +- .../packages/vms/compare_curl_source.com | 11 +- .../curl-7.x/packages/vms/config_h.com | 74 +- .../curl-7.x/packages/vms/curl_crtl_init.c | 4 +- .../packages/vms/curl_gnv_build_steps.txt | 4 +- .../curl-7.x/packages/vms/curl_startup.com | 4 +- .../libcurl/curl-7.x/packages/vms/curlmsg.h | 4 +- .../libcurl/curl-7.x/packages/vms/curlmsg.msg | 4 +- .../curl-7.x/packages/vms/curlmsg_vms.h | 4 +- .../vms/generate_config_vms_h_curl.com | 3 +- .../packages/vms/generate_vax_transfer.com | 4 +- .../packages/vms/gnv_conftest.c_first | 4 +- .../packages/vms/gnv_curl_configure.sh | 4 +- .../packages/vms/gnv_libcurl_symbols.opt | 4 +- .../curl-7.x/packages/vms/gnv_link_curl.com | 4 +- .../packages/vms/make_gnv_curl_install.sh | 4 +- .../packages/vms/make_pcsi_curl_kit_name.com | 4 +- .../packages/vms/pcsi_gnv_curl_file_list.txt | 4 +- .../packages/vms/pcsi_product_gnv_curl.com | 4 +- .../packages/vms/report_openssl_version.c | 4 +- .../packages/vms/setup_gnv_curl_build.com | 4 +- .../packages/vms/stage_curl_install.com | 3 +- .../curl-7.x/packages/vms/vms_eco_level.h | 6 +- .../libcurl/curl-7.x/plan9/include/mkfile | 4 +- trunk/libs/libcurl/curl-7.x/plan9/lib/mkfile | 4 +- .../libcurl/curl-7.x/plan9/lib/mkfile.inc | 4 +- trunk/libs/libcurl/curl-7.x/plan9/mkfile | 4 +- .../libs/libcurl/curl-7.x/plan9/mkfile.proto | 4 +- trunk/libs/libcurl/curl-7.x/plan9/src/mkfile | 4 +- .../libcurl/curl-7.x/plan9/src/mkfile.inc | 4 +- trunk/libs/libcurl/curl-7.x/projects/README | 159 - .../libs/libcurl/curl-7.x/projects/README.md | 160 + .../projects/Windows/VC10/lib/libcurl.vcxproj | 47 +- .../projects/Windows/VC10/src/curl.vcxproj | 9 +- .../projects/Windows/VC11/lib/libcurl.vcxproj | 47 +- .../projects/Windows/VC11/src/curl.vcxproj | 9 +- .../projects/Windows/VC12/lib/libcurl.vcxproj | 47 +- .../projects/Windows/VC12/src/curl.vcxproj | 9 +- .../Windows/{VC15 => VC14.10}/curl-all.sln | 0 .../Windows/{VC15 => VC14.10}/lib/libcurl.sln | 0 .../{VC15 => VC14.10}/lib/libcurl.vcxproj | 231 +- .../lib/libcurl.vcxproj.filters | 0 .../Windows/{VC15 => VC14.10}/src/curl.sln | 0 .../{VC15 => VC14.10}/src/curl.vcxproj | 233 +- .../src/curl.vcxproj.filters | 0 .../Windows/{VC8 => VC14.30}/curl-all.sln | 48 +- .../Windows/{VC8 => VC14.30}/lib/libcurl.sln | 30 +- .../Windows/VC14.30/lib/libcurl.vcxproj | 2673 ++ .../VC14.30/lib/libcurl.vcxproj.filters} | 37 +- .../Windows/{VC8 => VC14.30}/src/curl.sln | 30 +- .../projects/Windows/VC14.30/src/curl.vcxproj | 2767 ++ .../Windows/VC14.30/src/curl.vcxproj.filters | 17 + .../projects/Windows/VC14/lib/libcurl.vcxproj | 47 +- .../projects/Windows/VC14/src/curl.vcxproj | 9 +- .../projects/Windows/VC6/curl-all.dsw | 44 - .../projects/Windows/VC6/lib/libcurl.dsp | 1925 - .../projects/Windows/VC6/lib/libcurl.dsw | 29 - .../projects/Windows/VC6/src/curl.dsp | 1090 - .../projects/Windows/VC6/src/curl.dsw | 29 - .../projects/Windows/VC7.1/curl-all.sln | 140 - .../projects/Windows/VC7.1/lib/libcurl.sln | 87 - .../projects/Windows/VC7.1/lib/libcurl.vcproj | 2206 -- .../projects/Windows/VC7.1/src/curl.sln | 87 - .../projects/Windows/VC7.1/src/curl.vcproj | 1676 - .../projects/Windows/VC7/curl-all.sln | 138 - .../projects/Windows/VC7/lib/libcurl.sln | 87 - .../projects/Windows/VC7/lib/libcurl.vcproj | 2060 - .../projects/Windows/VC7/src/curl.sln | 87 - .../projects/Windows/VC7/src/curl.vcproj | 1530 - .../projects/Windows/VC8/lib/libcurl.vcproj | 4863 --- .../projects/Windows/VC8/src/curl.vcproj | 4495 --- .../projects/Windows/VC9/curl-all.sln | 258 - .../projects/Windows/VC9/lib/libcurl.sln | 157 - .../projects/Windows/VC9/lib/libcurl.vcproj | 4804 --- .../projects/Windows/VC9/src/curl.sln | 157 - .../projects/Windows/VC9/src/curl.vcproj | 4352 --- .../curl-7.x/projects/build-openssl.bat | 72 +- .../curl-7.x/projects/build-wolfssl.bat | 53 +- .../libcurl/curl-7.x/projects/checksrc.bat | 42 +- .../libcurl/curl-7.x/projects/generate.bat | 148 +- .../curl-7.x/projects/wolfssl_options.h | 138 +- .../libs/libcurl/curl-7.x/scripts/Makefile.am | 8 +- .../libs/libcurl/curl-7.x/scripts/Makefile.in | 72 +- .../curl-7.x/{lib => scripts}/checksrc.pl | 53 +- .../libcurl/curl-7.x/scripts/completion.pl | 23 +- .../libs/libcurl/curl-7.x/scripts/coverage.sh | 6 +- .../{lib => scripts}/firefox-db2pem.sh | 16 +- .../curl-7.x/{lib => scripts}/mk-ca-bundle.pl | 284 +- .../curl-7.x/scripts/updatemanpages.pl | 4 +- .../libs/libcurl/curl-7.x/src/CMakeLists.txt | 8 +- trunk/libs/libcurl/curl-7.x/src/Makefile.am | 13 +- trunk/libs/libcurl/curl-7.x/src/Makefile.in | 232 +- trunk/libs/libcurl/curl-7.x/src/Makefile.inc | 20 +- trunk/libs/libcurl/curl-7.x/src/Makefile.m32 | 115 +- .../libcurl/curl-7.x/src/Makefile.netware | 474 - trunk/libs/libcurl/curl-7.x/src/curl.rc | 4 +- .../libcurl/curl-7.x/src/macos/MACINSTALL.TXT | 1 - .../curl-7.x/src/macos/curl.mcp.xml.sit.hqx | 1 - .../src/macos/src/curl_GUSIConfig.cpp | 1 - .../curl-7.x/src/macos/src/macos_main.cpp | 1 - .../libs/libcurl/curl-7.x/src/makefile.amiga | 5 +- trunk/libs/libcurl/curl-7.x/src/makefile.dj | 4 +- trunk/libs/libcurl/curl-7.x/src/mkhelp.pl | 4 +- trunk/libs/libcurl/curl-7.x/src/slist_wc.c | 4 +- trunk/libs/libcurl/curl-7.x/src/slist_wc.h | 4 +- .../libs/libcurl/curl-7.x/src/tool_binmode.c | 4 +- .../libs/libcurl/curl-7.x/src/tool_binmode.h | 4 +- trunk/libs/libcurl/curl-7.x/src/tool_bname.c | 4 +- trunk/libs/libcurl/curl-7.x/src/tool_bname.h | 4 +- trunk/libs/libcurl/curl-7.x/src/tool_cb_dbg.c | 42 +- trunk/libs/libcurl/curl-7.x/src/tool_cb_dbg.h | 4 +- trunk/libs/libcurl/curl-7.x/src/tool_cb_hdr.c | 104 +- trunk/libs/libcurl/curl-7.x/src/tool_cb_hdr.h | 4 +- trunk/libs/libcurl/curl-7.x/src/tool_cb_prg.c | 35 +- trunk/libs/libcurl/curl-7.x/src/tool_cb_prg.h | 4 +- trunk/libs/libcurl/curl-7.x/src/tool_cb_rea.c | 4 +- trunk/libs/libcurl/curl-7.x/src/tool_cb_rea.h | 4 +- trunk/libs/libcurl/curl-7.x/src/tool_cb_see.c | 4 +- trunk/libs/libcurl/curl-7.x/src/tool_cb_see.h | 4 +- trunk/libs/libcurl/curl-7.x/src/tool_cb_wrt.c | 83 +- trunk/libs/libcurl/curl-7.x/src/tool_cb_wrt.h | 4 +- .../libs/libcurl/curl-7.x/src/tool_cfgable.c | 14 +- .../libs/libcurl/curl-7.x/src/tool_cfgable.h | 37 +- .../libs/libcurl/curl-7.x/src/tool_convert.c | 147 - trunk/libs/libcurl/curl-7.x/src/tool_dirhie.c | 8 +- trunk/libs/libcurl/curl-7.x/src/tool_dirhie.h | 4 +- trunk/libs/libcurl/curl-7.x/src/tool_doswin.c | 17 +- trunk/libs/libcurl/curl-7.x/src/tool_doswin.h | 4 +- .../libs/libcurl/curl-7.x/src/tool_easysrc.c | 8 +- .../libs/libcurl/curl-7.x/src/tool_easysrc.h | 4 +- .../libs/libcurl/curl-7.x/src/tool_filetime.c | 9 +- .../libs/libcurl/curl-7.x/src/tool_filetime.h | 4 +- .../libs/libcurl/curl-7.x/src/tool_findfile.c | 157 + .../src/{tool_homedir.h => tool_findfile.h} | 12 +- .../libcurl/curl-7.x/src/tool_formparse.c | 50 +- .../libcurl/curl-7.x/src/tool_formparse.h | 4 +- .../libs/libcurl/curl-7.x/src/tool_getparam.c | 249 +- .../libs/libcurl/curl-7.x/src/tool_getparam.h | 8 +- .../libs/libcurl/curl-7.x/src/tool_getpass.c | 4 +- .../libs/libcurl/curl-7.x/src/tool_getpass.h | 4 +- trunk/libs/libcurl/curl-7.x/src/tool_help.c | 805 +- trunk/libs/libcurl/curl-7.x/src/tool_help.h | 46 +- .../libs/libcurl/curl-7.x/src/tool_helpers.c | 14 +- .../libs/libcurl/curl-7.x/src/tool_helpers.h | 4 +- .../libs/libcurl/curl-7.x/src/tool_homedir.c | 132 - .../libs/libcurl/curl-7.x/src/tool_hugehelp.c | 13121 ++++--- .../libs/libcurl/curl-7.x/src/tool_hugehelp.h | 4 +- .../libs/libcurl/curl-7.x/src/tool_libinfo.c | 83 +- .../libs/libcurl/curl-7.x/src/tool_libinfo.h | 5 +- .../libs/libcurl/curl-7.x/src/tool_listhelp.c | 781 + trunk/libs/libcurl/curl-7.x/src/tool_main.c | 15 +- trunk/libs/libcurl/curl-7.x/src/tool_main.h | 4 +- trunk/libs/libcurl/curl-7.x/src/tool_msgs.c | 4 +- trunk/libs/libcurl/curl-7.x/src/tool_msgs.h | 4 +- .../libs/libcurl/curl-7.x/src/tool_operate.c | 441 +- .../libs/libcurl/curl-7.x/src/tool_operate.h | 6 +- .../libs/libcurl/curl-7.x/src/tool_operhlp.c | 5 +- .../libs/libcurl/curl-7.x/src/tool_operhlp.h | 4 +- .../libs/libcurl/curl-7.x/src/tool_panykey.c | 4 +- .../libs/libcurl/curl-7.x/src/tool_panykey.h | 4 +- .../libs/libcurl/curl-7.x/src/tool_paramhlp.c | 112 +- .../libs/libcurl/curl-7.x/src/tool_paramhlp.h | 12 +- .../libs/libcurl/curl-7.x/src/tool_parsecfg.c | 77 +- .../libs/libcurl/curl-7.x/src/tool_parsecfg.h | 4 +- .../libs/libcurl/curl-7.x/src/tool_progress.c | 6 +- .../libs/libcurl/curl-7.x/src/tool_progress.h | 4 +- trunk/libs/libcurl/curl-7.x/src/tool_sdecls.h | 7 +- trunk/libs/libcurl/curl-7.x/src/tool_setopt.c | 154 +- trunk/libs/libcurl/curl-7.x/src/tool_setopt.h | 15 +- trunk/libs/libcurl/curl-7.x/src/tool_setup.h | 12 +- trunk/libs/libcurl/curl-7.x/src/tool_sleep.c | 4 +- trunk/libs/libcurl/curl-7.x/src/tool_sleep.h | 4 +- trunk/libs/libcurl/curl-7.x/src/tool_strdup.c | 4 +- trunk/libs/libcurl/curl-7.x/src/tool_strdup.h | 4 +- .../libs/libcurl/curl-7.x/src/tool_urlglob.c | 7 +- .../libs/libcurl/curl-7.x/src/tool_urlglob.h | 4 +- trunk/libs/libcurl/curl-7.x/src/tool_util.c | 4 +- trunk/libs/libcurl/curl-7.x/src/tool_util.h | 4 +- .../libs/libcurl/curl-7.x/src/tool_version.h | 6 +- trunk/libs/libcurl/curl-7.x/src/tool_vms.c | 6 +- trunk/libs/libcurl/curl-7.x/src/tool_vms.h | 4 +- .../libs/libcurl/curl-7.x/src/tool_writeout.c | 99 +- .../libs/libcurl/curl-7.x/src/tool_writeout.h | 5 +- .../libcurl/curl-7.x/src/tool_writeout_json.c | 68 +- .../libcurl/curl-7.x/src/tool_writeout_json.h | 8 +- trunk/libs/libcurl/curl-7.x/src/tool_xattr.c | 11 +- trunk/libs/libcurl/curl-7.x/src/tool_xattr.h | 4 +- .../libcurl/curl-7.x/tests/CMakeLists.txt | 5 +- .../libs/libcurl/curl-7.x/tests/FILEFORMAT.md | 32 +- trunk/libs/libcurl/curl-7.x/tests/Makefile.am | 10 +- trunk/libs/libcurl/curl-7.x/tests/Makefile.in | 37 +- trunk/libs/libcurl/curl-7.x/tests/README.md | 8 +- trunk/libs/libcurl/curl-7.x/tests/appveyor.pm | 6 +- trunk/libs/libcurl/curl-7.x/tests/azure.pm | 6 +- .../libs/libcurl/curl-7.x/tests/badsymbols.pl | 4 +- .../libcurl/curl-7.x/tests/certs/Makefile.am | 2 + .../libcurl/curl-7.x/tests/certs/Makefile.in | 21 +- .../curl-7.x/tests/certs/scripts/Makefile.am | 2 + .../curl-7.x/tests/certs/scripts/Makefile.in | 21 +- .../curl-7.x/tests/data/CMakeLists.txt | 8 +- .../libs/libcurl/curl-7.x/tests/data/DISABLED | 109 +- .../libcurl/curl-7.x/tests/data/Makefile.am | 22 +- .../libcurl/curl-7.x/tests/data/Makefile.in | 108 +- .../libcurl/curl-7.x/tests/data/Makefile.inc | 62 +- .../libs/libcurl/curl-7.x/tests/data/test1001 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test1002 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test1004 | 3 + .../libs/libcurl/curl-7.x/tests/data/test1008 | 19 +- .../libs/libcurl/curl-7.x/tests/data/test1021 | 27 +- .../libs/libcurl/curl-7.x/tests/data/test1034 | 1 + .../libs/libcurl/curl-7.x/tests/data/test1035 | 1 + .../libs/libcurl/curl-7.x/tests/data/test1064 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test1065 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test1095 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test1115 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test1116 | 3 + .../libs/libcurl/curl-7.x/tests/data/test1117 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test1135 | 165 +- .../libs/libcurl/curl-7.x/tests/data/test1144 | 4 + .../libs/libcurl/curl-7.x/tests/data/test1156 | 5 +- .../libs/libcurl/curl-7.x/tests/data/test1158 | 10 +- .../libs/libcurl/curl-7.x/tests/data/test1160 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test1164 | 4 + .../libs/libcurl/curl-7.x/tests/data/test1176 | 46 +- .../libs/libcurl/curl-7.x/tests/data/test1185 | 184 + .../libs/libcurl/curl-7.x/tests/data/test1186 | 98 + .../libs/libcurl/curl-7.x/tests/data/test1187 | 63 + .../libs/libcurl/curl-7.x/tests/data/test1189 | 108 + .../libs/libcurl/curl-7.x/tests/data/test1212 | 3 + .../libs/libcurl/curl-7.x/tests/data/test1215 | 19 +- .../libs/libcurl/curl-7.x/tests/data/test1235 | 4 - .../libs/libcurl/curl-7.x/tests/data/test1238 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test1248 | 3 + .../libs/libcurl/curl-7.x/tests/data/test1249 | 3 + .../libs/libcurl/curl-7.x/tests/data/test1252 | 3 + .../libs/libcurl/curl-7.x/tests/data/test1266 | 4 + .../libs/libcurl/curl-7.x/tests/data/test1267 | 4 + .../libs/libcurl/curl-7.x/tests/data/test1272 | 3 + .../libs/libcurl/curl-7.x/tests/data/test1273 | 3 + .../libs/libcurl/curl-7.x/tests/data/test1274 | 75 + .../libs/libcurl/curl-7.x/tests/data/test1287 | 2 + .../libs/libcurl/curl-7.x/tests/data/test1294 | 2 + .../libs/libcurl/curl-7.x/tests/data/test1322 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test133 | 8 +- .../libs/libcurl/curl-7.x/tests/data/test1400 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test1401 | 6 +- .../libs/libcurl/curl-7.x/tests/data/test1402 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test1403 | 4 +- .../libs/libcurl/curl-7.x/tests/data/test1404 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test1405 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test1406 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test1407 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test1420 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test1430 | 7 +- .../libs/libcurl/curl-7.x/tests/data/test1431 | 5 +- .../libs/libcurl/curl-7.x/tests/data/test1451 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test1459 | 2 + .../libs/libcurl/curl-7.x/tests/data/test1461 | 24 +- .../libs/libcurl/curl-7.x/tests/data/test1463 | 6 +- .../libs/libcurl/curl-7.x/tests/data/test1464 | 6 +- .../libs/libcurl/curl-7.x/tests/data/test1465 | Bin 3028 -> 3028 bytes .../libs/libcurl/curl-7.x/tests/data/test1467 | 59 + .../libs/libcurl/curl-7.x/tests/data/test1468 | 63 + .../libs/libcurl/curl-7.x/tests/data/test150 | 19 +- .../libs/libcurl/curl-7.x/tests/data/test1501 | 5 +- .../libs/libcurl/curl-7.x/tests/data/test1511 | 1 + .../libs/libcurl/curl-7.x/tests/data/test1523 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test1525 | 2 + .../libs/libcurl/curl-7.x/tests/data/test1526 | 2 + .../libs/libcurl/curl-7.x/tests/data/test1527 | 2 + .../libs/libcurl/curl-7.x/tests/data/test1528 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test1534 | 1 + .../libs/libcurl/curl-7.x/tests/data/test1538 | 44 +- .../libs/libcurl/curl-7.x/tests/data/test1540 | 4 +- .../libs/libcurl/curl-7.x/tests/data/test1542 | 68 + .../libs/libcurl/curl-7.x/tests/data/test1543 | 76 + .../libs/libcurl/curl-7.x/tests/data/test155 | 19 +- .../libs/libcurl/curl-7.x/tests/data/test1554 | 6 + .../libs/libcurl/curl-7.x/tests/data/test1556 | 26 +- .../libs/libcurl/curl-7.x/tests/data/test1559 | 7 +- .../libs/libcurl/curl-7.x/tests/data/test1560 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test1561 | 16 +- .../libs/libcurl/curl-7.x/tests/data/test1597 | 32 + .../libs/libcurl/curl-7.x/tests/data/test1633 | 1 + .../libs/libcurl/curl-7.x/tests/data/test1634 | 1 + .../libs/libcurl/curl-7.x/tests/data/test1635 | 64 + .../libs/libcurl/curl-7.x/tests/data/test1670 | 61 + .../libs/libcurl/curl-7.x/tests/data/test1671 | 73 + .../libs/libcurl/curl-7.x/tests/data/test1680 | 55 + .../libs/libcurl/curl-7.x/tests/data/test1681 | 61 + .../libs/libcurl/curl-7.x/tests/data/test1682 | 58 + .../libs/libcurl/curl-7.x/tests/data/test1683 | 61 + .../libs/libcurl/curl-7.x/tests/data/test169 | 19 +- .../libs/libcurl/curl-7.x/tests/data/test1700 | 37 +- .../libs/libcurl/curl-7.x/tests/data/test1701 | 25 +- .../libs/libcurl/curl-7.x/tests/data/test1702 | 3 + .../libs/libcurl/curl-7.x/tests/data/test174 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test175 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test177 | 2 +- trunk/libs/libcurl/curl-7.x/tests/data/test18 | 3 - .../libs/libcurl/curl-7.x/tests/data/test1800 | 3 + .../libs/libcurl/curl-7.x/tests/data/test1919 | 51 + .../libs/libcurl/curl-7.x/tests/data/test1937 | 72 + .../libs/libcurl/curl-7.x/tests/data/test1938 | Bin 0 -> 1281 bytes .../libs/libcurl/curl-7.x/tests/data/test1939 | 55 + .../libs/libcurl/curl-7.x/tests/data/test1940 | 62 + .../libs/libcurl/curl-7.x/tests/data/test1941 | 76 + .../libs/libcurl/curl-7.x/tests/data/test1942 | 66 + .../libs/libcurl/curl-7.x/tests/data/test1943 | 62 + .../libs/libcurl/curl-7.x/tests/data/test1944 | 66 + .../libs/libcurl/curl-7.x/tests/data/test1945 | 76 + .../libs/libcurl/curl-7.x/tests/data/test1946 | 68 + .../libs/libcurl/curl-7.x/tests/data/test2025 | 22 +- .../libs/libcurl/curl-7.x/tests/data/test2028 | 22 +- .../libs/libcurl/curl-7.x/tests/data/test2029 | 20 +- .../libs/libcurl/curl-7.x/tests/data/test2030 | 20 +- .../libs/libcurl/curl-7.x/tests/data/test2031 | 26 +- .../libs/libcurl/curl-7.x/tests/data/test2032 | 18 +- .../libs/libcurl/curl-7.x/tests/data/test2033 | 61 + .../libs/libcurl/curl-7.x/tests/data/test2034 | 1 + .../libs/libcurl/curl-7.x/tests/data/test2037 | 1 + .../libs/libcurl/curl-7.x/tests/data/test2041 | 1 + .../libs/libcurl/curl-7.x/tests/data/test2058 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test2059 | 10 +- .../libs/libcurl/curl-7.x/tests/data/test2060 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test2063 | 8 +- .../libs/libcurl/curl-7.x/tests/data/test2066 | 8 +- .../libs/libcurl/curl-7.x/tests/data/test2069 | 8 +- .../libs/libcurl/curl-7.x/tests/data/test207 | 5 + .../libs/libcurl/curl-7.x/tests/data/test2070 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test2079 | 61 + .../libs/libcurl/curl-7.x/tests/data/test2080 | Bin 20673 -> 20675 bytes .../libs/libcurl/curl-7.x/tests/data/test2081 | 13 +- .../libs/libcurl/curl-7.x/tests/data/test2082 | 51 + .../libs/libcurl/curl-7.x/tests/data/test2083 | 45 + .../libs/libcurl/curl-7.x/tests/data/test2084 | 54 + .../libs/libcurl/curl-7.x/tests/data/test2085 | 64 + .../libs/libcurl/curl-7.x/tests/data/test2086 | 52 + .../libs/libcurl/curl-7.x/tests/data/test2087 | 61 + .../libs/libcurl/curl-7.x/tests/data/test209 | 19 +- .../libs/libcurl/curl-7.x/tests/data/test213 | 19 +- .../libs/libcurl/curl-7.x/tests/data/test239 | 19 +- .../libs/libcurl/curl-7.x/tests/data/test243 | 19 +- .../libs/libcurl/curl-7.x/tests/data/test245 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test246 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test249 | 1 + .../libs/libcurl/curl-7.x/tests/data/test262 | Bin 1148 -> 1228 bytes .../libs/libcurl/curl-7.x/tests/data/test265 | 19 +- .../libs/libcurl/curl-7.x/tests/data/test266 | 3 + .../libs/libcurl/curl-7.x/tests/data/test267 | 19 +- .../libs/libcurl/curl-7.x/tests/data/test3000 | 1 + .../libs/libcurl/curl-7.x/tests/data/test3001 | 1 + .../libs/libcurl/curl-7.x/tests/data/test3021 | 53 + .../libs/libcurl/curl-7.x/tests/data/test3022 | 53 + .../libs/libcurl/curl-7.x/tests/data/test3023 | 60 + .../libs/libcurl/curl-7.x/tests/data/test3024 | 60 + .../libs/libcurl/curl-7.x/tests/data/test3025 | 47 + .../libs/libcurl/curl-7.x/tests/data/test3026 | 45 + trunk/libs/libcurl/curl-7.x/tests/data/test31 | 2 + .../libs/libcurl/curl-7.x/tests/data/test310 | 1 + .../libs/libcurl/curl-7.x/tests/data/test326 | 3 + .../libs/libcurl/curl-7.x/tests/data/test358 | 17 +- .../libs/libcurl/curl-7.x/tests/data/test359 | 17 +- .../libs/libcurl/curl-7.x/tests/data/test367 | 48 + .../libs/libcurl/curl-7.x/tests/data/test368 | 49 + .../libs/libcurl/curl-7.x/tests/data/test369 | 47 + .../libs/libcurl/curl-7.x/tests/data/test370 | 36 + .../libs/libcurl/curl-7.x/tests/data/test371 | 56 + .../libs/libcurl/curl-7.x/tests/data/test372 | 49 + .../libs/libcurl/curl-7.x/tests/data/test373 | 78 + .../libs/libcurl/curl-7.x/tests/data/test374 | 49 + .../libs/libcurl/curl-7.x/tests/data/test375 | 33 + .../libs/libcurl/curl-7.x/tests/data/test376 | 64 + .../libs/libcurl/curl-7.x/tests/data/test378 | 39 + .../libs/libcurl/curl-7.x/tests/data/test379 | 71 + .../libs/libcurl/curl-7.x/tests/data/test380 | 63 + .../libs/libcurl/curl-7.x/tests/data/test381 | 67 + .../libs/libcurl/curl-7.x/tests/data/test383 | 56 + .../libs/libcurl/curl-7.x/tests/data/test384 | 59 + .../libs/libcurl/curl-7.x/tests/data/test385 | 56 + .../libs/libcurl/curl-7.x/tests/data/test386 | 74 + .../libs/libcurl/curl-7.x/tests/data/test387 | 53 + .../libs/libcurl/curl-7.x/tests/data/test388 | 156 + .../libs/libcurl/curl-7.x/tests/data/test389 | 57 + trunk/libs/libcurl/curl-7.x/tests/data/test39 | 6 +- .../libs/libcurl/curl-7.x/tests/data/test390 | 48 + .../libs/libcurl/curl-7.x/tests/data/test391 | 72 + .../libs/libcurl/curl-7.x/tests/data/test398 | 64 + .../libs/libcurl/curl-7.x/tests/data/test399 | 32 + .../libs/libcurl/curl-7.x/tests/data/test411 | 43 + .../libs/libcurl/curl-7.x/tests/data/test412 | 64 + .../libs/libcurl/curl-7.x/tests/data/test413 | 64 + .../libs/libcurl/curl-7.x/tests/data/test414 | 84 + .../libs/libcurl/curl-7.x/tests/data/test436 | 58 + .../libs/libcurl/curl-7.x/tests/data/test440 | 73 + .../libs/libcurl/curl-7.x/tests/data/test441 | 73 + .../libs/libcurl/curl-7.x/tests/data/test442 | 210 + .../libs/libcurl/curl-7.x/tests/data/test443 | 79 + .../libs/libcurl/curl-7.x/tests/data/test444 | 190 + .../libs/libcurl/curl-7.x/tests/data/test493 | 1 + .../libs/libcurl/curl-7.x/tests/data/test530 | 49 + .../libs/libcurl/curl-7.x/tests/data/test547 | 19 +- .../libs/libcurl/curl-7.x/tests/data/test548 | 19 +- .../libs/libcurl/curl-7.x/tests/data/test552 | 4 +- .../libs/libcurl/curl-7.x/tests/data/test555 | 19 +- .../libs/libcurl/curl-7.x/tests/data/test559 | 1 + .../libs/libcurl/curl-7.x/tests/data/test590 | 19 +- .../libs/libcurl/curl-7.x/tests/data/test648 | 6 +- trunk/libs/libcurl/curl-7.x/tests/data/test67 | 19 +- .../libs/libcurl/curl-7.x/tests/data/test675 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test679 | 56 + trunk/libs/libcurl/curl-7.x/tests/data/test68 | 19 +- .../libs/libcurl/curl-7.x/tests/data/test680 | 40 + .../libs/libcurl/curl-7.x/tests/data/test681 | 51 + .../libs/libcurl/curl-7.x/tests/data/test682 | 53 + .../libs/libcurl/curl-7.x/tests/data/test683 | 53 + .../libs/libcurl/curl-7.x/tests/data/test684 | 52 + .../libs/libcurl/curl-7.x/tests/data/test685 | 52 + trunk/libs/libcurl/curl-7.x/tests/data/test69 | 19 +- .../libs/libcurl/curl-7.x/tests/data/test700 | 3 + .../libs/libcurl/curl-7.x/tests/data/test701 | 3 + .../libs/libcurl/curl-7.x/tests/data/test702 | 3 + .../libs/libcurl/curl-7.x/tests/data/test706 | 3 + .../libs/libcurl/curl-7.x/tests/data/test707 | 3 + .../libs/libcurl/curl-7.x/tests/data/test708 | 3 + .../libs/libcurl/curl-7.x/tests/data/test709 | 3 + .../libs/libcurl/curl-7.x/tests/data/test710 | 3 + .../libs/libcurl/curl-7.x/tests/data/test711 | 3 + .../libs/libcurl/curl-7.x/tests/data/test712 | 3 + .../libs/libcurl/curl-7.x/tests/data/test713 | 3 + .../libs/libcurl/curl-7.x/tests/data/test714 | 3 + .../libs/libcurl/curl-7.x/tests/data/test715 | 3 + .../libs/libcurl/curl-7.x/tests/data/test718 | 2 + .../libs/libcurl/curl-7.x/tests/data/test719 | 63 + .../libs/libcurl/curl-7.x/tests/data/test720 | 62 + .../libs/libcurl/curl-7.x/tests/data/test721 | 62 + trunk/libs/libcurl/curl-7.x/tests/data/test8 | 32 +- trunk/libs/libcurl/curl-7.x/tests/data/test81 | 19 +- .../libs/libcurl/curl-7.x/tests/data/test822 | 21 +- .../libs/libcurl/curl-7.x/tests/data/test827 | 21 +- .../libs/libcurl/curl-7.x/tests/data/test852 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test855 | 2 +- .../libs/libcurl/curl-7.x/tests/data/test868 | 21 +- .../libs/libcurl/curl-7.x/tests/data/test873 | 21 +- trunk/libs/libcurl/curl-7.x/tests/data/test89 | 21 +- .../libs/libcurl/curl-7.x/tests/data/test898 | 94 + trunk/libs/libcurl/curl-7.x/tests/data/test90 | 21 +- .../libs/libcurl/curl-7.x/tests/data/test906 | 21 +- trunk/libs/libcurl/curl-7.x/tests/data/test91 | 15 +- .../libs/libcurl/curl-7.x/tests/data/test921 | 21 +- .../libs/libcurl/curl-7.x/tests/data/test926 | 4 +- .../libs/libcurl/curl-7.x/tests/data/test957 | 4 +- .../libs/libcurl/curl-7.x/tests/data/test958 | 4 +- .../libs/libcurl/curl-7.x/tests/data/test961 | 4 +- .../libs/libcurl/curl-7.x/tests/data/test973 | 88 + .../libs/libcurl/curl-7.x/tests/data/test974 | 91 + .../libs/libcurl/curl-7.x/tests/data/test975 | 88 + .../libs/libcurl/curl-7.x/tests/data/test976 | 92 + .../libs/libcurl/curl-7.x/tests/data/test977 | 61 + .../libs/libcurl/curl-7.x/tests/dictserver.py | 4 +- .../libcurl/curl-7.x/tests/directories.pm | 4 +- .../libcurl/curl-7.x/tests/disable-scan.pl | 6 +- .../libcurl/curl-7.x/tests/error-codes.pl | 4 +- .../libcurl/curl-7.x/tests/extern-scan.pl | 25 +- trunk/libs/libcurl/curl-7.x/tests/ftp.pm | 4 +- .../libs/libcurl/curl-7.x/tests/ftpserver.pl | 4 +- trunk/libs/libcurl/curl-7.x/tests/getpart.pm | 6 +- .../libcurl/curl-7.x/tests/http2-server.pl | 4 +- .../libs/libcurl/curl-7.x/tests/httpserver.pl | 4 +- .../curl-7.x/tests/libtest/CMakeLists.txt | 4 +- .../curl-7.x/tests/libtest/Makefile.am | 17 +- .../curl-7.x/tests/libtest/Makefile.in | 6705 +++- .../curl-7.x/tests/libtest/Makefile.inc | 75 +- .../curl-7.x/tests/libtest/chkdecimalpoint.c | 4 +- .../curl-7.x/tests/libtest/chkhostname.c | 4 +- .../libcurl/curl-7.x/tests/libtest/first.c | 21 +- .../libcurl/curl-7.x/tests/libtest/lib1156.c | 62 +- .../libcurl/curl-7.x/tests/libtest/lib1500.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1501.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1502.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1506.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1507.c | 13 +- .../libcurl/curl-7.x/tests/libtest/lib1508.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1509.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1510.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1511.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1512.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1513.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1514.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1515.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1517.c | 9 +- .../libcurl/curl-7.x/tests/libtest/lib1518.c | 42 +- .../libcurl/curl-7.x/tests/libtest/lib1520.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1522.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1523.c | 6 +- .../libcurl/curl-7.x/tests/libtest/lib1525.c | 6 +- .../libcurl/curl-7.x/tests/libtest/lib1526.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1527.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1528.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1529.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1530.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1531.c | 13 +- .../libcurl/curl-7.x/tests/libtest/lib1532.c | 8 +- .../libcurl/curl-7.x/tests/libtest/lib1533.c | 6 +- .../libcurl/curl-7.x/tests/libtest/lib1534.c | 8 +- .../libcurl/curl-7.x/tests/libtest/lib1535.c | 8 +- .../libcurl/curl-7.x/tests/libtest/lib1536.c | 10 +- .../libcurl/curl-7.x/tests/libtest/lib1537.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1538.c | 10 +- .../libcurl/curl-7.x/tests/libtest/lib1540.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1542.c | 88 + .../libcurl/curl-7.x/tests/libtest/lib1550.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1551.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1552.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1553.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1554.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1555.c | 6 +- .../libcurl/curl-7.x/tests/libtest/lib1556.c | 6 +- .../libcurl/curl-7.x/tests/libtest/lib1557.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1558.c | 6 +- .../libcurl/curl-7.x/tests/libtest/lib1559.c | 18 +- .../libcurl/curl-7.x/tests/libtest/lib1560.c | 355 +- .../libcurl/curl-7.x/tests/libtest/lib1564.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1565.c | 6 +- .../libcurl/curl-7.x/tests/libtest/lib1567.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1568.c | 5 +- .../libcurl/curl-7.x/tests/libtest/lib1569.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1591.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1592.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1593.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1594.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1597.c | 85 + .../libcurl/curl-7.x/tests/libtest/lib1905.c | 8 +- .../libcurl/curl-7.x/tests/libtest/lib1906.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1907.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1908.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1910.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1911.c | 6 +- .../libcurl/curl-7.x/tests/libtest/lib1912.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1913.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1915.c | 6 +- .../libcurl/curl-7.x/tests/libtest/lib1916.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1918.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1919.c | 53 + .../libcurl/curl-7.x/tests/libtest/lib1933.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1934.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1935.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1936.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib1937.c | 66 + .../libcurl/curl-7.x/tests/libtest/lib1938.c | 68 + .../libcurl/curl-7.x/tests/libtest/lib1939.c | 72 + .../libcurl/curl-7.x/tests/libtest/lib1940.c | 119 + .../libcurl/curl-7.x/tests/libtest/lib1945.c | 81 + .../libcurl/curl-7.x/tests/libtest/lib3010.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib3025.c | 61 + .../libcurl/curl-7.x/tests/libtest/lib3026.c | 163 + .../libcurl/curl-7.x/tests/libtest/lib500.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib501.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib502.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib503.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib504.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib505.c | 6 +- .../libcurl/curl-7.x/tests/libtest/lib506.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib507.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib508.c | 9 +- .../libcurl/curl-7.x/tests/libtest/lib509.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib510.c | 9 +- .../libcurl/curl-7.x/tests/libtest/lib511.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib512.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib513.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib514.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib515.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib516.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib517.c | 6 +- .../libcurl/curl-7.x/tests/libtest/lib518.c | 10 +- .../libcurl/curl-7.x/tests/libtest/lib519.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib520.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib521.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib523.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib524.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib525.c | 6 +- .../libcurl/curl-7.x/tests/libtest/lib526.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib530.c | 391 + .../libcurl/curl-7.x/tests/libtest/lib533.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib537.c | 11 +- .../libcurl/curl-7.x/tests/libtest/lib539.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib540.c | 9 +- .../libcurl/curl-7.x/tests/libtest/lib541.c | 6 +- .../libcurl/curl-7.x/tests/libtest/lib542.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib543.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib544.c | 15 +- .../libcurl/curl-7.x/tests/libtest/lib547.c | 13 +- .../libcurl/curl-7.x/tests/libtest/lib549.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib552.c | 13 +- .../libcurl/curl-7.x/tests/libtest/lib553.c | 8 +- .../libcurl/curl-7.x/tests/libtest/lib554.c | 24 +- .../libcurl/curl-7.x/tests/libtest/lib555.c | 15 +- .../libcurl/curl-7.x/tests/libtest/lib556.c | 15 +- .../libcurl/curl-7.x/tests/libtest/lib557.c | 160 +- .../libcurl/curl-7.x/tests/libtest/lib558.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib559.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib560.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib562.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib564.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib566.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib567.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib568.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib569.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib570.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib571.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib572.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib573.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib574.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib575.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib576.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib578.c | 9 +- .../libcurl/curl-7.x/tests/libtest/lib579.c | 9 +- .../libcurl/curl-7.x/tests/libtest/lib582.c | 14 +- .../libcurl/curl-7.x/tests/libtest/lib583.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib586.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib589.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib590.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib591.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib597.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib598.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib599.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib643.c | 31 +- .../libcurl/curl-7.x/tests/libtest/lib650.c | 11 +- .../libcurl/curl-7.x/tests/libtest/lib651.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib652.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib653.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib654.c | 9 +- .../libcurl/curl-7.x/tests/libtest/lib655.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib658.c | 11 +- .../libcurl/curl-7.x/tests/libtest/lib659.c | 6 +- .../libcurl/curl-7.x/tests/libtest/lib661.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib666.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib667.c | 9 +- .../libcurl/curl-7.x/tests/libtest/lib668.c | 12 +- .../libcurl/curl-7.x/tests/libtest/lib670.c | 11 +- .../libcurl/curl-7.x/tests/libtest/lib674.c | 11 +- .../libcurl/curl-7.x/tests/libtest/lib676.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib677.c | 4 +- .../libcurl/curl-7.x/tests/libtest/lib678.c | 4 +- .../curl-7.x/tests/libtest/libauthretry.c | 4 +- .../curl-7.x/tests/libtest/libntlmconnect.c | 4 +- .../curl-7.x/tests/libtest/libprereq.c | 99 + .../curl-7.x/tests/libtest/mk-lib1521.pl | 8 +- .../curl-7.x/tests/libtest/notexists.pl | 4 +- .../curl-7.x/tests/libtest/sethostname.c | 4 +- .../curl-7.x/tests/libtest/sethostname.h | 4 +- .../curl-7.x/tests/libtest/stub_gssapi.c | 4 +- .../curl-7.x/tests/libtest/stub_gssapi.h | 4 +- .../libcurl/curl-7.x/tests/libtest/test.h | 10 +- .../curl-7.x/tests/libtest/test1013.pl | 4 +- .../curl-7.x/tests/libtest/test1022.pl | 4 +- .../libcurl/curl-7.x/tests/libtest/test307.pl | 4 +- .../libcurl/curl-7.x/tests/libtest/test610.pl | 4 +- .../libcurl/curl-7.x/tests/libtest/test613.pl | 4 +- .../curl-7.x/tests/libtest/testtrace.c | 4 +- .../curl-7.x/tests/libtest/testtrace.h | 4 +- .../libcurl/curl-7.x/tests/libtest/testutil.c | 4 +- .../libcurl/curl-7.x/tests/libtest/testutil.h | 4 +- .../libcurl/curl-7.x/tests/manpage-scan.pl | 16 +- .../libcurl/curl-7.x/tests/manpage-syntax.pl | 66 +- .../curl-7.x/tests/mem-include-scan.pl | 4 +- .../libs/libcurl/curl-7.x/tests/memanalyze.pl | 13 +- .../libcurl/curl-7.x/tests/negtelnetserver.py | 4 +- .../libs/libcurl/curl-7.x/tests/nroff-scan.pl | 4 +- .../libcurl/curl-7.x/tests/options-scan.pl | 4 +- trunk/libs/libcurl/curl-7.x/tests/pathhelp.pm | 4 +- .../libs/libcurl/curl-7.x/tests/rtspserver.pl | 4 +- trunk/libs/libcurl/curl-7.x/tests/runtests.1 | 6 +- trunk/libs/libcurl/curl-7.x/tests/runtests.pl | 213 +- .../libcurl/curl-7.x/tests/secureserver.pl | 4 +- .../curl-7.x/tests/server/CMakeLists.txt | 4 +- .../libcurl/curl-7.x/tests/server/Makefile.am | 16 +- .../libcurl/curl-7.x/tests/server/Makefile.in | 262 +- .../curl-7.x/tests/server/Makefile.inc | 6 +- .../libcurl/curl-7.x/tests/server/base64.pl | 4 +- .../libcurl/curl-7.x/tests/server/disabled.c | 7 +- .../libcurl/curl-7.x/tests/server/fake_ntlm.c | 4 +- .../libcurl/curl-7.x/tests/server/getpart.c | 62 +- .../libcurl/curl-7.x/tests/server/getpart.h | 4 +- .../libcurl/curl-7.x/tests/server/mqttd.c | 4 +- .../libcurl/curl-7.x/tests/server/resolve.c | 4 +- .../libcurl/curl-7.x/tests/server/rtspd.c | 4 +- .../curl-7.x/tests/server/server_setup.h | 4 +- .../curl-7.x/tests/server/server_sockaddr.h | 4 +- .../libcurl/curl-7.x/tests/server/sockfilt.c | 200 +- .../libcurl/curl-7.x/tests/server/socksd.c | 179 +- .../libs/libcurl/curl-7.x/tests/server/sws.c | 367 +- .../libcurl/curl-7.x/tests/server/testpart.c | 4 +- .../libs/libcurl/curl-7.x/tests/server/tftp.h | 4 +- .../libcurl/curl-7.x/tests/server/tftpd.c | 16 +- .../libs/libcurl/curl-7.x/tests/server/util.c | 136 +- .../libs/libcurl/curl-7.x/tests/server/util.h | 20 +- .../libs/libcurl/curl-7.x/tests/serverhelp.pm | 4 +- .../libs/libcurl/curl-7.x/tests/smbserver.py | 11 +- trunk/libs/libcurl/curl-7.x/tests/sshhelp.pm | 7 +- .../libs/libcurl/curl-7.x/tests/sshserver.pl | 22 +- .../libcurl/curl-7.x/tests/symbol-scan.pl | 31 +- trunk/libs/libcurl/curl-7.x/tests/testcurl.1 | 8 +- trunk/libs/libcurl/curl-7.x/tests/testcurl.pl | 35 +- .../libs/libcurl/curl-7.x/tests/tftpserver.pl | 4 +- .../curl-7.x/tests/unit/CMakeLists.txt | 4 +- .../libcurl/curl-7.x/tests/unit/Makefile.am | 20 +- .../libcurl/curl-7.x/tests/unit/Makefile.in | 145 +- .../libcurl/curl-7.x/tests/unit/Makefile.inc | 6 +- .../libcurl/curl-7.x/tests/unit/README.md | 6 + .../libcurl/curl-7.x/tests/unit/curlcheck.h | 4 +- .../libcurl/curl-7.x/tests/unit/unit1300.c | 4 +- .../libcurl/curl-7.x/tests/unit/unit1301.c | 4 +- .../libcurl/curl-7.x/tests/unit/unit1302.c | 42 +- .../libcurl/curl-7.x/tests/unit/unit1303.c | 14 +- .../libcurl/curl-7.x/tests/unit/unit1304.c | 4 +- .../libcurl/curl-7.x/tests/unit/unit1305.c | 12 +- .../libcurl/curl-7.x/tests/unit/unit1307.c | 4 +- .../libcurl/curl-7.x/tests/unit/unit1308.c | 4 +- .../libcurl/curl-7.x/tests/unit/unit1309.c | 6 +- .../libcurl/curl-7.x/tests/unit/unit1323.c | 4 +- .../libcurl/curl-7.x/tests/unit/unit1330.c | 4 +- .../libcurl/curl-7.x/tests/unit/unit1394.c | 4 +- .../libcurl/curl-7.x/tests/unit/unit1395.c | 4 +- .../libcurl/curl-7.x/tests/unit/unit1396.c | 6 +- .../libcurl/curl-7.x/tests/unit/unit1397.c | 71 +- .../libcurl/curl-7.x/tests/unit/unit1398.c | 4 +- .../libcurl/curl-7.x/tests/unit/unit1399.c | 4 +- .../libcurl/curl-7.x/tests/unit/unit1600.c | 12 +- .../libcurl/curl-7.x/tests/unit/unit1601.c | 4 +- .../libcurl/curl-7.x/tests/unit/unit1602.c | 9 +- .../libcurl/curl-7.x/tests/unit/unit1603.c | 9 +- .../libcurl/curl-7.x/tests/unit/unit1604.c | 4 +- .../libcurl/curl-7.x/tests/unit/unit1605.c | 6 +- .../libcurl/curl-7.x/tests/unit/unit1606.c | 6 +- .../libcurl/curl-7.x/tests/unit/unit1607.c | 6 +- .../libcurl/curl-7.x/tests/unit/unit1608.c | 4 +- .../libcurl/curl-7.x/tests/unit/unit1609.c | 6 +- .../libcurl/curl-7.x/tests/unit/unit1610.c | 10 +- .../libcurl/curl-7.x/tests/unit/unit1611.c | 4 +- .../libcurl/curl-7.x/tests/unit/unit1612.c | 4 +- .../libcurl/curl-7.x/tests/unit/unit1620.c | 9 +- .../libcurl/curl-7.x/tests/unit/unit1621.c | 6 +- .../libcurl/curl-7.x/tests/unit/unit1650.c | 8 +- .../libcurl/curl-7.x/tests/unit/unit1651.c | 46 +- .../libcurl/curl-7.x/tests/unit/unit1652.c | 8 +- .../libcurl/curl-7.x/tests/unit/unit1653.c | 4 +- .../libcurl/curl-7.x/tests/unit/unit1654.c | 4 +- .../libcurl/curl-7.x/tests/unit/unit1655.c | 4 +- .../libcurl/curl-7.x/tests/unit/unit1660.c | 6 +- .../libcurl/curl-7.x/tests/unit/unit1661.c | 4 +- trunk/libs/libcurl/curl-7.x/tests/util.py | 4 +- trunk/libs/libcurl/curl-7.x/tests/valgrind.pm | 4 +- .../libcurl/curl-7.x/tests/version-scan.pl | 4 +- .../libcurl/curl-7.x/winbuild/Makefile.vc | 39 +- .../curl-7.x/winbuild/MakefileBuild.vc | 68 +- .../libs/libcurl/curl-7.x/winbuild/README.md | 69 +- .../curl-7.x/winbuild/gen_resp_file.bat | 4 +- trunk/libs/libssl/Makefile | 4 +- trunk/libs/libxml2/Makefile | 2 +- .../.gitignore | 0 .../.gitlab-ci.yml | 0 .../.travis.yml | 0 .../CMakeLists.txt | 201 +- .../Copyright | 0 .../HTMLparser.c | 514 +- .../HTMLtree.c | 68 +- .../libs/libxml2/libxml2-v2.10.x/Makefile.am | 440 + .../Makefile.tests | 1 - trunk/libs/libxml2/libxml2-v2.10.x/NEWS | 3819 ++ trunk/libs/libxml2/libxml2-v2.10.x/README.md | 126 + .../libs/libxml2/libxml2-v2.10.x/README.tests | 39 + trunk/libs/libxml2/libxml2-v2.10.x/README.zOS | 212 + .../{libxml2-v2.9.x => libxml2-v2.10.x}/SAX.c | 49 - .../SAX2.c | 222 +- trunk/libs/libxml2/libxml2-v2.10.x/TODO | 276 + .../libs/libxml2/libxml2-v2.10.x/TODO_SCHEMAS | 31 + .../autogen.sh | 10 +- .../{libxml2-v2.9.x => libxml2-v2.10.x}/buf.c | 301 +- .../{libxml2-v2.9.x => libxml2-v2.10.x}/buf.h | 5 - .../build_glob.py | 10 +- .../c14n.c | 8 +- .../catalog.c | 22 +- .../check-relaxng-test-suite.py | 218 +- .../check-relaxng-test-suite2.py | 242 +- .../check-xinclude-test-suite.py | 220 + .../check-xml-test-suite.py | 271 +- .../check-xsddata-test-suite.py | 250 +- .../chvalid.c | 2 - .../chvalid.def | 0 .../config.h.cmake.in | 115 +- .../configure.ac | 405 +- .../dbgen.pl | 0 .../dbgenattr.pl | 0 .../debugXML.c | 27 +- .../dict.c | 42 +- .../libxml2/libxml2-v2.10.x/doc/Makefile.am | 83 + .../doc/apibuild.py | 255 +- .../doc/buildDocBookCatalog | 0 .../doc/checkapisym.xsl | 0 .../doc/devhelp/Makefile.am | 16 +- .../doc/devhelp/devhelp2.xsl} | 16 +- .../libxml2-v2.10.x/doc/devhelp/general.html | 21 + .../doc/devhelp/home.png | Bin .../doc/devhelp/html.xsl | 15 +- .../libxml2-v2.10.x/doc/devhelp/index.html | 62 + .../doc/devhelp/left.png | Bin .../doc/devhelp/libxml2-HTMLparser.html | 1367 + .../doc/devhelp/libxml2-HTMLtree.html | 587 + .../doc/devhelp/libxml2-SAX.html | 943 + .../doc/devhelp/libxml2-SAX2.html | 940 + .../doc/devhelp/libxml2-c14n.html | 253 + .../doc/devhelp/libxml2-catalog.html | 887 + .../doc/devhelp/libxml2-chvalid.html | 581 + .../doc/devhelp/libxml2-debugXML.html | 873 + .../doc/devhelp/libxml2-dict.html | 341 + .../doc/devhelp/libxml2-encoding.html | 599 + .../doc/devhelp/libxml2-entities.html | 490 + .../doc/devhelp/libxml2-globals.html | 970 + .../doc/devhelp/libxml2-hash.html | 968 + .../doc/devhelp/libxml2-list.html | 730 + .../doc/devhelp/libxml2-nanoftp.html | 651 + .../doc/devhelp/libxml2-nanohttp.html | 446 + .../doc/devhelp/libxml2-parser.html | 3129 ++ .../doc/devhelp/libxml2-parserInternals.html | 2586 ++ .../doc/devhelp/libxml2-pattern.html | 445 + .../doc/devhelp/libxml2-relaxng.html | 792 + .../doc/devhelp/libxml2-schemasInternals.html | 1303 + .../doc/devhelp/libxml2-schematron.html | 382 + .../doc/devhelp/libxml2-threads.html | 316 + .../doc/devhelp/libxml2-tree.html | 5267 +++ .../doc/devhelp/libxml2-uri.html | 413 + .../doc/devhelp/libxml2-valid.html | 2143 ++ .../doc/devhelp/libxml2-xinclude.html | 390 + .../doc/devhelp/libxml2-xlink.html | 382 + .../doc/devhelp/libxml2-xmlIO.html | 1448 + .../doc/devhelp/libxml2-xmlautomata.html | 696 + .../doc/devhelp/libxml2-xmlerror.html | 569 +- .../doc/devhelp/libxml2-xmlexports.html | 88 + .../doc/devhelp/libxml2-xmlmemory.html | 613 + .../doc/devhelp/libxml2-xmlmodule.html | 167 + .../doc/devhelp/libxml2-xmlreader.html | 2348 ++ .../doc/devhelp/libxml2-xmlregexp.html | 976 + .../doc/devhelp/libxml2-xmlsave.html | 348 + .../doc/devhelp/libxml2-xmlschemas.html | 942 + .../doc/devhelp/libxml2-xmlschemastypes.html | 928 + .../doc/devhelp/libxml2-xmlstring.html | 853 + .../doc/devhelp/libxml2-xmlunicode.html | 3694 ++ .../doc/devhelp/libxml2-xmlversion.html | 473 + .../doc/devhelp/libxml2-xmlwriter.html | 2576 ++ .../doc/devhelp/libxml2-xpath.html | 1502 + .../doc/devhelp/libxml2-xpathInternals.html | 3226 ++ .../doc/devhelp/libxml2-xpointer.html | 559 + .../doc/devhelp/libxml2-xzlib.html | 0 .../doc/devhelp/libxml2.devhelp2 | 3562 ++ .../doc/devhelp/right.png | Bin .../doc/devhelp/style.css | 0 .../doc/devhelp/up.png | Bin .../doc/examples/Makefile.am | 78 +- .../doc/examples/examples.xml | 266 +- .../libxml2-v2.10.x/doc/examples/examples.xsl | 112 + .../libxml2-v2.10.x/doc/examples/index.html | 474 + .../libxml2-v2.10.x/doc/examples/index.py | 292 + .../doc/examples/io1.c | 2 +- .../doc/examples/io2.c | 4 +- .../doc/examples/parse1.c | 0 .../doc/examples/parse2.c | 0 .../doc/examples/parse3.c | 0 .../doc/examples/parse4.c | 2 +- .../doc/examples/reader1.c | 2 +- .../doc/examples/reader2.c | 2 +- .../doc/examples/reader3.c | 2 +- .../doc/examples/reader4.c | 2 +- .../doc/examples/test1.xml | 0 .../doc/examples/test2.xml | 0 .../doc/examples/test3.xml | 0 .../doc/examples/testWriter.c | 2 +- .../doc/examples/tree1.c | 2 +- .../doc/examples/tree2.c | 8 +- .../doc/examples/xpath1.c | 2 +- .../doc/examples/xpath2.c | 2 +- .../doc/libxml-doc.el | 0 .../doc/libxml2-api.xml | 5831 ++- .../doc/symbols.xml | 28 +- .../doc/syms.xsl | 0 .../doc/tutorial/apa.html | 0 .../doc/tutorial/apb.html | 0 .../doc/tutorial/apc.html | 0 .../doc/tutorial/apd.html | 0 .../doc/tutorial/ape.html | 0 .../doc/tutorial/apf.html | 0 .../doc/tutorial/apg.html | 0 .../doc/tutorial/aph.html | 0 .../doc/tutorial/api.html | 0 .../doc/tutorial/ar01s02.html | 10 +- .../doc/tutorial/ar01s03.html | 0 .../doc/tutorial/ar01s04.html | 4 +- .../doc/tutorial/ar01s05.html | 2 +- .../doc/tutorial/ar01s06.html | 2 +- .../doc/tutorial/ar01s07.html | 2 +- .../doc/tutorial/ar01s08.html | 2 +- .../doc/tutorial/ar01s09.html | 0 .../doc/tutorial/customfo.xsl | 0 .../doc/tutorial/customhtml.xsl | 0 .../doc/tutorial/images/blank.png | Bin .../doc/tutorial/images/callouts/1.png | Bin .../doc/tutorial/images/callouts/10.png | Bin .../doc/tutorial/images/callouts/2.png | Bin .../doc/tutorial/images/callouts/3.png | Bin .../doc/tutorial/images/callouts/4.png | Bin .../doc/tutorial/images/callouts/5.png | Bin .../doc/tutorial/images/callouts/6.png | Bin .../doc/tutorial/images/callouts/7.png | Bin .../doc/tutorial/images/callouts/8.png | Bin .../doc/tutorial/images/callouts/9.png | Bin .../doc/tutorial/images/caution.png | Bin .../doc/tutorial/images/draft.png | Bin .../doc/tutorial/images/home.png | Bin .../doc/tutorial/images/important.png | Bin .../doc/tutorial/images/next.png | Bin .../doc/tutorial/images/note.png | Bin .../doc/tutorial/images/prev.png | Bin .../doc/tutorial/images/tip.png | Bin .../doc/tutorial/images/toc-blank.png | Bin .../doc/tutorial/images/toc-minus.png | Bin .../doc/tutorial/images/toc-plus.png | Bin .../doc/tutorial/images/up.png | Bin .../doc/tutorial/images/warning.png | Bin .../doc/tutorial/includeaddattribute.c | 0 .../doc/tutorial/includeaddkeyword.c | 0 .../doc/tutorial/includeconvert.c | 0 .../doc/tutorial/includegetattribute.c | 0 .../doc/tutorial/includekeyword.c | 0 .../doc/tutorial/includestory.xml | 0 .../doc/tutorial/includexpath.c | 0 .../doc/tutorial/index.html | 2 +- .../doc/tutorial/ix01.html | 0 .../doc/tutorial/xmltutorial.xml | 28 +- .../libxml2/libxml2-v2.10.x/doc/xml2-config.1 | 32 + .../doc/xmlcatalog.1 | 12 +- .../doc/xmlcatalog.html} | 12 +- .../doc/xmlcatalog.xml} | 12 +- .../doc/xmllint.1 | 29 +- .../doc/xmllint.html | 11 +- .../doc/xmllint.xml | 21 +- .../{libxml2-v2.9.x => libxml2-v2.10.x}/enc.h | 0 .../encoding.c | 121 +- .../entities.c | 28 +- .../error.c | 2 - .../libxml2-v2.10.x/example/Makefile.am | 6 + .../example/gjobread.c | 0 .../example/gjobs.xml | 0 .../fuzz/.gitignore | 5 +- .../fuzz/Makefile.am | 47 +- .../fuzz/README | 0 .../fuzz/fuzz.c | 1 + .../fuzz/fuzz.h | 0 .../fuzz/genSeed.c | 2 + .../fuzz/html.c | 0 .../fuzz/html.dict | 0 .../fuzz/html.options | 0 .../fuzz/regexp.c | 0 .../fuzz/regexp.dict | 0 .../fuzz/regexp.options | 0 .../fuzz/schema.c | 0 .../fuzz/schema.dict | 0 .../fuzz/schema.options | 0 .../fuzz/testFuzzer.c | 0 .../fuzz/uri.c | 0 .../fuzz/uri.options | 0 .../fuzz/xml.c | 0 .../fuzz/xml.dict | 0 .../fuzz/xml.options | 0 .../fuzz/xpath.c | 0 .../fuzz/xpath.dict | 0 .../fuzz/xpath.options | 0 .../genChRanges.py | 11 +- .../genUnicode.py | 84 +- .../gentest.py | 451 +- .../global.data | 0 .../globals.c | 95 +- .../hash.c | 31 +- .../include/Makefile.am | 1 - .../include/libxml/HTMLparser.h | 0 .../include/libxml/HTMLtree.h | 0 .../include/libxml/Makefile.am | 4 +- .../include/libxml/SAX.h | 41 +- .../include/libxml/SAX2.h | 12 +- .../include/libxml/c14n.h | 0 .../include/libxml/catalog.h | 0 .../include/libxml/chvalid.h | 0 .../include/libxml/debugXML.h | 0 .../include/libxml/dict.h | 2 + .../include/libxml/encoding.h | 23 +- .../include/libxml/entities.h | 2 + .../include/libxml/globals.h | 15 +- .../include/libxml/hash.h | 0 .../include/libxml/list.h | 0 .../include/libxml/nanoftp.h | 27 +- .../include/libxml/nanohttp.h | 0 .../include/libxml/parser.h | 7 +- .../include/libxml/parserInternals.h | 12 + .../include/libxml/pattern.h | 0 .../include/libxml/relaxng.h | 1 + .../include/libxml/schemasInternals.h | 0 .../include/libxml/schematron.h | 2 +- .../include/libxml/threads.h | 2 + .../include/libxml/tree.h | 9 +- .../include/libxml/uri.h | 0 .../include/libxml/valid.h | 19 +- .../include/libxml/xinclude.h | 0 .../include/libxml/xlink.h | 0 .../include/libxml/xmlIO.h | 0 .../include/libxml/xmlautomata.h | 0 .../include/libxml/xmlerror.h | 2 + .../include/libxml/xmlexports.h | 0 .../include/libxml/xmlmemory.h | 2 + .../include/libxml/xmlmodule.h | 0 .../include/libxml/xmlreader.h | 0 .../include/libxml/xmlregexp.h | 0 .../include/libxml/xmlsave.h | 0 .../include/libxml/xmlschemas.h | 0 .../include/libxml/xmlschemastypes.h | 1 + .../include/libxml/xmlstring.h | 0 .../include/libxml/xmlunicode.h | 0 .../include/libxml/xmlversion.h.in | 38 +- .../include/libxml/xmlwriter.h | 0 .../include/libxml/xpath.h | 11 + .../include/libxml/xpathInternals.h | 0 .../include/libxml/xpointer.h | 23 + .../libxml2-v2.10.x/include/win32config.h | 21 + .../include/wsockcompat.h | 4 - .../legacy.c | 5 +- .../libxml-2.0-uninstalled.pc.in | 13 + .../libxml-2.0.pc.in | 4 +- .../libxml.h | 34 +- .../libxml.m4 | 3 +- .../libxml.spec.in | 13 +- .../libxml2-config.cmake.cmake.in | 0 .../libxml2-config.cmake.in | 0 .../libs/libxml2/libxml2-v2.10.x/libxml2.doap | 37 + .../libxml2.syms | 28 +- .../list.c | 2 - .../nanoftp.c | 16 +- .../nanohttp.c | 15 +- .../optim/TOTRY | 0 .../optim/hash_dict.txt | 0 .../os400/README400 | 0 .../os400/dlfcn/dlfcn.c | 0 .../os400/dlfcn/dlfcn.h | 0 .../os400/iconv/README.iconv | 0 .../os400/iconv/bldcsndfa/bldcsndfa.c | 0 .../os400/iconv/bldcsndfa/ccsid_mibenum.dtd | 0 .../os400/iconv/bldcsndfa/ccsid_mibenum.xml | 0 .../iconv/bldcsndfa/character-sets.xhtml | 0 .../os400/iconv/ianatables.c | 0 .../os400/iconv/iconv.c | 0 .../os400/iconv/iconv.h | 0 .../os400/initscript.sh | 0 .../os400/libxmlmain.c | 0 .../os400/libxmlrpg/DOCBparser.rpgle | 0 .../os400/libxmlrpg/HTMLparser.rpgle | 0 .../os400/libxmlrpg/HTMLtree.rpgle | 0 .../os400/libxmlrpg/SAX.rpgle | 0 .../os400/libxmlrpg/SAX2.rpgle | 0 .../os400/libxmlrpg/c14n.rpgle | 0 .../os400/libxmlrpg/catalog.rpgle | 0 .../os400/libxmlrpg/chvalid.rpgle | 0 .../os400/libxmlrpg/debugXML.rpgle | 0 .../os400/libxmlrpg/dict.rpgle | 0 .../os400/libxmlrpg/encoding.rpgle | 0 .../os400/libxmlrpg/entities.rpgle | 0 .../os400/libxmlrpg/globals.rpgle | 0 .../os400/libxmlrpg/hash.rpgle | 0 .../os400/libxmlrpg/list.rpgle | 0 .../os400/libxmlrpg/nanoftp.rpgle | 0 .../os400/libxmlrpg/nanohttp.rpgle | 0 .../os400/libxmlrpg/parser.rpgle | 0 .../os400/libxmlrpg/parserInternals.rpgle | 0 .../os400/libxmlrpg/pattern.rpgle | 0 .../os400/libxmlrpg/relaxng.rpgle | 0 .../os400/libxmlrpg/schemasInternals.rpgle | 0 .../os400/libxmlrpg/schematron.rpgle | 2 +- .../os400/libxmlrpg/threads.rpgle | 0 .../os400/libxmlrpg/transcode.rpgle | 0 .../os400/libxmlrpg/tree.rpgle | 0 .../os400/libxmlrpg/uri.rpgle | 0 .../os400/libxmlrpg/valid.rpgle | 0 .../os400/libxmlrpg/xinclude.rpgle | 0 .../os400/libxmlrpg/xlink.rpgle | 0 .../os400/libxmlrpg/xmlIO.rpgle | 0 .../os400/libxmlrpg/xmlTypesC.rpgle | 0 .../os400/libxmlrpg/xmlautomata.rpgle | 0 .../os400/libxmlrpg/xmlerror.rpgle | 0 .../os400/libxmlrpg/xmlexports.rpgle | 0 .../os400/libxmlrpg/xmlmemory.rpgle | 0 .../os400/libxmlrpg/xmlmodule.rpgle | 0 .../os400/libxmlrpg/xmlreader.rpgle | 0 .../os400/libxmlrpg/xmlregexp.rpgle | 0 .../os400/libxmlrpg/xmlsave.rpgle | 0 .../os400/libxmlrpg/xmlschemas.rpgle | 0 .../os400/libxmlrpg/xmlschemastypes.rpgle | 0 .../os400/libxmlrpg/xmlstdarg.rpgle | 0 .../os400/libxmlrpg/xmlstring.rpgle | 0 .../os400/libxmlrpg/xmlunicode.rpgle | 0 .../os400/libxmlrpg/xmlversion.rpgle.in | 0 .../os400/libxmlrpg/xmlwriter.rpgle | 0 .../os400/libxmlrpg/xpath.rpgle | 0 .../os400/libxmlrpg/xpathInternals.rpgle | 0 .../os400/libxmlrpg/xpointer.rpgle | 0 .../os400/make-bldcsndfa.sh | 0 .../os400/make-include.sh | 3 - .../os400/make-rpg.sh | 0 .../os400/make-src.sh | 0 .../os400/make.sh | 0 .../os400/os400config.h.in | 122 - .../os400/rpgsupport.c | 0 .../os400/rpgsupport.h | 0 .../os400/transcode.c | 0 .../os400/transcode.h | 0 .../os400/wrappers.c | 0 .../os400/wrappers.h | 0 .../os400/xmlcatlgcl.c | 0 .../os400/xmllintcl.c | 0 .../parser.c | 141 +- .../parserInternals.c | 223 +- .../pattern.c | 14 - .../python/Makefile.am | 49 +- .../python/README | 8 +- .../python/TODO | 2 - .../python/drv_libxml2.py | 0 .../python/generator.py | 57 +- .../python/libxml.c | 54 +- .../python/libxml.py | 0 .../python/libxml2-python-api.xml | 0 .../python/libxml_wrap.h | 17 + .../python/setup.py.in | 88 +- .../python/tests/Makefile.am | 7 +- .../python/tests/attribs.py | 2 +- .../python/tests/build.py | 2 +- .../python/tests/compareNodes.py | 2 +- .../python/tests/ctxterror.py | 2 +- .../python/tests/cutnpaste.py | 2 +- .../python/tests/dtdvalid.py | 2 +- .../python/tests/error.py | 2 +- .../python/tests/inbuf.py | 2 +- .../python/tests/indexes.py | 2 +- .../python/tests/input_callback.py | 2 +- .../python/tests/invalid.xml | 0 .../python/tests/nsdel.py | 2 +- .../python/tests/outbuf.py | 2 +- .../python/tests/push.py | 2 +- .../python/tests/pushSAX.py | 2 +- .../python/tests/pushSAXhtml.py | 2 +- .../python/tests/reader.py | 2 +- .../python/tests/reader2.py | 7 +- .../python/tests/reader3.py | 2 +- .../python/tests/reader4.py | 2 +- .../python/tests/reader5.py | 6 +- .../python/tests/reader6.py | 2 +- .../python/tests/reader7.py | 2 +- .../python/tests/reader8.py | 2 +- .../python/tests/readererr.py | 2 +- .../python/tests/readernext.py | 2 +- .../python/tests/regexp.py | 2 +- .../python/tests/relaxng.py | 2 +- .../python/tests/resolver.py | 2 +- .../python/tests/schema.py | 2 +- .../python/tests/serialize.py | 2 +- .../python/tests/sync.py | 2 +- .../python/tests/test.dtd | 0 .../python/tests/thread2.py | 2 +- .../python/tests/tst.py | 2 +- .../python/tests/tst.xml | 0 .../python/tests/tstLastError.py | 2 +- .../python/tests/tstURI.py | 2 +- .../python/tests/tstmem.py | 9 +- .../python/tests/tstxpath.py | 2 +- .../python/tests/valid.xml | 0 .../python/tests/validDTD.py | 2 +- .../python/tests/validRNG.py | 2 +- .../python/tests/validSchemas.py | 2 +- .../python/tests/validate.py | 2 +- .../python/tests/walker.py | 2 +- .../python/tests/xpath.py | 2 +- .../python/tests/xpathext.py | 2 +- .../python/tests/xpathleak.py | 2 +- .../python/tests/xpathns.py | 2 +- .../python/tests/xpathret.py | 2 +- .../python/types.c | 130 +- .../relaxng.c | 11 +- .../result/HTML/53867.html | 0 .../result/HTML/53867.html.sax | 0 .../result/HTML/758518-entity.html | 0 .../result/HTML/758518-entity.html.err | 0 .../result/HTML/758518-entity.html.sax | 0 .../result/HTML/758518-tag.html | 0 .../result/HTML/758518-tag.html.err | 0 .../result/HTML/758518-tag.html.sax | 0 .../result/HTML/758605.html | 0 .../result/HTML/758605.html.err | 0 .../result/HTML/758605.html.sax | 0 .../result/HTML/758606.html | 0 .../result/HTML/758606.html.err | 0 .../result/HTML/758606.html.sax | 0 .../result/HTML/758606_2.html | 0 .../result/HTML/758606_2.html.err | 0 .../result/HTML/758606_2.html.sax | 0 .../result/HTML/Down.html | 0 .../result/HTML/Down.html.sax | 0 .../result/HTML/attrents.html | 0 .../result/HTML/attrents.html.sax | 0 .../result/HTML/autoclose.html | 0 .../result/HTML/autoclose.html.sax | 0 .../result/HTML/autoclose2.html | 0 .../result/HTML/autoclose2.html.sax | 0 .../result/HTML/autoclose3.html | 0 .../result/HTML/autoclose3.html.sax | 0 .../result/HTML/cf_128.html | 0 .../result/HTML/cf_128.html.sax | 0 .../result/HTML/chunked_attr.html | 0 .../result/HTML/chunked_attr.html.sax | 0 .../result/HTML/comments.html | 0 .../result/HTML/comments.html.err | 0 .../result/HTML/comments.html.sax | 0 .../result/HTML/comments2.html | 0 .../result/HTML/comments2.html.err | 0 .../result/HTML/comments2.html.sax | 0 .../result/HTML/comments3.html | 18 + .../result/HTML/comments3.html.err | 6 + .../result/HTML/comments3.html.sax | 49 + .../result/HTML/doc2.htm | 0 .../result/HTML/doc2.htm.err | 0 .../result/HTML/doc2.htm.sax | 0 .../result/HTML/doc3.htm | 0 .../result/HTML/doc3.htm.err | 0 .../result/HTML/doc3.htm.sax | 0 .../result/HTML/entities.html | 0 .../result/HTML/entities.html.err | 0 .../result/HTML/entities.html.sax | 0 .../result/HTML/entities2.html | 0 .../result/HTML/entities2.html.sax | 0 .../result/HTML/fp40.htm | 0 .../result/HTML/fp40.htm.err | 0 .../result/HTML/fp40.htm.sax | 0 .../result/HTML/html5_enc.html | 0 .../result/HTML/html5_enc.html.sax | 0 .../libxml2-v2.10.x/result/HTML/issue318.html | 6 + .../result/HTML/issue318.html.sax | 22 + .../libxml2-v2.10.x/result/HTML/issue380.html | 6 + .../result/HTML/issue380.html.err | 6 + .../result/HTML/issue380.html.sax | 20 + .../result/HTML/liclose.html | 0 .../result/HTML/liclose.html.sax | 0 .../result/HTML/lt.html | 0 .../result/HTML/lt.html.sax | 0 .../result/HTML/noscript.html | 0 .../result/HTML/noscript.html.sax | 0 .../result/HTML/pre.html | 0 .../result/HTML/pre.html.sax | 0 .../result/HTML/python.html | 0 .../result/HTML/python.html.sax | 0 .../result/HTML/reg1.html | 0 .../result/HTML/reg1.html.sax | 0 .../result/HTML/reg2.html | 0 .../result/HTML/reg2.html.sax | 0 .../result/HTML/reg3.html | 0 .../result/HTML/reg3.html.sax | 0 .../result/HTML/reg4.html | 0 .../result/HTML/reg4.html.err | 0 .../result/HTML/reg4.html.sax | 0 .../result/HTML/repeat.html | 0 .../result/HTML/repeat.html.sax | 0 .../result/HTML/script.html | 0 .../result/HTML/script.html.sax | 0 .../result/HTML/script2.html | 0 .../result/HTML/script2.html.sax | 0 .../result/HTML/test2.html | 0 .../result/HTML/test2.html.sax | 0 .../result/HTML/test3.html | 0 .../result/HTML/test3.html.err | 0 .../result/HTML/test3.html.sax | 0 .../result/HTML/utf8bug.html | 0 .../result/HTML/utf8bug.html.err | 0 .../result/HTML/utf8bug.html.sax | 0 .../result/HTML/wired.html | 0 .../result/HTML/wired.html.err | 0 .../result/HTML/wired.html.sax | 0 .../result/SVG/4rects.xml | 10 +- .../result/SVG/a-valid.xml | 2 +- .../result/SVG/a-wf.xml | 2 +- .../libxml2-v2.10.x/result/SVG/bike.xml | 40 + .../result/SVG/circle.xml | 2 +- .../result/SVG/defs.xml | 4 +- .../result/SVG/desc.xml | 16 +- .../result/SVG/ellipse.xml | 2 +- .../libxml2-v2.10.x/result/SVG/flower2.xml | 10 + .../result/SVG/gradient.xml | 4 +- .../result/SVG/group01.xml | 2 +- .../result/SVG/group02.xml | 2 +- .../result/SVG/group03.xml | 11 +- .../result/SVG/image-valid.xml | 2 +- .../result/SVG/image-wf.xml | 4 +- .../result/SVG/lin-gradient.xml | 2 +- .../result/SVG/marker.xml | 14 +- .../result/SVG/mask.xml | 2 +- .../result/SVG/mathswitch.xml | 25 +- .../libxml2-v2.10.x/result/SVG/parentns.xml | 9 + .../result/SVG/path01.xml | 2 +- .../result/SVG/path02.xml | 0 .../result/SVG/patternfill.xml | 2 +- .../result/SVG/polyline.xml | 2 +- .../result/SVG/private.xml | 6 +- .../result/SVG/rad-gradient.xml | 8 +- .../result/SVG/rectangle.xml | 2 +- .../libxml2-v2.10.x/result/SVG/richdesc.xml | 11 + .../result/SVG/script.xml | 7 +- .../result/SVG/structure01.xml | 10 +- .../result/SVG/style.xml | 3 +- .../result/SVG/switch.xml | 12 +- .../result/SVG/symbol-use.xml | 19 +- .../result/SVG/template.xml | 2 +- .../result/SVG/text01.xml | 0 .../result/SVG/text02.xml | 17 +- .../result/SVG/text03.xml | 0 .../result/SVG/toap01.xml | 2 +- .../result/SVG/toap02.xml | 5 +- .../libxml2-v2.10.x/result/SVG/transform.xml | 25 + .../result/SVG/trivial.xml | 2 +- .../result/SVG/twin-gradients.xml | 4 +- .../result/SVG/v-template.xml | 6 +- .../result/SVG/viewport-nest.xml | 8 +- .../result/SVG/viewport-transform.xml | 44 + .../libxml2-v2.10.x/result/SVG/viewport.xml | 10 + .../result/SVG/wf-template.xml | 4 +- .../result/URI/smith.uri | 0 .../result/URI/uri.data | 0 .../result/VC/AttributeDefaultLegal | 0 .../result/VC/AttributeDefaultLegal.rdr | 0 .../result/VC/AttributeNmtokens | 0 .../result/VC/AttributeNmtokens.rdr | 0 .../result/VC/DuplicateType | 0 .../result/VC/DuplicateType.rdr | 0 .../result/VC/ElementValid | 0 .../result/VC/ElementValid.rdr | 0 .../result/VC/ElementValid2 | 0 .../result/VC/ElementValid2.rdr | 0 .../result/VC/ElementValid3 | 0 .../result/VC/ElementValid3.rdr | 0 .../result/VC/ElementValid4 | 0 .../result/VC/ElementValid4.rdr | 0 .../result/VC/ElementValid5 | 0 .../result/VC/ElementValid5.rdr | 0 .../result/VC/ElementValid6 | 0 .../result/VC/ElementValid6.rdr | 0 .../result/VC/ElementValid7 | 0 .../result/VC/ElementValid7.rdr | 0 .../result/VC/ElementValid8 | 0 .../result/VC/ElementValid8.rdr | 0 .../result/VC/Enumeration | 0 .../result/VC/Enumeration.rdr | 0 .../result/VC/NS2 | 0 .../result/VC/NS2.rdr | 0 .../result/VC/NS3 | 0 .../result/VC/NS3.rdr | 0 .../result/VC/OneID | 0 .../result/VC/OneID.rdr | 0 .../result/VC/OneID2 | 0 .../result/VC/OneID2.rdr | 0 .../result/VC/OneID3 | 0 .../result/VC/OneID3.rdr | 0 .../result/VC/PENesting | 0 .../result/VC/PENesting.rdr | 0 .../result/VC/PENesting2 | 0 .../result/VC/PENesting2.rdr | 0 .../result/VC/UniqueElementTypeDeclaration | 0 .../VC/UniqueElementTypeDeclaration.rdr | 0 .../result/VC/UniqueElementTypeDeclaration2 | 0 .../VC/UniqueElementTypeDeclaration2.rdr | 0 .../result/XInclude/coalesce.xml | 10 + .../result/XInclude/coalesce.xml.rdr | 17 + .../result/XInclude/docids.xml | 0 .../result/XInclude/docids.xml.rdr | 0 .../result/XInclude/fallback.xml | 0 .../result/XInclude/fallback.xml.rdr | 0 .../result/XInclude/fallback2.xml | 0 .../result/XInclude/fallback2.xml.rdr | 0 .../result/XInclude/fallback3.xml | 0 .../result/XInclude/fallback3.xml.rdr | 0 .../result/XInclude/fallback4.xml | 0 .../result/XInclude/fallback4.xml.rdr | 0 .../result/XInclude/fallback5.xml | 0 .../result/XInclude/fallback5.xml.rdr | 0 .../result/XInclude/fallback6.xml | 0 .../result/XInclude/include.xml | 0 .../result/XInclude/include.xml.rdr | 0 .../result/XInclude/nodes.xml | 0 .../result/XInclude/nodes.xml.rdr | 0 .../result/XInclude/nodes2.xml | 0 .../result/XInclude/nodes2.xml.rdr | 0 .../result/XInclude/nodes3.xml | 0 .../result/XInclude/nodes3.xml.rdr | 0 .../result/XInclude/ns1.xml | 0 .../result/XInclude/ns1.xml.rdr | 2 +- .../result/XInclude/recursive.xml | 0 .../result/XInclude/recursive.xml.rdr | 0 .../libxml2-v2.10.x/result/XInclude/red.xml | 9 + .../result/XInclude/red.xml.rdr | 26 + .../result/XInclude/tstencoding.xml | 0 .../result/XInclude/tstencoding.xml.rdr | 0 .../result/XInclude/txtinclude.xml | 0 .../result/XInclude/txtinclude.xml.rdr | 0 .../result/XPath/expr/base | 0 .../result/XPath/expr/compare | 0 .../result/XPath/expr/equality | 0 .../result/XPath/expr/floats | 0 .../result/XPath/expr/functions | 0 .../result/XPath/expr/strings | 24 + .../result/XPath/tests/chaptersbase | 0 .../result/XPath/tests/chaptersprefol | 0 .../result/XPath/tests/idsimple | 0 .../result/XPath/tests/langsimple | 0 .../result/XPath/tests/mixedpat | 0 .../result/XPath/tests/nodespat | 0 .../result/XPath/tests/nssimple | 0 .../result/XPath/tests/simpleabbr | 0 .../result/XPath/tests/simplebase | 0 .../result/XPath/tests/strbase | 0 .../result/XPath/tests/usr1check | 0 .../result/XPath/tests/vidbase | 0 .../result/XPath/xptr-xp1}/chapterschildseq | 0 .../result/XPath/xptr-xp1/chaptersparts | 44 + .../result/XPath/xptr-xp1/issue289base | 7 + .../result/XPath/xptr-xp1/vidbase | 9 + .../result/XPath/xptr-xp1}/vidchildseq | 0 .../result/XPath/xptr-xp1/viderror | 4 + .../result/XPath/xptr-xp1/vidparts | 27 + .../result/XPath/xptr/chaptersparts | 0 .../result/XPath/xptr/chaptersrange | 0 .../result/XPath/xptr/issue289base | 7 + .../result/XPath/xptr/strpoint | 0 .../result/XPath/xptr/strrange | 0 .../result/XPath/xptr/strrange2 | 0 .../result/XPath/xptr/strrange3 | 0 .../result/XPath/xptr/vidbase | 0 .../result/XPath/xptr/viderror | 0 .../result/XPath/xptr/vidparts | 0 .../result/att1 | 0 .../result/att1.rde | 0 .../result/att1.rdr | 0 .../result/att1.sax | 0 .../result/att1.sax2 | 0 .../result/att10 | 0 .../result/att10.rde | 0 .../result/att10.rdr | 0 .../result/att10.sax | 0 .../result/att10.sax2 | 0 .../result/att11 | 0 .../result/att11.rde | 0 .../result/att11.rdr | 0 .../result/att11.sax | 0 .../result/att11.sax2 | 0 .../result/att2 | 0 .../result/att2.rde | 0 .../result/att2.rdr | 0 .../result/att2.sax | 0 .../result/att2.sax2 | 0 .../result/att3 | 0 .../result/att3.rde | 0 .../result/att3.rdr | 0 .../result/att3.sax | 0 .../result/att3.sax2 | 0 .../result/att4 | 0 .../result/att4.rde | 0 .../result/att4.rdr | 0 .../result/att4.sax | 0 .../result/att4.sax2 | 0 .../result/att5 | 0 .../result/att5.rde | 0 .../result/att5.rdr | 0 .../result/att5.sax | 0 .../result/att5.sax2 | 0 .../result/att6 | 0 .../result/att6.rde | 0 .../result/att6.rdr | 0 .../result/att6.sax | 0 .../result/att6.sax2 | 0 .../result/att7 | 0 .../result/att7.rde | 0 .../result/att7.rdr | 0 .../result/att7.sax | 0 .../result/att7.sax2 | 0 .../result/att8 | 0 .../result/att8.rde | 0 .../result/att8.rdr | 0 .../result/att8.sax | 0 .../result/att8.sax2 | 0 .../result/att9 | 0 .../result/att9.rde | 0 .../result/att9.rdr | 0 .../result/att9.sax | 0 .../result/att9.sax2 | 0 .../result/attrib.xml | 0 .../result/attrib.xml.rde | 0 .../result/attrib.xml.rdr | 0 .../result/attrib.xml.sax | 0 .../result/attrib.xml.sax2 | 0 .../result/automata/a | 0 .../result/automata/aba | 0 .../result/automata/abaa | 0 .../result/automata/abba | 0 .../result/automata/po | 0 .../result/badcomment.xml | 0 .../result/badcomment.xml.rde | 0 .../result/badcomment.xml.rdr | 0 .../result/badcomment.xml.sax | 0 .../result/badcomment.xml.sax2 | 0 .../result/bigentname.xml | 0 .../result/bigentname.xml.rde | 0 .../result/bigentname.xml.rdr | 0 .../result/bigentname.xml.sax | 0 .../result/bigentname.xml.sax2 | 0 .../result/bigname.xml | 0 .../result/bigname.xml.rde | 0 .../result/bigname.xml.rdr | 0 .../result/bigname.xml.sax | 0 .../result/bigname.xml.sax2 | 0 .../result/bigname2.xml | 0 .../result/bigname2.xml.rde | 0 .../result/bigname2.xml.rdr | 0 .../result/bigname2.xml.sax | 0 .../result/bigname2.xml.sax2 | 0 .../c14n/1-1-without-comments/example-1 | 0 .../c14n/1-1-without-comments/example-2 | 0 .../c14n/1-1-without-comments/example-3 | 0 .../c14n/1-1-without-comments/example-4 | 0 .../c14n/1-1-without-comments/example-5 | 0 .../c14n/1-1-without-comments/example-6 | 0 .../c14n/1-1-without-comments/example-7 | 0 .../c14n/1-1-without-comments/example-8 | 0 .../xmlbase-c14n11spec-102 | 0 .../xmlbase-c14n11spec2-102 | 0 .../xmlbase-c14n11spec3-102 | 0 .../c14n/1-1-without-comments/xmlbase-prop-1 | 0 .../c14n/1-1-without-comments/xmlbase-prop-2 | 0 .../c14n/1-1-without-comments/xmlbase-prop-3 | 0 .../c14n/1-1-without-comments/xmlbase-prop-4 | 0 .../c14n/1-1-without-comments/xmlbase-prop-5 | 0 .../c14n/1-1-without-comments/xmlbase-prop-6 | 0 .../c14n/1-1-without-comments/xmlbase-prop-7 | 0 .../c14n/1-1-without-comments/xmlid-prop-1 | 0 .../c14n/1-1-without-comments/xmlid-prop-2 | 0 .../c14n/1-1-without-comments/xmllang-prop-1 | 0 .../c14n/1-1-without-comments/xmllang-prop-2 | 0 .../c14n/1-1-without-comments/xmllang-prop-3 | 0 .../c14n/1-1-without-comments/xmllang-prop-4 | 0 .../c14n/1-1-without-comments/xmlspace-prop-1 | 0 .../c14n/1-1-without-comments/xmlspace-prop-2 | 0 .../c14n/1-1-without-comments/xmlspace-prop-3 | 0 .../c14n/1-1-without-comments/xmlspace-prop-4 | 0 .../exc-without-comments/merlin-c14n-two-09 | 0 .../exc-without-comments/merlin-c14n-two-10 | 0 .../exc-without-comments/merlin-c14n-two-11 | 0 .../exc-without-comments/merlin-c14n-two-12 | 0 .../exc-without-comments/merlin-c14n-two-13 | 0 .../exc-without-comments/merlin-c14n-two-14 | 0 .../exc-without-comments/merlin-c14n-two-17 | 0 .../exc-without-comments/merlin-c14n-two-18 | 0 .../exc-without-comments/merlin-c14n-two-19 | 0 .../exc-without-comments/merlin-c14n-two-20 | 0 .../exc-without-comments/merlin-c14n-two-21 | 0 .../exc-without-comments/merlin-c14n-two-22 | 0 .../exc-without-comments/merlin-c14n-two-23 | 0 .../exc-without-comments/merlin-c14n-two-24 | 0 .../exc-without-comments/merlin-c14n-two-26 | 0 .../result/c14n/exc-without-comments/test-0 | 0 .../result/c14n/exc-without-comments/test-1 | 0 .../result/c14n/exc-without-comments/test-2 | 0 .../result/c14n/with-comments/example-1 | 0 .../result/c14n/with-comments/example-2 | 0 .../result/c14n/with-comments/example-3 | 0 .../result/c14n/with-comments/example-4 | 0 .../result/c14n/with-comments/example-5 | 0 .../result/c14n/with-comments/example-6 | 0 .../result/c14n/with-comments/example-7 | 0 .../result/c14n/without-comments/example-1 | 0 .../result/c14n/without-comments/example-2 | 0 .../result/c14n/without-comments/example-3 | 0 .../result/c14n/without-comments/example-4 | 0 .../result/c14n/without-comments/example-5 | 0 .../result/c14n/without-comments/example-6 | 0 .../result/c14n/without-comments/example-7 | 0 .../c14n/without-comments/merlin-c14n-two-00 | 0 .../c14n/without-comments/merlin-c14n-two-01 | 0 .../c14n/without-comments/merlin-c14n-two-02 | 0 .../c14n/without-comments/merlin-c14n-two-03 | 0 .../c14n/without-comments/merlin-c14n-two-04 | 0 .../c14n/without-comments/merlin-c14n-two-05 | 0 .../c14n/without-comments/merlin-c14n-two-06 | 0 .../c14n/without-comments/merlin-c14n-two-07 | 0 .../c14n/without-comments/merlin-c14n-two-08 | 0 .../result/c14n/without-comments/test-0 | 0 .../result/c14n/without-comments/test-1 | 0 .../result/c14n/without-comments/test-2 | 0 .../result/c14n/without-comments/test-3 | 0 .../result/catalogs/catal | 0 .../result/catalogs/docbook | 0 .../result/catalogs/mycatalog.empty | 0 .../result/catalogs/mycatalog.full | 0 .../result/catalogs/registry | 0 .../result/catalogs/whites | 0 .../result/catalogs/whitex | 0 .../result/cdata | 0 .../result/cdata-2-byte-UTF-8.xml | 0 .../result/cdata-2-byte-UTF-8.xml.rde | 0 .../result/cdata-2-byte-UTF-8.xml.rdr | 0 .../result/cdata-2-byte-UTF-8.xml.sax | 0 .../result/cdata-2-byte-UTF-8.xml.sax2 | 0 .../result/cdata-3-byte-UTF-8.xml | 0 .../result/cdata-3-byte-UTF-8.xml.rde | 0 .../result/cdata-3-byte-UTF-8.xml.rdr | 0 .../result/cdata-3-byte-UTF-8.xml.sax | 0 .../result/cdata-3-byte-UTF-8.xml.sax2 | 0 .../result/cdata-4-byte-UTF-8.xml | 0 .../result/cdata-4-byte-UTF-8.xml.rde | 0 .../result/cdata-4-byte-UTF-8.xml.rdr | 0 .../result/cdata-4-byte-UTF-8.xml.sax | 0 .../result/cdata-4-byte-UTF-8.xml.sax2 | 0 .../result/cdata.rde | 0 .../result/cdata.rdr | 0 .../result/cdata.sax | 0 .../result/cdata.sax2 | 0 .../result/cdata2 | 0 .../result/cdata2.rde | 0 .../result/cdata2.rdr | 0 .../result/cdata2.sax | 0 .../result/cdata2.sax2 | 0 .../result/comment.xml | 0 .../result/comment.xml.rde | 0 .../result/comment.xml.rdr | 0 .../result/comment.xml.sax | 0 .../result/comment.xml.sax2 | 0 .../result/comment2.xml | 0 .../result/comment2.xml.rde | 0 .../result/comment2.xml.rdr | 0 .../result/comment2.xml.sax | 0 .../result/comment2.xml.sax2 | 0 .../result/comment3.xml | 0 .../result/comment3.xml.rde | 0 .../result/comment3.xml.rdr | 0 .../result/comment3.xml.sax | 0 .../result/comment3.xml.sax2 | 0 .../result/comment4.xml | 0 .../result/comment4.xml.rde | 0 .../result/comment4.xml.rdr | 0 .../result/comment4.xml.sax | 0 .../result/comment4.xml.sax2 | 0 .../result/comment5.xml | 0 .../result/comment5.xml.rde | 0 .../result/comment5.xml.rdr | 0 .../result/comment5.xml.sax | 0 .../result/comment5.xml.sax2 | 0 .../result/comment6.xml | 0 .../result/comment6.xml.rde | 0 .../result/comment6.xml.rdr | 0 .../result/comment6.xml.sax | 0 .../result/comment6.xml.sax2 | 0 .../result/dav1 | 0 .../result/dav1.rde | 0 .../result/dav1.rdr | 0 .../result/dav1.sax | 0 .../result/dav1.sax2 | 0 .../result/dav10 | 0 .../result/dav10.rde | 0 .../result/dav10.rdr | 0 .../result/dav10.sax | 0 .../result/dav10.sax2 | 0 .../result/dav11 | 0 .../result/dav11.rde | 0 .../result/dav11.rdr | 0 .../result/dav11.sax | 0 .../result/dav11.sax2 | 0 .../result/dav12 | 0 .../result/dav12.rde | 0 .../result/dav12.rdr | 0 .../result/dav12.sax | 0 .../result/dav12.sax2 | 0 .../result/dav13 | 0 .../result/dav13.rde | 0 .../result/dav13.rdr | 0 .../result/dav13.sax | 0 .../result/dav13.sax2 | 0 .../result/dav15 | 0 .../result/dav15.rde | 0 .../result/dav15.rdr | 0 .../result/dav15.sax | 0 .../result/dav15.sax2 | 0 .../result/dav16 | 0 .../result/dav16.rde | 0 .../result/dav16.rdr | 0 .../result/dav16.sax | 0 .../result/dav16.sax2 | 0 .../result/dav17 | 0 .../result/dav17.rde | 0 .../result/dav17.rdr | 0 .../result/dav17.sax | 0 .../result/dav17.sax2 | 0 .../result/dav18 | 0 .../result/dav18.rde | 0 .../result/dav18.rdr | 0 .../result/dav18.sax | 0 .../result/dav18.sax2 | 0 .../result/dav19 | 0 .../result/dav19.rde | 0 .../result/dav19.rdr | 0 .../result/dav19.sax | 0 .../result/dav19.sax2 | 0 .../result/dav2 | 0 .../result/dav2.rde | 0 .../result/dav2.rdr | 0 .../result/dav2.sax | 0 .../result/dav2.sax2 | 0 .../result/dav3 | 0 .../result/dav3.rde | 0 .../result/dav3.rdr | 0 .../result/dav3.sax | 0 .../result/dav3.sax2 | 0 .../result/dav4 | 0 .../result/dav4.rde | 0 .../result/dav4.rdr | 0 .../result/dav4.sax | 0 .../result/dav4.sax2 | 0 .../result/dav5 | 0 .../result/dav5.rde | 0 .../result/dav5.rdr | 0 .../result/dav5.sax | 0 .../result/dav5.sax2 | 0 .../result/dav6 | 0 .../result/dav6.rde | 0 .../result/dav6.rdr | 0 .../result/dav6.sax | 0 .../result/dav6.sax2 | 0 .../result/dav7 | 0 .../result/dav7.rde | 0 .../result/dav7.rdr | 0 .../result/dav7.sax | 0 .../result/dav7.sax2 | 0 .../result/dav8 | 0 .../result/dav8.rde | 0 .../result/dav8.rdr | 0 .../result/dav8.sax | 0 .../result/dav8.sax2 | 0 .../result/dav9 | 0 .../result/dav9.rde | 0 .../result/dav9.rdr | 0 .../result/dav9.sax | 0 .../result/dav9.sax2 | 0 .../result/defattr.xml | 0 .../result/defattr.xml.rde | 0 .../result/defattr.xml.rdr | 0 .../result/defattr.xml.sax | 0 .../result/defattr.xml.sax2 | 0 .../result/defattr2.xml | 0 .../result/defattr2.xml.rde | 0 .../result/defattr2.xml.rdr | 0 .../result/defattr2.xml.sax | 0 .../result/defattr2.xml.sax2 | 0 .../result/dia1 | 0 .../result/dia1.rde | 0 .../result/dia1.rdr | 0 .../result/dia1.sax | 0 .../result/dia1.sax2 | 0 .../result/dia2 | 0 .../result/dia2.rde | 0 .../result/dia2.rdr | 0 .../result/dia2.sax | 0 .../result/dia2.sax2 | 0 .../result/dtd1 | 0 .../result/dtd1.rde | 0 .../result/dtd1.rdr | 0 .../result/dtd1.sax | 0 .../result/dtd1.sax2 | 0 .../result/dtd10 | 0 .../result/dtd10.rde | 0 .../result/dtd10.rdr | 0 .../result/dtd10.sax | 0 .../result/dtd10.sax2 | 0 .../result/dtd11 | 0 .../result/dtd11.rde | 0 .../result/dtd11.rdr | 0 .../result/dtd11.sax | 0 .../result/dtd11.sax2 | 0 .../result/dtd12 | 0 .../result/dtd12.rde | 0 .../result/dtd12.rdr | 0 .../result/dtd12.sax | 0 .../result/dtd12.sax2 | 0 .../result/dtd13 | 0 .../result/dtd13.rde | 0 .../result/dtd13.rdr | 0 .../result/dtd13.sax | 0 .../result/dtd13.sax2 | 0 .../result/dtd2 | 0 .../result/dtd2.rde | 0 .../result/dtd2.rdr | 0 .../result/dtd2.sax | 0 .../result/dtd2.sax2 | 0 .../result/dtd3 | 0 .../result/dtd3.rde | 0 .../result/dtd3.rdr | 0 .../result/dtd3.sax | 0 .../result/dtd3.sax2 | 0 .../result/dtd4 | 0 .../result/dtd4.rde | 0 .../result/dtd4.rdr | 0 .../result/dtd4.sax | 0 .../result/dtd4.sax2 | 0 .../result/dtd5 | 0 .../result/dtd5.rde | 0 .../result/dtd5.rdr | 0 .../result/dtd5.sax | 0 .../result/dtd5.sax2 | 0 .../result/dtd6 | 0 .../result/dtd6.rde | 0 .../result/dtd6.rdr | 0 .../result/dtd6.sax | 0 .../result/dtd6.sax2 | 0 .../result/dtd7 | 0 .../result/dtd7.rde | 0 .../result/dtd7.rdr | 0 .../result/dtd7.sax | 0 .../result/dtd7.sax2 | 0 .../result/dtd8 | 0 .../result/dtd8.rde | 0 .../result/dtd8.rdr | 0 .../result/dtd8.sax | 0 .../result/dtd8.sax2 | 0 .../result/dtd9 | 0 .../result/dtd9.rde | 0 .../result/dtd9.rdr | 0 .../result/dtd9.sax | 0 .../result/dtd9.sax2 | 0 .../result/ebcdic_566012.xml | 0 .../result/ebcdic_566012.xml.rde | 0 .../result/ebcdic_566012.xml.rdr | 0 .../result/ebcdic_566012.xml.sax | 0 .../result/ebcdic_566012.xml.sax2 | 0 .../result/emptycdata.xml | 0 .../result/emptycdata.xml.rde | 0 .../result/emptycdata.xml.rdr | 0 .../result/emptycdata.xml.sax | 0 .../result/emptycdata.xml.sax2 | 0 .../result/ent1 | 0 .../result/ent1.rde | 0 .../result/ent1.rdr | 0 .../result/ent1.sax | 0 .../result/ent1.sax2 | 0 .../result/ent10 | 0 .../result/ent10.rde | 0 .../result/ent10.rdr | 0 .../result/ent10.sax | 0 .../result/ent10.sax2 | 0 .../result/ent11 | 0 .../result/ent11.rde | 0 .../result/ent11.rdr | 0 .../result/ent11.sax | 0 .../result/ent11.sax2 | 0 .../result/ent12 | 0 .../result/ent12.rde | 0 .../result/ent12.rdr | 0 .../result/ent12.sax | 0 .../result/ent12.sax2 | 0 .../result/ent13 | 0 .../result/ent13.rde | 0 .../result/ent13.rdr | 0 .../result/ent13.sax | 0 .../result/ent13.sax2 | 0 .../result/ent2 | 0 .../result/ent2.rde | 0 .../result/ent2.rdr | 0 .../result/ent2.sax | 0 .../result/ent2.sax2 | 0 .../result/ent3 | 0 .../result/ent3.rde | 0 .../result/ent3.rdr | 0 .../result/ent3.sax | 0 .../result/ent3.sax2 | 0 .../result/ent4 | 0 .../result/ent4.rde | 0 .../result/ent4.rdr | 0 .../result/ent4.sax | 0 .../result/ent4.sax2 | 0 .../result/ent5 | 0 .../result/ent5.rde | 0 .../result/ent5.rdr | 0 .../result/ent5.sax | 0 .../result/ent5.sax2 | 0 .../result/ent6 | 0 .../result/ent6.rde | 0 .../result/ent6.rdr | 0 .../result/ent6.sax | 0 .../result/ent6.sax2 | 0 .../result/ent6hex | 0 .../result/ent6hex.rde | 0 .../result/ent6hex.rdr | 0 .../result/ent6hex.sax | 0 .../result/ent6hex.sax2 | 0 .../result/ent7 | 0 .../result/ent7.rde | 0 .../result/ent7.rdr | 0 .../result/ent7.sax | 0 .../result/ent7.sax2 | 0 .../result/ent8 | 0 .../result/ent8.rde | 0 .../result/ent8.rdr | 0 .../result/ent8.sax | 0 .../result/ent8.sax2 | 0 .../result/ent9 | 0 .../result/ent9.rde | 0 .../result/ent9.rdr | 0 .../result/ent9.sax | 0 .../result/ent9.sax2 | 0 .../result/ent_738805.xml | 0 .../result/ent_738805.xml.rde | 0 .../result/ent_738805.xml.rdr | 0 .../result/ent_738805.xml.sax | 0 .../result/ent_738805.xml.sax2 | 0 .../result/errors/754946.xml.ent | 0 .../result/errors/754946.xml.err | 0 .../result/errors/754946.xml.str | 0 .../result/errors/754947.xml.ent | 0 .../result/errors/754947.xml.err | 0 .../result/errors/754947.xml.str | 0 .../result/errors/758588.xml.ent | 0 .../result/errors/758588.xml.err | 0 .../result/errors/758588.xml.str | 0 .../result/errors/759020.xml.ent | 0 .../result/errors/759020.xml.err | 0 .../result/errors/759020.xml.str | 0 .../result/errors/759398.xml.ent | 0 .../result/errors/759398.xml.err | 0 .../result/errors/759398.xml.str | 0 .../result/errors/759573-2.xml.ent | 0 .../result/errors/759573-2.xml.err | 0 .../result/errors/759573-2.xml.str | 0 .../result/errors/759573.xml.ent | 0 .../result/errors/759573.xml.err | 0 .../result/errors/759573.xml.str | 0 .../result/errors/759579.xml.ent | 0 .../result/errors/759579.xml.err | 0 .../result/errors/759579.xml.str | 0 .../result/errors/attr1.xml.ent | 0 .../result/errors/attr1.xml.err | 0 .../result/errors/attr1.xml.str | 0 .../result/errors/attr2.xml.ent | 0 .../result/errors/attr2.xml.err | 0 .../result/errors/attr2.xml.str | 0 .../result/errors/attr3.xml | 0 .../result/errors/attr3.xml.ent | 0 .../result/errors/attr3.xml.err | 0 .../result/errors/attr3.xml.str | 0 .../result/errors/attr4.xml.ent | 0 .../result/errors/attr4.xml.err | 0 .../result/errors/attr4.xml.str | 0 .../result/errors/cdata.xml.ent | 0 .../result/errors/cdata.xml.err | 0 .../result/errors/cdata.xml.str | 0 .../result/errors/charref1.xml.ent | 0 .../result/errors/charref1.xml.err | 0 .../result/errors/charref1.xml.str | 0 .../result/errors/comment1.xml.ent | 0 .../result/errors/comment1.xml.err | 0 .../result/errors/comment1.xml.str | 0 .../result/errors/content1.xml.ent | 0 .../result/errors/content1.xml.err | 0 .../result/errors/content1.xml.str | 0 .../result/errors/ent_redecl.xml} | 3 +- .../result/errors/ent_redecl.xml.ent | 1 + .../result/errors/ent_redecl.xml.err | 1 + .../result/errors/ent_redecl.xml.str | 1 + .../result/errors/extparsedent.xml | 0 .../result/errors/extparsedent.xml.ent | 0 .../result/errors/issue151.xml.ent | 6 + .../result/errors/issue151.xml.err | 6 + .../result/errors/issue151.xml.str | 4 + .../result/errors/name.xml.ent | 0 .../result/errors/name.xml.err | 0 .../result/errors/name.xml.str | 0 .../result/errors/name2.xml.ent | 0 .../result/errors/name2.xml.err | 0 .../result/errors/name2.xml.str | 0 .../result/errors/rec_ext_ent.xml | 0 .../result/errors/rec_ext_ent.xml.ent | 0 .../result/errors10/781205.xml.err | 0 .../result/errors10/781361.xml.err | 0 .../result/eve.xml | 0 .../result/eve.xml.rde | 0 .../result/eve.xml.rdr | 0 .../result/eve.xml.sax | 0 .../result/eve.xml.sax2 | 0 .../result/expr/base | 0 .../result/icu_parse_test.xml | 0 .../result/icu_parse_test.xml.rde | 0 .../result/icu_parse_test.xml.rdr | 0 .../result/icu_parse_test.xml.sax | 0 .../result/icu_parse_test.xml.sax2 | 0 .../result/intsubset.xml | 0 .../result/intsubset.xml.rde | 0 .../result/intsubset.xml.rdr | 0 .../result/intsubset.xml.sax | 0 .../result/intsubset.xml.sax2 | 0 .../result/intsubset2.xml | 0 .../result/intsubset2.xml.rde | 0 .../result/intsubset2.xml.rdr | 0 .../result/intsubset2.xml.sax | 0 .../result/intsubset2.xml.sax2 | 0 .../result/isolat1 | 0 .../result/isolat1.rde | 0 .../result/isolat1.rdr | 0 .../result/isolat1.sax | 0 .../result/isolat1.sax2 | 0 .../result/isolat2 | 0 .../result/isolat2.rde | 0 .../result/isolat2.rdr | 0 .../result/isolat2.sax | 0 .../result/isolat2.sax2 | 0 .../result/isolat3 | 0 .../result/isolat3.rde | 0 .../result/isolat3.rdr | 0 .../result/isolat3.sax | 0 .../result/isolat3.sax2 | 0 .../result/japancrlf.xml | 0 .../result/japancrlf.xml.rde | 0 .../result/japancrlf.xml.rdr | 0 .../result/japancrlf.xml.sax | 0 .../result/japancrlf.xml.sax2 | 0 .../result/namespaces/err_0.xml | 0 .../result/namespaces/err_1.xml | 0 .../result/namespaces/err_1.xml.err | 0 .../result/namespaces/err_10.xml.err | 0 .../result/namespaces/err_11.xml.err | 0 .../result/namespaces/err_2.xml | 0 .../result/namespaces/err_2.xml.err | 0 .../result/namespaces/err_3.xml | 0 .../result/namespaces/err_3.xml.err | 0 .../result/namespaces/err_4.xml | 0 .../result/namespaces/err_4.xml.err | 0 .../result/namespaces/err_5.xml | 0 .../result/namespaces/err_5.xml.err | 0 .../result/namespaces/err_6.xml | 0 .../result/namespaces/err_6.xml.err | 0 .../result/namespaces/err_7.xml | 0 .../result/namespaces/err_7.xml.err | 0 .../result/namespaces/err_8.xml | 0 .../result/namespaces/err_8.xml.err | 0 .../result/namespaces/err_9.xml | 0 .../result/namespaces/err_9.xml.err | 0 .../result/noent/att1 | 0 .../result/noent/att1.sax2 | 0 .../result/noent/att10 | 0 .../result/noent/att10.sax2 | 0 .../result/noent/att11 | 0 .../result/noent/att11.sax2 | 0 .../result/noent/att2 | 0 .../result/noent/att2.sax2 | 0 .../result/noent/att3 | 0 .../result/noent/att3.sax2 | 0 .../result/noent/att4 | 0 .../result/noent/att4.sax2 | 0 .../result/noent/att5 | 0 .../result/noent/att5.sax2 | 0 .../result/noent/att6 | 0 .../result/noent/att6.sax2 | 0 .../result/noent/att7 | 0 .../result/noent/att7.sax2 | 0 .../result/noent/att8 | 0 .../result/noent/att8.sax2 | 0 .../result/noent/att9 | 0 .../result/noent/att9.sax2 | 0 .../result/noent/attrib.xml | 0 .../result/noent/attrib.xml.sax2 | 0 .../result/noent/badcomment.xml | 0 .../result/noent/badcomment.xml.sax2 | 0 .../result/noent/bigentname.xml | 0 .../result/noent/bigentname.xml.sax2 | 0 .../result/noent/bigname.xml | 0 .../result/noent/bigname.xml.sax2 | 0 .../result/noent/bigname2.xml | 0 .../result/noent/bigname2.xml.sax2 | 0 .../result/noent/cdata | 0 .../result/noent/cdata-2-byte-UTF-8.xml | 0 .../result/noent/cdata-2-byte-UTF-8.xml.sax2 | 0 .../result/noent/cdata-3-byte-UTF-8.xml | 0 .../result/noent/cdata-3-byte-UTF-8.xml.sax2 | 0 .../result/noent/cdata-4-byte-UTF-8.xml | 0 .../result/noent/cdata-4-byte-UTF-8.xml.sax2 | 0 .../result/noent/cdata.sax2 | 0 .../result/noent/cdata2 | 0 .../result/noent/cdata2.sax2 | 0 .../result/noent/comment.xml | 0 .../result/noent/comment.xml.sax2 | 0 .../result/noent/comment2.xml | 0 .../result/noent/comment2.xml.sax2 | 0 .../result/noent/comment3.xml | 0 .../result/noent/comment3.xml.sax2 | 0 .../result/noent/comment4.xml | 0 .../result/noent/comment4.xml.sax2 | 0 .../result/noent/comment5.xml | 0 .../result/noent/comment5.xml.sax2 | 0 .../result/noent/comment6.xml | 0 .../result/noent/comment6.xml.sax2 | 0 .../result/noent/dav1 | 0 .../result/noent/dav1.sax2 | 0 .../result/noent/dav10 | 0 .../result/noent/dav10.sax2 | 0 .../result/noent/dav11 | 0 .../result/noent/dav11.sax2 | 0 .../result/noent/dav12 | 0 .../result/noent/dav12.sax2 | 0 .../result/noent/dav13 | 0 .../result/noent/dav13.sax2 | 0 .../result/noent/dav15 | 0 .../result/noent/dav15.sax2 | 0 .../result/noent/dav16 | 0 .../result/noent/dav16.sax2 | 0 .../result/noent/dav17 | 0 .../result/noent/dav17.sax2 | 0 .../result/noent/dav18 | 0 .../result/noent/dav18.sax2 | 0 .../result/noent/dav19 | 0 .../result/noent/dav19.sax2 | 0 .../result/noent/dav2 | 0 .../result/noent/dav2.sax2 | 0 .../result/noent/dav3 | 0 .../result/noent/dav3.sax2 | 0 .../result/noent/dav4 | 0 .../result/noent/dav4.sax2 | 0 .../result/noent/dav5 | 0 .../result/noent/dav5.sax2 | 0 .../result/noent/dav6 | 0 .../result/noent/dav6.sax2 | 0 .../result/noent/dav7 | 0 .../result/noent/dav7.sax2 | 0 .../result/noent/dav8 | 0 .../result/noent/dav8.sax2 | 0 .../result/noent/dav9 | 0 .../result/noent/dav9.sax2 | 0 .../result/noent/defattr.xml | 0 .../result/noent/defattr.xml.sax2 | 0 .../result/noent/defattr2.xml | 0 .../result/noent/defattr2.xml.sax2 | 0 .../result/noent/dia1 | 0 .../result/noent/dia1.sax2 | 0 .../result/noent/dia2 | 0 .../result/noent/dia2.sax2 | 0 .../result/noent/dtd1 | 0 .../result/noent/dtd1.sax2 | 0 .../result/noent/dtd10 | 0 .../result/noent/dtd10.sax2 | 0 .../result/noent/dtd11 | 0 .../result/noent/dtd11.sax2 | 0 .../result/noent/dtd12 | 0 .../result/noent/dtd12.sax2 | 0 .../result/noent/dtd13 | 0 .../result/noent/dtd13.sax2 | 0 .../result/noent/dtd2 | 0 .../result/noent/dtd2.sax2 | 0 .../result/noent/dtd3 | 0 .../result/noent/dtd3.sax2 | 0 .../result/noent/dtd4 | 0 .../result/noent/dtd4.sax2 | 0 .../result/noent/dtd5 | 0 .../result/noent/dtd5.sax2 | 0 .../result/noent/dtd6 | 0 .../result/noent/dtd6.sax2 | 0 .../result/noent/dtd7 | 0 .../result/noent/dtd7.sax2 | 0 .../result/noent/dtd8 | 0 .../result/noent/dtd8.sax2 | 0 .../result/noent/dtd9 | 0 .../result/noent/dtd9.sax2 | 0 .../result/noent/ebcdic_566012.xml | 0 .../result/noent/ebcdic_566012.xml.sax2 | 0 .../result/noent/emptycdata.xml | 0 .../result/noent/emptycdata.xml.sax2 | 0 .../result/noent/ent1 | 0 .../result/noent/ent1.sax2 | 0 .../result/noent/ent10 | 0 .../result/noent/ent10.sax2 | 0 .../result/noent/ent11 | 0 .../result/noent/ent11.sax2 | 0 .../result/noent/ent12 | 0 .../result/noent/ent12.sax2 | 0 .../result/noent/ent13 | 0 .../result/noent/ent13.sax2 | 0 .../result/noent/ent2 | 0 .../result/noent/ent2.sax2 | 0 .../result/noent/ent3 | 0 .../result/noent/ent3.sax2 | 0 .../result/noent/ent4 | 0 .../result/noent/ent4.sax2 | 0 .../result/noent/ent5 | 0 .../result/noent/ent5.sax2 | 0 .../result/noent/ent6 | 0 .../result/noent/ent6.sax2 | 0 .../result/noent/ent6hex | 0 .../result/noent/ent6hex.sax2 | 0 .../result/noent/ent7 | 0 .../result/noent/ent7.sax2 | 0 .../result/noent/ent8 | 0 .../result/noent/ent8.sax2 | 0 .../result/noent/ent9 | 0 .../result/noent/ent9.sax2 | 0 .../result/noent/ent_738805.xml | 0 .../result/noent/ent_738805.xml.sax2 | 0 .../result/noent/eve.xml | 0 .../result/noent/eve.xml.sax2 | 0 .../result/noent/icu_parse_test.xml | 0 .../result/noent/icu_parse_test.xml.sax2 | 0 .../result/noent/intsubset.xml | 0 .../result/noent/intsubset.xml.sax2 | 0 .../result/noent/intsubset2.xml | 0 .../result/noent/intsubset2.xml.sax2 | 0 .../result/noent/isolat1 | 0 .../result/noent/isolat1.sax2 | 0 .../result/noent/isolat2 | 0 .../result/noent/isolat2.sax2 | 0 .../result/noent/isolat3 | 0 .../result/noent/isolat3.sax2 | 0 .../result/noent/japancrlf.xml | 0 .../result/noent/japancrlf.xml.sax2 | 0 .../result/noent/ns | 0 .../result/noent/ns.sax2 | 0 .../result/noent/ns2 | 0 .../result/noent/ns2.sax2 | 0 .../result/noent/ns3 | 0 .../result/noent/ns3.sax2 | 0 .../result/noent/ns4 | 0 .../result/noent/ns4.sax2 | 0 .../result/noent/ns5 | 0 .../result/noent/ns5.sax2 | 0 .../result/noent/ns6 | 0 .../result/noent/ns6.sax2 | 0 .../result/noent/ns7 | 0 .../result/noent/ns7.sax2 | 0 .../result/noent/nsclean.xml | 0 .../result/noent/nsclean.xml.sax2 | 0 .../result/noent/p3p | 0 .../result/noent/p3p.sax2 | 0 .../result/noent/pi.xml | 0 .../result/noent/pi.xml.sax2 | 0 .../result/noent/pi2.xml | 0 .../result/noent/pi2.xml.sax2 | 0 .../result/noent/rdf1 | 0 .../result/noent/rdf1.sax2 | 0 .../result/noent/rdf2 | 0 .../result/noent/rdf2.sax2 | 0 .../result/noent/slashdot.rdf | 0 .../result/noent/slashdot.rdf.sax2 | 0 .../result/noent/slashdot.xml | 0 .../result/noent/slashdot.xml.sax2 | 0 .../result/noent/slashdot16.xml | Bin .../result/noent/slashdot16.xml.sax2 | 0 .../result/noent/svg1 | 0 .../result/noent/svg1.sax2 | 0 .../result/noent/svg2 | 0 .../result/noent/svg2.sax2 | 0 .../result/noent/svg3 | 0 .../result/noent/svg3.sax2 | 0 .../noent/text-4-byte-UTF-16-BE-offset.xml | Bin 0 -> 4244 bytes .../text-4-byte-UTF-16-BE-offset.xml.sax2 | 21 + .../result/noent/text-4-byte-UTF-16-BE.xml | Bin 0 -> 4238 bytes .../noent/text-4-byte-UTF-16-BE.xml.sax2 | 21 + .../noent/text-4-byte-UTF-16-LE-offset.xml | Bin 0 -> 4244 bytes .../text-4-byte-UTF-16-LE-offset.xml.sax2 | 21 + .../result/noent/text-4-byte-UTF-16-LE.xml | Bin 0 -> 4238 bytes .../noent/text-4-byte-UTF-16-LE.xml.sax2 | 21 + .../result/noent/title.xml | 0 .../result/noent/title.xml.sax2 | 0 .../result/noent/tstblanks.xml | 0 .../result/noent/tstblanks.xml.sax2 | 0 .../result/noent/utf16bebom.xml | Bin .../result/noent/utf16bebom.xml.sax2 | 0 .../result/noent/utf16bom.xml | Bin .../result/noent/utf16bom.xml.sax2 | 0 .../result/noent/utf16lebom.xml | Bin .../result/noent/utf16lebom.xml.sax2 | 0 .../result/noent/utf8bom.xml | 0 .../result/noent/utf8bom.xml.sax2 | 0 .../result/noent/wap.xml | 0 .../result/noent/wap.xml.sax2 | 0 .../result/noent/winblanks.xml | 0 .../result/noent/winblanks.xml.sax2 | 0 .../result/noent/wml.xml | 0 .../result/noent/wml.xml.sax2 | 0 .../result/noent/xhtml1 | 0 .../result/noent/xhtml1.sax2 | 0 .../result/noent/xhtmlcomp | 0 .../result/noent/xhtmlcomp.sax2 | 0 .../result/noent/xml1 | 0 .../result/noent/xml1.sax2 | 0 .../result/noent/xml2 | 0 .../result/noent/xml2.sax2 | 0 .../result/ns | 0 .../result/ns.rde | 0 .../result/ns.rdr | 0 .../result/ns.sax | 0 .../result/ns.sax2 | 0 .../result/ns2 | 0 .../result/ns2.rde | 0 .../result/ns2.rdr | 0 .../result/ns2.sax | 0 .../result/ns2.sax2 | 0 .../result/ns3 | 0 .../result/ns3.rde | 0 .../result/ns3.rdr | 0 .../result/ns3.sax | 0 .../result/ns3.sax2 | 0 .../result/ns4 | 0 .../result/ns4.rde | 0 .../result/ns4.rdr | 0 .../result/ns4.sax | 0 .../result/ns4.sax2 | 0 .../result/ns5 | 0 .../result/ns5.rde | 0 .../result/ns5.rdr | 0 .../result/ns5.sax | 0 .../result/ns5.sax2 | 0 .../result/ns6 | 0 .../result/ns6.rde | 0 .../result/ns6.rdr | 0 .../result/ns6.sax | 0 .../result/ns6.sax2 | 0 .../result/ns7 | 0 .../result/ns7.rde | 0 .../result/ns7.rdr | 0 .../result/ns7.sax | 0 .../result/ns7.sax2 | 0 .../result/nsclean.xml | 0 .../result/nsclean.xml.rde | 0 .../result/nsclean.xml.rdr | 0 .../result/nsclean.xml.sax | 0 .../result/nsclean.xml.sax2 | 0 .../result/p3p | 0 .../result/p3p.rde | 0 .../result/p3p.rdr | 0 .../result/p3p.sax | 0 .../result/p3p.sax2 | 0 .../result/pattern/conj | 0 .../result/pattern/multiple | 0 .../result/pattern/namespaces | 0 .../result/pattern/simple | 0 .../result/pi.xml | 0 .../result/pi.xml.rde | 0 .../result/pi.xml.rdr | 0 .../result/pi.xml.sax | 0 .../result/pi.xml.sax2 | 0 .../result/pi2.xml | 0 .../result/pi2.xml.rde | 0 .../result/pi2.xml.rdr | 0 .../result/pi2.xml.sax | 0 .../result/pi2.xml.sax2 | 0 .../result/rdf1 | 0 .../result/rdf1.rde | 0 .../result/rdf1.rdr | 0 .../result/rdf1.sax | 0 .../result/rdf1.sax2 | 0 .../result/rdf2 | 0 .../result/rdf2.rde | 0 .../result/rdf2.rdr | 0 .../result/rdf2.sax | 0 .../result/rdf2.sax2 | 0 .../result/regexp/branch | 0 .../result/regexp/bug316338 | 0 .../result/regexp/bug420596 | 0 .../result/regexp/bug649244 | 0 .../result/regexp/bug757711 | 0 .../result/regexp/bug757711.err | 0 .../result/regexp/bug783015 | 0 .../result/regexp/bug783015.err | 0 .../result/regexp/content | 0 .../result/regexp/hard | 0 .../libxml2-v2.10.x/result/regexp/issue301 | 4 + .../libxml2-v2.10.x/result/regexp/issue370 | 3 + .../libxml2-v2.10.x/result/regexp/issue65 | 2 + .../result/regexp/ncname | 0 .../result/regexp/ranges | 0 .../result/regexp/ranges2 | 0 .../result/regexp/xpath | 0 .../result/relaxng/302836_0.err | 0 .../result/relaxng/307377_0.err | 0 .../result/relaxng/307377_1.err | 0 .../result/relaxng/307377_2.err | 0 .../result/relaxng/492317_0.err | 0 .../result/relaxng/492317_1.err | 0 .../result/relaxng/492317_2.err | 0 .../result/relaxng/558452_0.err | 0 .../result/relaxng/558452_1.err | 0 .../result/relaxng/558452_2.err | 0 .../result/relaxng/558452_3.err | 0 .../result/relaxng/558452_4.err | 0 .../result/relaxng/565219_0.err | 0 .../result/relaxng/565219_1.err | 0 .../result/relaxng/565219_2.err | 0 .../result/relaxng/595792_0.err | 0 .../result/relaxng/710744_1.err | 0 .../result/relaxng/710744_2.err | 0 .../result/relaxng/OpenDocumentSub_0.err | 0 .../result/relaxng/anyName0_0.err | 0 .../result/relaxng/choice0_0.err | 0 .../result/relaxng/choice0_1.err | 0 .../result/relaxng/choice0_2.err | 0 .../result/relaxng/choice0_3.err | 0 .../result/relaxng/choice0_4.err | 0 .../result/relaxng/choice0_5.err | 0 .../result/relaxng/choice0_6.err | 0 .../result/relaxng/choice0_7.err | 0 .../result/relaxng/choice0_8.err | 0 .../result/relaxng/compare0_0.err | 0 .../result/relaxng/comps_0.err | 0 .../result/relaxng/docbook_0.err | 0 .../result/relaxng/empty0_0.err | 0 .../result/relaxng/empty1_0.err | 0 .../result/relaxng/empty1_1.err | 0 .../result/relaxng/include0_0.err | 0 .../result/relaxng/include1_0.err | 0 .../result/relaxng/libvirt_0.err | 0 .../result/relaxng/list_0.err | 0 .../result/relaxng/list_1.err | 0 .../result/relaxng/pattern3_1.err | 0 .../result/relaxng/spec1_1.err | 0 .../result/relaxng/spec_0.err | 0 .../result/relaxng/tutor10_10_1.err | 0 .../result/relaxng/tutor10_1_1.err | 0 .../result/relaxng/tutor10_1_2.err | 0 .../result/relaxng/tutor10_1_3.err | 0 .../result/relaxng/tutor10_1_4.err | 0 .../result/relaxng/tutor10_1_5.err | 0 .../result/relaxng/tutor10_1_6.err | 0 .../result/relaxng/tutor10_2_1.err | 0 .../result/relaxng/tutor10_2_2.err | 0 .../result/relaxng/tutor10_2_3.err | 0 .../result/relaxng/tutor10_2_4.err | 0 .../result/relaxng/tutor10_3_1.err | 0 .../result/relaxng/tutor10_4_1.err | 0 .../result/relaxng/tutor10_5_1.err | 0 .../result/relaxng/tutor10_6_1.err | 0 .../result/relaxng/tutor10_7_1.err | 0 .../result/relaxng/tutor10_7_2.err | 0 .../result/relaxng/tutor10_7_3.err | 0 .../result/relaxng/tutor10_8_1.err | 0 .../result/relaxng/tutor10_8_2.err | 0 .../result/relaxng/tutor10_8_3.err | 0 .../result/relaxng/tutor10_9_1.err | 0 .../result/relaxng/tutor11_1_1.err | 0 .../result/relaxng/tutor11_1_2.err | 0 .../result/relaxng/tutor11_1_3.err | 0 .../result/relaxng/tutor11_2_1.err | 0 .../result/relaxng/tutor11_2_2.err | 0 .../result/relaxng/tutor11_2_3.err | 0 .../result/relaxng/tutor11_3_1.err | 0 .../result/relaxng/tutor11_4_1.err | 0 .../result/relaxng/tutor12_1_1.err | 0 .../result/relaxng/tutor13_1_1.err | 0 .../result/relaxng/tutor1_1_1.err | 0 .../result/relaxng/tutor1_2_1.err | 0 .../result/relaxng/tutor1_3_1.err | 0 .../result/relaxng/tutor1_4_1.err | 0 .../result/relaxng/tutor2_1_1.err | 0 .../result/relaxng/tutor3_1_1.err | 0 .../result/relaxng/tutor3_1_2.err | 0 .../result/relaxng/tutor3_2_1.err | 0 .../result/relaxng/tutor3_3_1.err | 0 .../result/relaxng/tutor3_4_1.err | 0 .../result/relaxng/tutor3_5_1.err | 0 .../result/relaxng/tutor3_5_2.err | 0 .../result/relaxng/tutor3_6_1.err | 0 .../result/relaxng/tutor3_7_1.err | 0 .../result/relaxng/tutor3_8_1.err | 0 .../result/relaxng/tutor3_9_1.err | 0 .../result/relaxng/tutor4_1_1.err | 0 .../result/relaxng/tutor4_2_1.err | 0 .../result/relaxng/tutor4_3_1.err | 0 .../result/relaxng/tutor4_3_2.err | 0 .../result/relaxng/tutor4_3_3.err | 0 .../result/relaxng/tutor4_3_4.err | 0 .../result/relaxng/tutor4_3_5.err | 0 .../result/relaxng/tutor4_3_6.err | 0 .../result/relaxng/tutor4_4_1.err | 0 .../result/relaxng/tutor5_1_1.err | 0 .../result/relaxng/tutor5_2_1.err | 0 .../result/relaxng/tutor5_3_1.err | 0 .../result/relaxng/tutor5_4_1.err | 0 .../result/relaxng/tutor6_1_1.err | 0 .../result/relaxng/tutor6_1_2.err | 0 .../result/relaxng/tutor6_1_3.err | 0 .../result/relaxng/tutor6_1_4.err | 0 .../result/relaxng/tutor6_1_5.err | 0 .../result/relaxng/tutor6_2_1.err | 0 .../result/relaxng/tutor6_2_2.err | 0 .../result/relaxng/tutor6_2_3.err | 0 .../result/relaxng/tutor6_2_4.err | 0 .../result/relaxng/tutor6_3_1.err | 0 .../result/relaxng/tutor7_1_1.err | 0 .../result/relaxng/tutor7_1_2.err | 0 .../result/relaxng/tutor7_1_3.err | 0 .../result/relaxng/tutor7_1_4.err | 0 .../result/relaxng/tutor7_2_1.err | 0 .../result/relaxng/tutor7_2_2.err | 0 .../result/relaxng/tutor7_2_3.err | 0 .../result/relaxng/tutor7_2_4.err | 0 .../result/relaxng/tutor7_3_1.err | 0 .../result/relaxng/tutor7_3_2.err | 0 .../result/relaxng/tutor7_3_3.err | 0 .../result/relaxng/tutor7_3_4.err | 0 .../result/relaxng/tutor7_3_5.err | 0 .../result/relaxng/tutor8_1_1.err | 0 .../result/relaxng/tutor8_1_2.err | 0 .../result/relaxng/tutor8_2_1.err | 0 .../result/relaxng/tutor8_2_2.err | 0 .../result/relaxng/tutor8_2_3.err | 0 .../result/relaxng/tutor8_2_4.err | 0 .../result/relaxng/tutor8_2_5.err | 0 .../result/relaxng/tutor8_2_6.err | 0 .../result/relaxng/tutor8_3_1.err | 0 .../result/relaxng/tutor9_10_1.err | 0 .../result/relaxng/tutor9_11_1.err | 0 .../result/relaxng/tutor9_12_1.err | 0 .../result/relaxng/tutor9_1_1.err | 0 .../result/relaxng/tutor9_2_1.err | 0 .../result/relaxng/tutor9_2_2.err | 0 .../result/relaxng/tutor9_3_1.err | 0 .../result/relaxng/tutor9_3_2.err | 0 .../result/relaxng/tutor9_4_1.err | 0 .../result/relaxng/tutor9_4_2.err | 0 .../result/relaxng/tutor9_5_1.err | 0 .../result/relaxng/tutor9_5_2.err | 0 .../result/relaxng/tutor9_5_3.err | 0 .../result/relaxng/tutor9_6_1.err | 0 .../result/relaxng/tutor9_6_2.err | 0 .../result/relaxng/tutor9_6_3.err | 0 .../result/relaxng/tutor9_7_1.err | 0 .../result/relaxng/tutor9_8_1.err | 0 .../result/relaxng/tutor9_9_1.err | 0 .../result/schemas/570702_0_0 | 0 .../result/schemas/579746_0_0 | 0 .../result/schemas/579746_0_1 | 0 .../result/schemas/579746_0_2 | 0 .../result/schemas/579746_0_3 | 0 .../result/schemas/579746_0_3.err | 0 .../result/schemas/579746_0_4 | 0 .../result/schemas/579746_0_5 | 0 .../result/schemas/579746_0_5.err | 0 .../result/schemas/579746_1_0 | 0 .../result/schemas/579746_1_1 | 0 .../result/schemas/579746_1_2 | 0 .../result/schemas/579746_1_3 | 0 .../result/schemas/579746_1_3.err | 0 .../result/schemas/579746_1_4 | 0 .../result/schemas/579746_1_5 | 0 .../result/schemas/579746_1_5.err | 0 .../result/schemas/582887_0_0 | 0 .../result/schemas/582906-1_0_0 | 0 .../result/schemas/582906-2_0_0.err | 0 .../result/schemas/all1_0_0 | 0 .../result/schemas/all_0_0 | 0 .../result/schemas/all_0_1 | 0 .../result/schemas/all_0_2 | 0 .../result/schemas/all_0_3 | 0 .../result/schemas/all_0_3.err | 0 .../result/schemas/all_0_4 | 0 .../result/schemas/all_0_4.err | 0 .../result/schemas/all_0_5 | 0 .../result/schemas/all_0_5.err | 0 .../result/schemas/all_0_6 | 0 .../result/schemas/all_0_6.err | 0 .../result/schemas/all_0_7 | 0 .../result/schemas/all_0_7.err | 0 .../result/schemas/all_1_0 | 0 .../result/schemas/all_1_1 | 0 .../result/schemas/all_1_2 | 0 .../result/schemas/all_1_3 | 0 .../result/schemas/all_1_3.err | 0 .../result/schemas/all_1_4 | 0 .../result/schemas/all_1_5 | 0 .../result/schemas/all_1_5.err | 0 .../result/schemas/all_1_6 | 0 .../result/schemas/all_1_6.err | 0 .../result/schemas/all_1_7 | 0 .../result/schemas/all_1_7.err | 0 .../result/schemas/all_2_0 | 0 .../result/schemas/all_2_0.err | 0 .../result/schemas/all_2_1 | 0 .../result/schemas/all_2_1.err | 0 .../result/schemas/all_2_2 | 0 .../result/schemas/all_2_2.err | 0 .../result/schemas/all_2_3 | 0 .../result/schemas/all_2_4 | 0 .../result/schemas/all_2_4.err | 0 .../result/schemas/all_2_5 | 0 .../result/schemas/all_2_5.err | 0 .../result/schemas/all_2_6 | 0 .../result/schemas/all_2_7 | 0 .../result/schemas/allsg_0_0 | 0 .../result/schemas/allsg_0_1 | 0 .../result/schemas/allsg_0_2 | 0 .../result/schemas/allsg_0_3 | 0 .../result/schemas/allsg_0_3.err | 0 .../result/schemas/allsg_0_4 | 0 .../result/schemas/allsg_0_4.err | 0 .../result/schemas/allsg_0_5 | 0 .../result/schemas/allsg_0_5.err | 0 .../result/schemas/annot-err_0_0.err | 0 .../result/schemas/any1_0_0 | 0 .../result/schemas/any2_0_0 | 0 .../result/schemas/any3_0_0 | 0 .../result/schemas/any3_0_0.err | 0 .../result/schemas/any4_0_0.err | 0 .../result/schemas/any5_0_0 | 0 .../result/schemas/any5_0_0.err | 0 .../result/schemas/any5_0_1 | 0 .../result/schemas/any5_0_1.err | 0 .../result/schemas/any5_0_2 | 0 .../result/schemas/any5_0_2.err | 0 .../result/schemas/any5_0_3 | 0 .../result/schemas/any5_0_4 | 0 .../result/schemas/any5_0_4.err | 0 .../result/schemas/any5_0_5 | 0 .../result/schemas/any5_0_5.err | 0 .../result/schemas/any5_0_6 | 0 .../result/schemas/any5_0_6.err | 0 .../result/schemas/any5_1_0 | 0 .../result/schemas/any5_1_0.err | 0 .../result/schemas/any5_1_1 | 0 .../result/schemas/any5_1_1.err | 0 .../result/schemas/any5_1_2 | 0 .../result/schemas/any5_1_3 | 0 .../result/schemas/any5_1_3.err | 0 .../result/schemas/any5_1_4 | 0 .../result/schemas/any5_1_4.err | 0 .../result/schemas/any5_1_5 | 0 .../result/schemas/any5_1_6 | 0 .../result/schemas/any5_1_6.err | 0 .../result/schemas/any6_1_0 | 0 .../result/schemas/any6_2_0 | 0 .../result/schemas/any7_1_0 | 0 .../result/schemas/any7_1_0.err | 0 .../result/schemas/any7_1_1 | 0 .../result/schemas/any7_1_1.err | 0 .../result/schemas/any7_1_2 | 0 .../result/schemas/any7_2_0 | 0 .../result/schemas/any7_2_0.err | 0 .../result/schemas/any7_2_1 | 0 .../result/schemas/any7_2_1.err | 0 .../result/schemas/any7_2_2 | 0 .../result/schemas/any8_1_0 | 0 .../result/schemas/anyAttr-derive-errors1_0_0 | 0 .../result/schemas/anyAttr-derive1_0_0 | 0 .../result/schemas/anyAttr-derive2_0_0 | 0 .../schemas/anyAttr-processContents-err1_0_0 | 0 .../anyAttr-processContents-err1_0_0.err | 0 .../schemas/anyAttr-processContents1_0_0 | 0 .../result/schemas/anyAttr1_0_0 | 0 .../result/schemas/attr0_0_0 | 0 .../result/schemas/attruse_0_0 | 0 .../result/schemas/attruse_0_1 | 0 .../result/schemas/attruse_0_1.err | 0 .../result/schemas/attruse_0_2 | 0 .../result/schemas/attruse_0_2.err | 0 .../result/schemas/bug141312_0_0 | 0 .../result/schemas/bug141333_0_0 | 0 .../result/schemas/bug143951_0_0 | 0 .../result/schemas/bug145246_0_0 | 0 .../result/schemas/bug152470_1_1 | 0 .../result/schemas/bug167754_0_0 | 0 .../result/schemas/bug303566_1_1 | 0 .../result/schemas/bug303566_1_1.err | 0 .../result/schemas/bug306806_1_0 | 0 .../result/schemas/bug309338_1_0 | 0 .../result/schemas/bug310264_0_0 | 0 .../result/schemas/bug312957_1_0 | 0 .../result/schemas/bug312957_1_0.err | 0 .../result/schemas/bug313982_0_0 | 0 .../result/schemas/bug321475_1_0 | 0 .../result/schemas/bug322411_1_0 | 0 .../result/schemas/bug323510_1_0 | 0 .../result/schemas/bug323510_1_0.err | 0 .../result/schemas/bug455953_0_0 | 0 .../result/schemas/changelog093_1_0 | 0 .../result/schemas/changelog093_1_0.err | 0 .../result/schemas/choice_0_0 | 0 .../result/schemas/choice_0_1 | 0 .../result/schemas/choice_0_2 | 0 .../result/schemas/choice_0_2.err | 0 .../result/schemas/choice_0_3 | 0 .../result/schemas/choice_0_3.err | 0 .../result/schemas/choice_0_4 | 0 .../result/schemas/choice_0_4.err | 0 .../result/schemas/choice_0_5 | 0 .../result/schemas/choice_0_5.err | 0 .../result/schemas/choice_0_6 | 0 .../result/schemas/choice_0_6.err | 0 .../result/schemas/choice_1_0 | 0 .../result/schemas/choice_1_1 | 0 .../result/schemas/choice_1_2 | 0 .../result/schemas/choice_1_2.err | 0 .../result/schemas/choice_1_3 | 0 .../result/schemas/choice_1_3.err | 0 .../result/schemas/choice_1_4 | 0 .../result/schemas/choice_1_5 | 0 .../result/schemas/choice_1_5.err | 0 .../result/schemas/choice_1_6 | 0 .../result/schemas/choice_1_6.err | 0 .../result/schemas/choice_2_0 | 0 .../result/schemas/choice_2_1 | 0 .../result/schemas/choice_2_2 | 0 .../result/schemas/choice_2_3 | 0 .../result/schemas/choice_2_4 | 0 .../result/schemas/choice_2_4.err | 0 .../result/schemas/choice_2_5 | 0 .../result/schemas/choice_2_6 | 0 .../result/schemas/choice_2_6.err | 0 .../result/schemas/complex-type-extension_0_0 | 0 .../result/schemas/cos-ct-extends-1-3_0_0 | 0 .../schemas/cos-st-restricts-1-2-err_0_0 | 0 .../schemas/cos-st-restricts-1-2-err_0_0.err | 0 .../result/schemas/ct-sc-nobase_0_0 | 0 .../result/schemas/date_0_0 | 0 .../result/schemas/decimal-1_1_0 | 0 .../result/schemas/decimal-1_1_0.err | 0 .../result/schemas/decimal-2_1_0 | 0 .../result/schemas/decimal-2_1_0.err | 0 .../result/schemas/decimal-3_1_0 | 0 .../result/schemas/decimal-3_1_0.err | 0 .../derivation-ok-extension-err_0_0.err | 0 .../schemas/derivation-ok-extension_0_0 | 0 .../schemas/derivation-ok-extension_0_0.err | 0 .../derivation-ok-restriction-2-1-1_0_0.err | 0 .../derivation-ok-restriction-4-1-err_0_0.err | 0 .../derivation-restriction-anyAttr_0_0 | 0 .../result/schemas/deter0_0_0.err | 0 .../result/schemas/dur_0_0 | 0 .../result/schemas/elem0_0_0 | 0 .../result/schemas/element-err_0_0.err | 0 .../result/schemas/element-minmax-err_0_0.err | 0 .../result/schemas/empty-value_1_0 | 0 .../result/schemas/empty-value_1_1 | 0 .../result/schemas/empty_0_0 | 0 .../result/schemas/empty_1_0 | 0 .../result/schemas/extension0_0_0 | 0 .../result/schemas/extension1_0_0 | 0 .../result/schemas/extension1_0_1 | 0 .../result/schemas/extension1_0_1.err | 0 .../result/schemas/extension1_0_2 | 0 .../result/schemas/extension1_0_2.err | 0 .../result/schemas/extension2_1_0 | 0 .../result/schemas/facet-unionST-err1_0_0 | 0 .../result/schemas/facet-unionST-err1_0_0.err | 0 .../result/schemas/facet-whiteSpace_0_0 | 0 .../result/schemas/group0_0_0 | 0 .../result/schemas/hexbinary_0_0 | 0 .../result/schemas/hexbinary_0_1 | 0 .../result/schemas/hexbinary_0_1.err | 0 .../result/schemas/idc-keyref-err1_1_0 | 0 .../result/schemas/idc-keyref-err1_1_0.err | 0 .../result/schemas/import0_0_0 | 0 .../result/schemas/import1_0_0.err | 0 .../result/schemas/import2_0_0 | 0 .../result/schemas/include1_0_0 | 0 .../result/schemas/include2_0_0 | 0 .../result/schemas/include3_0_0.err | 0 .../result/schemas/issue303_0_0 | 1 + .../result/schemas/issue40_0_0 | 0 .../result/schemas/item_0_0 | 0 .../result/schemas/item_1_0 | 0 .../result/schemas/length1_0_0 | 0 .../result/schemas/length2_0_0 | 0 .../result/schemas/length3_0_0.err | 0 .../result/schemas/list0_0_0 | 0 .../result/schemas/list0_0_1 | 0 .../result/schemas/list0_0_1.err | 0 .../result/schemas/list0_0_2 | 0 .../result/schemas/list0_1_0 | 0 .../result/schemas/list0_1_0.err | 0 .../result/schemas/list0_1_1 | 0 .../result/schemas/list0_1_1.err | 0 .../result/schemas/list0_1_2 | 0 .../result/schemas/mixed0_0_0 | 0 .../result/schemas/mixed1_0_0 | 0 .../result/schemas/ns0_0_0 | 0 .../result/schemas/ns0_0_1 | 0 .../result/schemas/ns0_0_2 | 0 .../result/schemas/ns0_0_2.err | 0 .../result/schemas/ns0_0_3 | 0 .../result/schemas/ns0_0_3.err | 0 .../result/schemas/ns0_0_4 | 0 .../result/schemas/ns0_0_4.err | 0 .../result/schemas/ns0_1_0 | 0 .../result/schemas/ns0_1_0.err | 0 .../result/schemas/ns0_1_1 | 0 .../result/schemas/ns0_1_1.err | 0 .../result/schemas/ns0_1_2 | 0 .../result/schemas/ns0_1_2.err | 0 .../result/schemas/ns0_1_3 | 0 .../result/schemas/ns0_1_4 | 0 .../result/schemas/ns1_0_0 | 0 .../result/schemas/ns2_0_0 | 0 .../result/schemas/nvdcve_0_0 | 0 .../result/schemas/po0_0_0 | 0 .../result/schemas/po1_0_0 | 0 .../result/schemas/poschargrp0_0_0 | 0 .../result/schemas/regexp-char-ref_0_0 | 0 .../result/schemas/regexp-char-ref_1_0 | 0 .../result/schemas/restrict-CT-attr-ref_0_0 | 0 .../result/schemas/restriction-attr1_0_0.err | 0 .../result/schemas/restriction-enum-1_1_0 | 0 .../result/schemas/restriction-enum-1_1_0.err | 0 .../result/schemas/restriction0_0_0 | 0 .../result/schemas/scc-no-xmlns_0_0.err | 0 .../result/schemas/scc-no-xsi_0_0.err | 0 .../result/schemas/seq-dubl-elem1_0_0 | 0 .../result/schemas/seq0_0_0 | 0 .../result/schemas/src-attribute1_0_0.err | 0 .../result/schemas/src-attribute2_0_0.err | 0 .../result/schemas/src-attribute3-1_0_0.err | 0 .../schemas/src-attribute3-2-form_0_0.err | 0 .../schemas/src-attribute3-2-st_0_0.err | 0 .../schemas/src-attribute3-2-type_0_0.err | 0 .../result/schemas/src-attribute4_0_0.err | 0 .../result/schemas/src-element1_0_0.err | 0 .../result/schemas/src-element2-1_0_0.err | 0 .../result/schemas/src-element2-2_0_0.err | 0 .../result/schemas/src-element3_0_0.err | 0 .../result/schemas/subst-group-1_0_1 | 0 .../result/schemas/union2_1_1 | 0 .../result/schemas/union2_1_1.err | 0 .../result/schemas/union_0_0 | 0 .../result/schemas/vdv-first0_0_0 | 0 .../result/schemas/vdv-first1_0_0 | 0 .../result/schemas/vdv-first2_0_0 | 0 .../result/schemas/vdv-first3_0_0 | 0 .../result/schemas/vdv-first4_0_0 | 0 .../result/schemas/vdv-first4_0_1 | 0 .../result/schemas/vdv-first4_0_1.err | 0 .../result/schemas/vdv-first4_0_2 | 0 .../result/schemas/vdv-first4_0_2.err | 0 .../result/schemas/vdv-first5_0_0 | 0 .../result/schemas/xsd-list-itemType_0_0 | 0 .../schemas/xsd-simpleType-varieties_0_0 | 0 .../result/schematron/zvon10_0 | 0 .../result/schematron/zvon10_0.err | 0 .../result/schematron/zvon10_1 | 0 .../result/schematron/zvon10_1.err | 0 .../result/schematron/zvon11_0 | 0 .../result/schematron/zvon11_0.err | 0 .../result/schematron/zvon11_1 | 0 .../result/schematron/zvon11_1.err | 0 .../result/schematron/zvon11_2 | 0 .../result/schematron/zvon11_2.err | 0 .../result/schematron/zvon11_3 | 0 .../result/schematron/zvon11_3.err | 0 .../result/schematron/zvon12_0 | 0 .../result/schematron/zvon12_0.err | 0 .../result/schematron/zvon12_1 | 0 .../result/schematron/zvon12_1.err | 0 .../result/schematron/zvon12_2 | 0 .../result/schematron/zvon12_2.err | 0 .../result/schematron/zvon13_0 | 0 .../result/schematron/zvon13_0.err | 0 .../result/schematron/zvon13_1 | 0 .../result/schematron/zvon13_1.err | 0 .../result/schematron/zvon13_2 | 0 .../result/schematron/zvon13_2.err | 0 .../result/schematron/zvon14_0 | 0 .../result/schematron/zvon14_0.err | 0 .../result/schematron/zvon15_0 | 0 .../result/schematron/zvon15_0.err | 0 .../result/schematron/zvon1_0 | 0 .../result/schematron/zvon1_0.err | 0 .../result/schematron/zvon1_1 | 0 .../result/schematron/zvon1_1.err | 0 .../result/schematron/zvon2_0 | 0 .../result/schematron/zvon2_0.err | 0 .../result/schematron/zvon2_1 | 0 .../result/schematron/zvon2_1.err | 0 .../result/schematron/zvon2_2 | 0 .../result/schematron/zvon2_2.err | 0 .../result/schematron/zvon3_0 | 0 .../result/schematron/zvon3_0.err | 0 .../result/schematron/zvon4_0 | 0 .../result/schematron/zvon4_0.err | 0 .../result/schematron/zvon4_1 | 0 .../result/schematron/zvon4_1.err | 0 .../result/schematron/zvon5_0 | 0 .../result/schematron/zvon5_0.err | 0 .../result/schematron/zvon5_1 | 0 .../result/schematron/zvon5_1.err | 0 .../result/schematron/zvon5_2 | 0 .../result/schematron/zvon5_2.err | 0 .../result/schematron/zvon6_0 | 0 .../result/schematron/zvon6_0.err | 0 .../result/schematron/zvon6_1 | 0 .../result/schematron/zvon6_1.err | 0 .../result/schematron/zvon6_2 | 0 .../result/schematron/zvon6_2.err | 0 .../result/schematron/zvon7_0 | 0 .../result/schematron/zvon7_0.err | 0 .../result/schematron/zvon7_1 | 0 .../result/schematron/zvon7_1.err | 0 .../result/schematron/zvon7_2 | 0 .../result/schematron/zvon7_2.err | 0 .../result/schematron/zvon7_3 | 0 .../result/schematron/zvon7_3.err | 0 .../result/schematron/zvon7_4 | 0 .../result/schematron/zvon7_4.err | 0 .../result/schematron/zvon8_0 | 0 .../result/schematron/zvon8_0.err | 0 .../result/schematron/zvon8_1 | 0 .../result/schematron/zvon8_1.err | 0 .../result/schematron/zvon8_2 | 0 .../result/schematron/zvon8_2.err | 0 .../result/schematron/zvon9_0 | 0 .../result/schematron/zvon9_0.err | 0 .../result/schematron/zvon9_1 | 0 .../result/schematron/zvon9_1.err | 0 .../result/schematron/zvon9_2 | 0 .../result/schematron/zvon9_2.err | 0 .../result/scripts/base | 0 .../result/scripts/base2 | 0 .../result/scripts/set1 | 0 .../result/scripts/set3 | 0 .../result/scripts/set3.err | 0 .../result/scripts/set4 | 0 .../result/slashdot.rdf | 0 .../result/slashdot.rdf.rde | 0 .../result/slashdot.rdf.rdr | 0 .../result/slashdot.rdf.sax | 0 .../result/slashdot.rdf.sax2 | 0 .../result/slashdot.xml | 0 .../result/slashdot.xml.rde | 0 .../result/slashdot.xml.rdr | 0 .../result/slashdot.xml.sax | 0 .../result/slashdot.xml.sax2 | 0 .../result/slashdot16.xml | Bin .../result/slashdot16.xml.rde | 0 .../result/slashdot16.xml.rdr | 0 .../result/slashdot16.xml.sax | 0 .../result/slashdot16.xml.sax2 | 0 .../result/svg1 | 0 .../result/svg1.rde | 0 .../result/svg1.rdr | 0 .../result/svg1.sax | 0 .../result/svg1.sax2 | 0 .../result/svg2 | 0 .../result/svg2.rde | 0 .../result/svg2.rdr | 0 .../result/svg2.sax | 0 .../result/svg2.sax2 | 0 .../result/svg3 | 0 .../result/svg3.rde | 0 .../result/svg3.rdr | 0 .../result/svg3.sax | 0 .../result/svg3.sax2 | 0 .../result/text-4-byte-UTF-16-BE-offset.xml | Bin 0 -> 4244 bytes .../text-4-byte-UTF-16-BE-offset.xml.rde | 5 + .../text-4-byte-UTF-16-BE-offset.xml.rdr | 5 + .../text-4-byte-UTF-16-BE-offset.xml.sax | 21 + .../text-4-byte-UTF-16-BE-offset.xml.sax2 | 21 + .../result/text-4-byte-UTF-16-BE.xml | Bin 0 -> 4238 bytes .../result/text-4-byte-UTF-16-BE.xml.rde | 5 + .../result/text-4-byte-UTF-16-BE.xml.rdr | 5 + .../result/text-4-byte-UTF-16-BE.xml.sax | 21 + .../result/text-4-byte-UTF-16-BE.xml.sax2 | 21 + .../result/text-4-byte-UTF-16-LE-offset.xml | Bin 0 -> 4244 bytes .../text-4-byte-UTF-16-LE-offset.xml.rde | 5 + .../text-4-byte-UTF-16-LE-offset.xml.rdr | 5 + .../text-4-byte-UTF-16-LE-offset.xml.sax | 21 + .../text-4-byte-UTF-16-LE-offset.xml.sax2 | 21 + .../result/text-4-byte-UTF-16-LE.xml | Bin 0 -> 4238 bytes .../result/text-4-byte-UTF-16-LE.xml.rde | 5 + .../result/text-4-byte-UTF-16-LE.xml.rdr | 5 + .../result/text-4-byte-UTF-16-LE.xml.sax | 21 + .../result/text-4-byte-UTF-16-LE.xml.sax2 | 21 + .../result/title.xml | 0 .../result/title.xml.rde | 0 .../result/title.xml.rdr | 0 .../result/title.xml.sax | 0 .../result/title.xml.sax2 | 0 .../result/tstblanks.xml | 0 .../result/tstblanks.xml.rde | 0 .../result/tstblanks.xml.rdr | 0 .../result/tstblanks.xml.sax | 0 .../result/tstblanks.xml.sax2 | 0 .../result/utf16bebom.xml | Bin .../result/utf16bebom.xml.rde | 0 .../result/utf16bebom.xml.rdr | 0 .../result/utf16bebom.xml.sax | 0 .../result/utf16bebom.xml.sax2 | 0 .../result/utf16bom.xml | Bin .../result/utf16bom.xml.rde | 0 .../result/utf16bom.xml.rdr | 0 .../result/utf16bom.xml.sax | 0 .../result/utf16bom.xml.sax2 | 0 .../result/utf16lebom.xml | Bin .../result/utf16lebom.xml.rde | 0 .../result/utf16lebom.xml.rdr | 0 .../result/utf16lebom.xml.sax | 0 .../result/utf16lebom.xml.sax2 | 0 .../result/utf8bom.xml | 0 .../result/utf8bom.xml.rde | 0 .../result/utf8bom.xml.rdr | 0 .../result/utf8bom.xml.sax | 0 .../result/utf8bom.xml.sax2 | 0 .../result/valid/127772.xml | 0 .../result/valid/694228.xml | 0 .../result/valid/737840.xml | 0 .../result/valid/766956.xml.err | 0 .../result/valid/766956.xml.err.rdr | 0 .../result/valid/781333.xml | 0 .../result/valid/781333.xml.err | 0 .../result/valid/781333.xml.err.rdr | 0 .../result/valid/REC-xml-19980210.xml | 0 .../result/valid/UTF16Entity.xml | 0 .../result/valid/cond_sect1.xml | 0 .../result/valid/cond_sect2.xml.err | 0 .../result/valid/cond_sect2.xml.err.rdr | 0 .../result/valid/dia.xml | 0 .../result/valid/id1.xml | 0 .../result/valid/id2.xml | 0 .../result/valid/id3.xml | 0 .../result/valid/index.xml | 2 +- .../result/valid/mixed_ns.xml | 0 .../result/valid/notes.xml | 0 .../result/valid/ns.xml | 0 .../result/valid/ns2.xml | 0 .../result/valid/objednavka.xml | 0 .../libxml2-v2.10.x/result/valid/pe-test.xml | 3 + .../result/valid/rss.xml | 0 .../result/valid/rss.xml.err | 0 .../result/valid/rss.xml.err.rdr | 0 .../result/valid/t10.xml | 0 .../result/valid/t11.xml | 0 .../result/valid/t4.dtd.err | 0 .../result/valid/t4.xml | 0 .../result/valid/t4a.dtd.err | 0 .../result/valid/t4a.xml | 0 .../result/valid/t6.dtd.err | 0 .../result/valid/t6.xml | 0 .../result/valid/t8.xml.err | 0 .../result/valid/t8.xml.err.rdr | 0 .../result/valid/t8a.xml.err | 0 .../result/valid/t8a.xml.err.rdr | 0 .../result/valid/t9.xml | 0 .../result/valid/t9a.xml | 0 .../result/valid/xhtml1.xhtml | 0 .../result/valid/xlink.xml | 0 .../result/valid/xlink.xml.err | 0 .../result/valid/xlink.xml.err.rdr | 0 .../result/wap.xml | 0 .../result/wap.xml.rde | 0 .../result/wap.xml.rdr | 0 .../result/wap.xml.sax | 0 .../result/wap.xml.sax2 | 0 .../result/winblanks.xml | 0 .../result/winblanks.xml.rde | 0 .../result/winblanks.xml.rdr | 0 .../result/winblanks.xml.sax | 0 .../result/winblanks.xml.sax2 | 0 .../result/wml.xml | 0 .../result/wml.xml.rde | 0 .../result/wml.xml.rdr | 0 .../result/wml.xml.sax | 0 .../result/wml.xml.sax2 | 0 .../result/xhtml1 | 0 .../result/xhtml1.rde | 0 .../result/xhtml1.rdr | 0 .../result/xhtml1.sax | 0 .../result/xhtml1.sax2 | 0 .../result/xhtmlcomp | 0 .../result/xhtmlcomp.rde | 0 .../result/xhtmlcomp.rdr | 0 .../result/xhtmlcomp.sax | 0 .../result/xhtmlcomp.sax2 | 0 .../result/xml1 | 0 .../result/xml1.rde | 0 .../result/xml1.rdr | 0 .../result/xml1.sax | 0 .../result/xml1.sax2 | 0 .../result/xml2 | 0 .../result/xml2.rde | 0 .../result/xml2.rdr | 0 .../result/xml2.sax | 0 .../result/xml2.sax2 | 0 .../result/xmlid/id_err1.xml | 0 .../result/xmlid/id_err1.xml.err | 0 .../result/xmlid/id_err2.xml | 0 .../result/xmlid/id_err2.xml.err | 0 .../result/xmlid/id_tst1.xml | 0 .../result/xmlid/id_tst2.xml | 0 .../result/xmlid/id_tst2.xml.err | 0 .../result/xmlid/id_tst3.xml | 0 .../result/xmlid/id_tst3.xml.err | 0 .../result/xmlid/id_tst4.xml | 0 .../result/xmlid/id_tst4.xml.err | 0 .../rngparser.c | 2 - .../runsuite.c | 7 +- .../runtest.c | 381 +- .../runxmlconf.c | 6 +- .../save.h | 0 .../schematron.c | 1325 +- .../test/HTML/53867.html | 0 .../test/HTML/758518-entity.html | 0 .../test/HTML/758518-tag.html | 0 .../test/HTML/758605.html | 0 .../test/HTML/758606.html | 0 .../test/HTML/758606_2.html | 0 .../test/HTML/Down.html | 0 .../test/HTML/attrents.html | 0 .../test/HTML/autoclose.html | 0 .../test/HTML/autoclose2.html | 0 .../test/HTML/autoclose3.html | 0 .../test/HTML/cf_128.html | 0 .../test/HTML/chunked_attr.html | 0 .../test/HTML/comments.html | 0 .../test/HTML/comments2.html | 0 .../libxml2-v2.10.x/test/HTML/comments3.html | 17 + .../test/HTML/doc2.htm | 0 .../test/HTML/doc3.htm | 0 .../test/HTML/entities.html | 0 .../test/HTML/entities2.html | 0 .../test/HTML/fp40.htm | 0 .../test/HTML/html5_enc.html | 0 .../libxml2-v2.10.x/test/HTML/issue318.html | 6 + .../libxml2-v2.10.x/test/HTML/issue380.html | 5 + .../test/HTML/liclose.html | 0 .../test/HTML/lt.html | 0 .../test/HTML/noscript.html | 0 .../test/HTML/pre.html | 0 .../test/HTML/python.html | 0 .../test/HTML/reg1.html | 0 .../test/HTML/reg2.html | 0 .../test/HTML/reg3.html | 0 .../test/HTML/reg4.html | 0 .../test/HTML/repeat.html | 0 .../test/HTML/script.html | 0 .../test/HTML/script2.html | 0 .../test/HTML/test2.html | 0 .../test/HTML/test3.html | 0 .../test/HTML/utf8bug.html | 0 .../test/HTML/wired.html | 0 .../test/SVG/4rects.xml | 0 .../test/SVG/a-valid.xml | 0 .../test/SVG/a-wf.xml | 0 .../test/SVG/bike.xml | 0 .../test/SVG/circle.xml | 0 .../test/SVG/defs.xml | 0 .../test/SVG/desc.xml | 0 .../test/SVG/ellipse.xml | 0 .../test/SVG/flower2.xml | 0 .../test/SVG/gradient.xml | 0 .../test/SVG/group01.xml | 0 .../test/SVG/group02.xml | 0 .../test/SVG/group03.xml | 0 .../test/SVG/image-valid.xml | 0 .../test/SVG/image-wf.xml | 0 .../test/SVG/lin-gradient.xml | 0 .../test/SVG/marker.xml | 0 .../test/SVG/mask.xml | 0 .../test/SVG/mathswitch.xml | 0 .../test/SVG/parentns.xml | 0 .../test/SVG/path01.xml | 0 .../test/SVG/path02.xml | 0 .../test/SVG/patternfill.xml | 0 .../test/SVG/polyline.xml | 0 .../test/SVG/private.xml | 0 .../test/SVG/rad-gradient.xml | 0 .../test/SVG/rectangle.xml | 0 .../test/SVG/richdesc.xml | 0 .../test/SVG/script.xml | 0 .../test/SVG/structure01.xml | 0 .../test/SVG/style.xml | 0 .../test/SVG/switch.xml | 0 .../test/SVG/symbol-use.xml | 0 .../test/SVG/template.xml | 0 .../test/SVG/text01.xml | 0 .../test/SVG/text02.xml | 0 .../test/SVG/text03.xml | 0 .../test/SVG/toap01.xml | 0 .../test/SVG/toap02.xml | 0 .../test/SVG/transform.xml | 0 .../test/SVG/trivial.xml | 0 .../test/SVG/twin-gradients.xml | 0 .../test/SVG/v-template.xml | 0 .../test/SVG/viewport-nest.xml | 0 .../test/SVG/viewport-transform.xml | 0 .../test/SVG/viewport.xml | 0 .../test/SVG/wf-template.xml | 0 .../test/URI/smith.uri | 0 .../test/URI/uri.data | 0 .../test/VC/AttributeDefaultLegal | 0 .../test/VC/AttributeNmtokens | 0 .../test/VC/DuplicateType | 0 .../test/VC/ElementValid | 0 .../test/VC/ElementValid2 | 0 .../test/VC/ElementValid3 | 0 .../test/VC/ElementValid4 | 0 .../test/VC/ElementValid5 | 0 .../test/VC/ElementValid6 | 0 .../test/VC/ElementValid7 | 0 .../test/VC/ElementValid8 | 0 .../test/VC/Enumeration | 0 .../test/VC/NS1 | 0 .../test/VC/NS2 | 0 .../test/VC/NS3 | 0 .../test/VC/OneID | 0 .../test/VC/OneID2 | 0 .../test/VC/OneID3 | 0 .../test/VC/PENesting | 0 .../test/VC/PENesting2 | 0 .../test/VC/UniqueElementTypeDeclaration | 0 .../test/VC/UniqueElementTypeDeclaration2 | 0 .../test/VC/dtds/a.dtd | 0 .../test/VC/dtds/doc.dtd | 0 .../test/VCM/21.xml | 0 .../test/VCM/AttributeNmtokens.xml | 0 .../test/VCM/v1.xml | 0 .../test/VCM/v10.xml | 0 .../test/VCM/v11.xml | 0 .../test/VCM/v12.xml | 0 .../test/VCM/v13.xml | 0 .../test/VCM/v14.xml | 0 .../test/VCM/v15.xml | 0 .../test/VCM/v16.xml | 0 .../test/VCM/v17.xml | 0 .../test/VCM/v18.xml | 0 .../test/VCM/v19.xml | 0 .../test/VCM/v2.xml | 0 .../test/VCM/v20.xml | 0 .../test/VCM/v21.xml | 0 .../test/VCM/v22.xml | 0 .../test/VCM/v23.xml | 0 .../test/VCM/v24.xml | 0 .../test/VCM/v3.xml | 0 .../test/VCM/v4.xml | 0 .../test/VCM/v5.xml | 0 .../test/VCM/v6.xml | 0 .../test/VCM/v7.xml | 0 .../test/VCM/v8.xml | 0 .../test/VCM/v9.xml | 0 .../test/WFC/ElemTypeMatch | 0 .../test/WFC/EntityDeclared | 0 .../test/WFC/EntityDeclared2 | 0 .../test/WFC/EntityDeclared3 | 0 .../test/WFC/EntityDeclared4 | 0 .../test/WFC/EntityDeclared5 | 0 .../test/WFC/LegalCharacter | 0 .../test/WFC/NoExternalEntityRef | 0 .../test/WFC/NoLtInAttValue | 0 .../test/WFC/NoRecursion | 0 .../test/WFC/PEintsubset | 0 .../test/WFC/UniqueAttSpec | 0 .../test/WFC/UniqueAttSpec2 | 0 .../test/XInclude/docs/coalesce.xml | 4 + .../test/XInclude/docs/docids.xml | 0 .../test/XInclude/docs/fallback.xml | 0 .../test/XInclude/docs/fallback2.xml | 0 .../test/XInclude/docs/fallback3.xml | 0 .../test/XInclude/docs/fallback4.xml | 0 .../test/XInclude/docs/fallback5.xml | 0 .../test/XInclude/docs/fallback6.xml | 0 .../test/XInclude/docs/include.xml | 0 .../test/XInclude/docs/nodes.xml | 0 .../test/XInclude/docs/nodes2.xml | 0 .../test/XInclude/docs/nodes3.xml | 0 .../test/XInclude/docs/ns1.xml | 0 .../test/XInclude/docs/recursive.xml | 0 .../test/XInclude/docs/red.xml | 10 + .../test/XInclude/docs/tstencoding.xml | 0 .../test/XInclude/docs/txtinclude.xml | 0 .../test/XInclude/ents/coalesce1.xml | 5 + .../test/XInclude/ents/ids.xml | 0 .../test/XInclude/ents/inc.txt | 0 .../test/XInclude/ents/isolatin.txt | 0 .../test/XInclude/ents/something.txt | 0 .../test/XInclude/ents/something.xml | 0 .../test/XInclude/ents/sub-inc.ent | 0 .../test/XPath/docs/chapters | 0 .../test/XPath/docs/id | 0 .../libxml2-v2.10.x/test/XPath/docs/issue289 | 3 + .../test/XPath/docs/lang | 0 .../test/XPath/docs/mixed | 0 .../test/XPath/docs/nodes | 0 .../test/XPath/docs/ns | 0 .../test/XPath/docs/simple | 0 .../test/XPath/docs/str | 0 .../test/XPath/docs/usr1 | 0 .../test/XPath/docs/vid | 0 .../test/XPath/expr/base | 0 .../test/XPath/expr/compare | 0 .../test/XPath/expr/equality | 0 .../test/XPath/expr/floats | 0 .../test/XPath/expr/functions | 0 .../test/XPath/expr/strings | 8 + .../test/XPath/tests/chaptersbase | 0 .../test/XPath/tests/chaptersprefol | 0 .../test/XPath/tests/idsimple | 0 .../test/XPath/tests/langsimple | 0 .../test/XPath/tests/mixedpat | 0 .../test/XPath/tests/nodespat | 0 .../test/XPath/tests/nssimple | 0 .../test/XPath/tests/simpleabbr | 0 .../test/XPath/tests/simplebase | 0 .../test/XPath/tests/strbase | 0 .../test/XPath/tests/usr1check | 0 .../test/XPath/tests/vidbase | 0 .../test/XPath/xptr-xp1}/chapterschildseq | 0 .../test/XPath/xptr-xp1/chaptersparts | 6 + .../test/XPath/xptr-xp1/issue289base | 1 + .../test/XPath/xptr-xp1/vidbase | 1 + .../test/XPath/xptr-xp1}/vidchildseq | 0 .../test/XPath/xptr-xp1/viderror | 1 + .../test/XPath/xptr-xp1/vidparts | 3 + .../test/XPath/xptr/chaptersparts | 0 .../test/XPath/xptr/chaptersrange | 0 .../test/XPath/xptr/issue289base | 1 + .../test/XPath/xptr/strpoint | 0 .../test/XPath/xptr/strrange | 0 .../test/XPath/xptr/strrange2 | 0 .../test/XPath/xptr/strrange3 | 0 .../test/XPath/xptr/vidbase | 0 .../test/XPath/xptr/viderror | 0 .../test/XPath/xptr/vidparts | 0 .../test/att1 | 0 .../test/att10 | 0 .../test/att11 | 0 .../test/att2 | 0 .../test/att3 | 0 .../test/att4 | 0 .../test/att5 | 0 .../test/att6 | 0 .../test/att7 | 0 .../test/att8 | 0 .../test/att9 | 0 .../test/attrib.xml | 0 .../test/automata/a | 0 .../test/automata/aba | 0 .../test/automata/abaa | 0 .../test/automata/abba | 0 .../test/automata/po | 0 .../test/badcomment.xml | 0 .../test/bigentname.xml | 0 .../test/bigname.xml | 0 .../test/bigname2.xml | 0 .../test/c14n/1-1-without-comments/doc.dtd | 0 .../c14n/1-1-without-comments/example-1.xml | 0 .../c14n/1-1-without-comments/example-2.xml | 0 .../c14n/1-1-without-comments/example-3.xml | 0 .../c14n/1-1-without-comments/example-4.xml | 0 .../c14n/1-1-without-comments/example-5.xml | 0 .../c14n/1-1-without-comments/example-6.xml | 0 .../c14n/1-1-without-comments/example-7.xml | 0 .../c14n/1-1-without-comments/example-7.xpath | 0 .../c14n/1-1-without-comments/example-8.xml | 0 .../c14n/1-1-without-comments/example-8.xpath | 0 .../test/c14n/1-1-without-comments/world.txt | 0 .../xmlbase-c14n11spec-102.xml | 0 .../xmlbase-c14n11spec-102.xpath | 0 .../xmlbase-c14n11spec2-102.xml | 0 .../xmlbase-c14n11spec2-102.xpath | 0 .../xmlbase-c14n11spec3-102.xml | 0 .../xmlbase-c14n11spec3-102.xpath | 0 .../1-1-without-comments/xmlbase-prop-1.xml | 0 .../1-1-without-comments/xmlbase-prop-1.xpath | 0 .../1-1-without-comments/xmlbase-prop-2.xml | 0 .../1-1-without-comments/xmlbase-prop-2.xpath | 0 .../1-1-without-comments/xmlbase-prop-3.xml | 0 .../1-1-without-comments/xmlbase-prop-3.xpath | 0 .../1-1-without-comments/xmlbase-prop-4.xml | 0 .../1-1-without-comments/xmlbase-prop-4.xpath | 0 .../1-1-without-comments/xmlbase-prop-5.xml | 0 .../1-1-without-comments/xmlbase-prop-5.xpath | 0 .../1-1-without-comments/xmlbase-prop-6.xml | 0 .../1-1-without-comments/xmlbase-prop-6.xpath | 0 .../1-1-without-comments/xmlbase-prop-7.xml | 0 .../1-1-without-comments/xmlbase-prop-7.xpath | 0 .../1-1-without-comments/xmlid-prop-1.xml | 0 .../1-1-without-comments/xmlid-prop-1.xpath | 0 .../1-1-without-comments/xmlid-prop-2.xml | 0 .../1-1-without-comments/xmlid-prop-2.xpath | 0 .../1-1-without-comments/xmllang-prop-1.xml | 0 .../1-1-without-comments/xmllang-prop-1.xpath | 0 .../1-1-without-comments/xmllang-prop-2.xml | 0 .../1-1-without-comments/xmllang-prop-2.xpath | 0 .../1-1-without-comments/xmllang-prop-3.xml | 0 .../1-1-without-comments/xmllang-prop-3.xpath | 0 .../1-1-without-comments/xmllang-prop-4.xml | 0 .../1-1-without-comments/xmllang-prop-4.xpath | 0 .../1-1-without-comments/xmlspace-prop-1.xml | 0 .../xmlspace-prop-1.xpath | 0 .../1-1-without-comments/xmlspace-prop-2.xml | 0 .../xmlspace-prop-2.xpath | 0 .../1-1-without-comments/xmlspace-prop-3.xml | 0 .../xmlspace-prop-3.xpath | 0 .../1-1-without-comments/xmlspace-prop-4.xml | 0 .../xmlspace-prop-4.xpath | 0 .../merlin-c14n-two-09.xml | 0 .../merlin-c14n-two-09.xpath | 0 .../merlin-c14n-two-10.xml | 0 .../merlin-c14n-two-10.xpath | 0 .../merlin-c14n-two-11.xml | 0 .../merlin-c14n-two-11.xpath | 0 .../merlin-c14n-two-12.xml | 0 .../merlin-c14n-two-12.xpath | 0 .../merlin-c14n-two-13.xml | 0 .../merlin-c14n-two-13.xpath | 0 .../merlin-c14n-two-14.xml | 0 .../merlin-c14n-two-14.xpath | 0 .../merlin-c14n-two-15.xml | 0 .../merlin-c14n-two-15.xpath | 0 .../merlin-c14n-two-16.xml | 0 .../merlin-c14n-two-16.xpath | 0 .../merlin-c14n-two-17.xml | 0 .../merlin-c14n-two-17.xpath | 0 .../merlin-c14n-two-18.ns | 0 .../merlin-c14n-two-18.xml | 0 .../merlin-c14n-two-18.xpath | 0 .../merlin-c14n-two-19.ns | 0 .../merlin-c14n-two-19.xml | 0 .../merlin-c14n-two-19.xpath | 0 .../merlin-c14n-two-20.ns | 0 .../merlin-c14n-two-20.xml | 0 .../merlin-c14n-two-20.xpath | 0 .../merlin-c14n-two-21.ns | 0 .../merlin-c14n-two-21.xml | 0 .../merlin-c14n-two-21.xpath | 0 .../merlin-c14n-two-22.ns | 0 .../merlin-c14n-two-22.xml | 0 .../merlin-c14n-two-22.xpath | 0 .../merlin-c14n-two-23.ns | 0 .../merlin-c14n-two-23.xml | 0 .../merlin-c14n-two-23.xpath | 0 .../merlin-c14n-two-24.ns | 0 .../merlin-c14n-two-24.xml | 0 .../merlin-c14n-two-24.xpath | 0 .../merlin-c14n-two-25.ns | 0 .../merlin-c14n-two-25.xml | 0 .../merlin-c14n-two-25.xpath | 0 .../merlin-c14n-two-26.ns | 0 .../merlin-c14n-two-26.xml | 0 .../merlin-c14n-two-26.xpath | 0 .../test/c14n/exc-without-comments/test-0.xml | 0 .../c14n/exc-without-comments/test-0.xpath | 0 .../test/c14n/exc-without-comments/test-1.ns | 0 .../test/c14n/exc-without-comments/test-1.xml | 0 .../c14n/exc-without-comments/test-1.xpath | 0 .../test/c14n/exc-without-comments/test-2.xml | 0 .../c14n/exc-without-comments/test-2.xpath | 0 .../test/c14n/with-comments/doc.dtd | 0 .../test/c14n/with-comments/example-1.xml | 0 .../test/c14n/with-comments/example-2.xml | 0 .../test/c14n/with-comments/example-3.xml | 0 .../test/c14n/with-comments/example-4.xml | 0 .../test/c14n/with-comments/example-5.xml | 0 .../test/c14n/with-comments/example-6.xml | 0 .../test/c14n/with-comments/example-7.xml | 0 .../test/c14n/with-comments/example-7.xpath | 0 .../test/c14n/with-comments/world.txt | 0 .../test/c14n/without-comments/doc.dtd | 0 .../test/c14n/without-comments/example-1.xml | 0 .../test/c14n/without-comments/example-2.xml | 0 .../test/c14n/without-comments/example-3.xml | 0 .../test/c14n/without-comments/example-4.xml | 0 .../test/c14n/without-comments/example-5.xml | 0 .../test/c14n/without-comments/example-6.xml | 0 .../test/c14n/without-comments/example-7.xml | 0 .../c14n/without-comments/example-7.xpath | 0 .../without-comments/merlin-c14n-two-00.xml | 0 .../without-comments/merlin-c14n-two-00.xpath | 0 .../without-comments/merlin-c14n-two-01.xml | 0 .../without-comments/merlin-c14n-two-01.xpath | 0 .../without-comments/merlin-c14n-two-02.xml | 0 .../without-comments/merlin-c14n-two-02.xpath | 0 .../without-comments/merlin-c14n-two-03.xml | 0 .../without-comments/merlin-c14n-two-03.xpath | 0 .../without-comments/merlin-c14n-two-04.xml | 0 .../without-comments/merlin-c14n-two-04.xpath | 0 .../without-comments/merlin-c14n-two-05.xml | 0 .../without-comments/merlin-c14n-two-05.xpath | 0 .../without-comments/merlin-c14n-two-06.xml | 0 .../without-comments/merlin-c14n-two-06.xpath | 0 .../without-comments/merlin-c14n-two-07.xml | 0 .../without-comments/merlin-c14n-two-07.xpath | 0 .../without-comments/merlin-c14n-two-08.xml | 0 .../without-comments/merlin-c14n-two-08.xpath | 0 .../test/c14n/without-comments/test-0.xml | 0 .../test/c14n/without-comments/test-0.xpath | 0 .../test/c14n/without-comments/test-1.xml | 0 .../test/c14n/without-comments/test-1.xpath | 0 .../test/c14n/without-comments/test-2.xml | 0 .../test/c14n/without-comments/test-2.xpath | 0 .../test/c14n/without-comments/test-3.xml | 0 .../test/c14n/without-comments/test-3.xpath | 0 .../test/c14n/without-comments/world.txt | 0 .../test/catalogs/catal.script | 0 .../test/catalogs/catal.sgml | 0 .../test/catalogs/catal1.sgml | 0 .../test/catalogs/catal2.sgml | 0 .../test/catalogs/catal3.sgml | 0 .../test/catalogs/docbook.script | 0 .../test/catalogs/docbook.xml | 0 .../test/catalogs/registry.script | 0 .../test/catalogs/registry.xml | 0 .../test/catalogs/stylesheet.xml | 0 .../test/catalogs/whites.script | 0 .../test/catalogs/whites.sgml | 0 .../test/catalogs/whitex.script | 0 .../test/catalogs/whitex.xml | 0 .../test/cdata | 0 .../test/cdata-2-byte-UTF-8.xml | 0 .../test/cdata-3-byte-UTF-8.xml | 0 .../test/cdata-4-byte-UTF-8.xml | 0 .../test/cdata2 | 0 .../test/comment.xml | 0 .../test/comment2.xml | 0 .../test/comment3.xml | 0 .../test/comment4.xml | 0 .../test/comment5.xml | 0 .../test/comment6.xml | 0 .../test/dav1 | 0 .../test/dav10 | 0 .../test/dav11 | 0 .../test/dav12 | 0 .../test/dav13 | 0 .../test/dav15 | 0 .../test/dav16 | 0 .../test/dav17 | 0 .../test/dav18 | 0 .../test/dav19 | 0 .../test/dav2 | 0 .../test/dav3 | 0 .../test/dav4 | 0 .../test/dav5 | 0 .../test/dav6 | 0 .../test/dav7 | 0 .../test/dav8 | 0 .../test/dav9 | 0 .../test/defattr.xml | 0 .../test/defattr2.xml | 0 .../test/dia1 | 0 .../test/dia2 | 0 .../test/dtd1 | 0 .../test/dtd10 | 0 .../test/dtd11 | 0 .../test/dtd12 | 0 .../test/dtd13 | 0 .../test/dtd2 | 0 .../test/dtd3 | 0 .../test/dtd4 | 0 .../test/dtd5 | 0 .../test/dtd6 | 0 .../test/dtd7 | 0 .../test/dtd8 | 0 .../test/dtd9 | 0 .../test/dtds/eve.dtd | 0 .../test/ebcdic_566012.xml | 0 .../test/emptycdata.xml | 0 .../test/ent1 | 0 .../test/ent10 | 0 .../test/ent11 | 0 .../test/ent12 | 0 .../test/ent13 | 0 .../test/ent2 | 0 .../test/ent3 | 0 .../test/ent4 | 0 .../test/ent5 | 0 .../test/ent6 | 0 .../test/ent6hex | 0 .../test/ent7 | 0 .../test/ent8 | 0 .../test/ent9 | 0 .../test/ent_738805.xml | 0 .../test/errors/754946.xml | 0 .../test/errors/754947.xml | 0 .../test/errors/758588.xml | 0 .../test/errors/759020.xml | 0 .../test/errors/759398.xml | 0 .../test/errors/759573-2.xml | 0 .../test/errors/759573.xml | 0 .../test/errors/759579.xml | 0 .../test/errors/attr1.xml | 0 .../test/errors/attr2.xml | 0 .../test/errors/attr3.xml | 0 .../test/errors/attr4.xml | 0 .../test/errors/cdata.xml | 0 .../test/errors/charref1.xml | 0 .../test/errors/comment1.xml | 0 .../test/errors/content1.xml | 0 .../test/errors/dtd13 | 0 .../test/errors/ent_redecl.xml | 4 + .../test/errors/extparsedent.xml | 0 .../libxml2-v2.10.x/test/errors/issue151.xml | 9 + .../test/errors/name.xml | 0 .../test/errors/name2.xml | 0 .../test/errors/rec_ext.ent | 0 .../test/errors/rec_ext_ent.xml | 0 .../test/errors10/781205.xml | 0 .../test/errors10/781361.xml | 0 .../test/eve.xml | 0 .../test/expr/base | 0 .../test/icu_parse_test.xml | 0 .../test/intsubset.xml | 0 .../test/intsubset2.xml | 0 .../test/isolat1 | 0 .../test/isolat2 | 0 .../test/isolat3 | 0 .../test/japancrlf.xml | 0 .../test/namespaces/err_0.xml | 0 .../test/namespaces/err_1.xml | 0 .../test/namespaces/err_10.xml | 0 .../test/namespaces/err_11.xml | 0 .../test/namespaces/err_2.xml | 0 .../test/namespaces/err_3.xml | 0 .../test/namespaces/err_4.xml | 0 .../test/namespaces/err_5.xml | 0 .../test/namespaces/err_6.xml | 0 .../test/namespaces/err_7.xml | 0 .../test/namespaces/err_8.xml | 0 .../test/namespaces/err_9.xml | 0 .../test/namespaces/reconcile/tests-to-c.xsl | 0 .../test/namespaces/reconcile/tests.xml | 0 .../test/ns | 0 .../test/ns2 | 0 .../test/ns3 | 0 .../test/ns4 | 0 .../test/ns5 | 0 .../test/ns6 | 0 .../test/ns7 | 0 .../test/nsclean.xml | 0 .../test/p3p | 0 .../test/pattern/conj.pat | 0 .../test/pattern/conj.xml | 0 .../test/pattern/multiple.pat | 0 .../test/pattern/multiple.xml | 0 .../test/pattern/namespaces.pat | 0 .../test/pattern/namespaces.xml | 0 .../test/pattern/simple.pat | 0 .../test/pattern/simple.xml | 0 .../test/pi.xml | 0 .../test/pi2.xml | 0 .../test/rdf1 | 0 .../test/rdf2 | 0 .../test/recurse/good.xml | 0 .../test/recurse/goodattr.xml | 0 .../test/recurse/lol1.xml | 0 .../test/recurse/lol2.xml | 0 .../test/recurse/lol3.dtd | 0 .../test/recurse/lol3.xml | 0 .../test/recurse/lol4.xml | 0 .../test/recurse/lol5.xml | 0 .../test/recurse/lol6.xml | 0 .../test/regexp/branch | 0 .../test/regexp/bug316338 | 0 .../test/regexp/bug420596 | 0 .../test/regexp/bug649244 | 0 .../test/regexp/bug757711 | 0 .../test/regexp/bug783015 | 0 .../test/regexp/content | 0 .../test/regexp/hard | 0 .../libxml2-v2.10.x/test/regexp/issue301 | 4 + .../libxml2-v2.10.x/test/regexp/issue370 | 3 + .../libxml2-v2.10.x/test/regexp/issue65 | 2 + .../test/regexp/ncname | 0 .../test/regexp/ranges | 0 .../test/regexp/ranges2 | 0 .../test/regexp/xpath | 0 .../test/relaxng/302836.rng | 0 .../test/relaxng/302836_0.xml | 0 .../test/relaxng/307377.rng | 0 .../test/relaxng/307377_0.xml | 0 .../test/relaxng/307377_1.xml | 0 .../test/relaxng/307377_2.xml | 0 .../test/relaxng/492317.rng | 0 .../test/relaxng/492317_0.xml | 0 .../test/relaxng/492317_1.xml | 0 .../test/relaxng/492317_2.xml | 0 .../test/relaxng/558452.rng | 0 .../test/relaxng/558452_0.xml | 0 .../test/relaxng/558452_1.xml | 0 .../test/relaxng/558452_2.xml | 0 .../test/relaxng/558452_3.xml | 0 .../test/relaxng/558452_4.xml | 0 .../test/relaxng/565219.rng | 0 .../test/relaxng/565219_0.xml | 0 .../test/relaxng/565219_1.xml | 0 .../test/relaxng/565219_2.xml | 0 .../test/relaxng/595792-ext.rng | 0 .../test/relaxng/595792.rng | 0 .../test/relaxng/595792_0.xml | 0 .../test/relaxng/710744.rng | 0 .../test/relaxng/710744_1.xml | 0 .../test/relaxng/710744_2.xml | 0 .../test/relaxng/OASIS/spectest.xml | 0 .../test/relaxng/OpenDocumentSub.rng | 0 .../test/relaxng/OpenDocumentSub_0.xml | 0 .../test/relaxng/addressBook.rng | 0 .../test/relaxng/ambig_name-class.rng | 0 .../test/relaxng/ambig_name-class.xml | 0 .../test/relaxng/ambig_name-class2.rng | 0 .../test/relaxng/ambig_name-class2.xml | 0 .../test/relaxng/anyName0.rng | 0 .../test/relaxng/anyName0_0.xml | 0 .../test/relaxng/choice0.rng | 0 .../test/relaxng/choice0_0.xml | 0 .../test/relaxng/choice0_1.xml | 0 .../test/relaxng/choice0_2.xml | 0 .../test/relaxng/choice0_3.xml | 0 .../test/relaxng/choice0_4.xml | 0 .../test/relaxng/choice0_5.xml | 0 .../test/relaxng/choice0_6.xml | 0 .../test/relaxng/choice0_7.xml | 0 .../test/relaxng/choice0_8.xml | 0 .../test/relaxng/compare0.rng | 0 .../test/relaxng/compare0_0.xml | 0 .../test/relaxng/comps.rng | 0 .../test/relaxng/comps_0.xml | 0 .../test/relaxng/demo.rng | 0 .../test/relaxng/demo.xml | 0 .../test/relaxng/demo2.rng | 0 .../test/relaxng/demo3.rng | 0 .../test/relaxng/docbook.rng | 0 .../test/relaxng/docbook_0.xml | 0 .../test/relaxng/empty0.rng | 0 .../test/relaxng/empty0_0.xml | 0 .../test/relaxng/empty1.rng | 0 .../test/relaxng/empty1_0.xml | 0 .../test/relaxng/empty1_1.xml | 0 .../test/relaxng/include0.inc | 0 .../test/relaxng/include0.rng | 0 .../test/relaxng/include0_0.xml | 0 .../test/relaxng/include1-0.inc | 0 .../test/relaxng/include1-1.inc | 0 .../test/relaxng/include1.rng | 0 .../test/relaxng/include1_0.xml | 0 .../test/relaxng/inline.rng | 0 .../test/relaxng/inline2.rng | 0 .../test/relaxng/inline3.rng | 0 .../test/relaxng/interleave0_0.rng | 0 .../test/relaxng/interleave1_0.rng | 0 .../test/relaxng/libvirt.rng | 0 .../test/relaxng/libvirt_0.xml | 0 .../test/relaxng/list.rng | 0 .../test/relaxng/list_0.xml | 0 .../test/relaxng/list_1.xml | 0 .../test/relaxng/pattern1.rng | 0 .../test/relaxng/pattern2.rng | 0 .../test/relaxng/pattern3.rng | 0 .../test/relaxng/pattern3_1.xml | 0 .../test/relaxng/proofsystem.rng | 0 .../test/relaxng/rngbug-001.ext | 0 .../test/relaxng/rngbug-001.rng | 0 .../test/relaxng/rngbug-001.xml | 0 .../test/relaxng/spec.rng | 0 .../test/relaxng/spec1.rng | 0 .../test/relaxng/spec1_1.xml | 0 .../test/relaxng/spec_0.xml | 0 .../test/relaxng/table.rng | 0 .../test/relaxng/testsuite.xml | 0 .../test/relaxng/tutor10_1.rng | 0 .../test/relaxng/tutor10_10.rng | 0 .../test/relaxng/tutor10_10_1.xml | 0 .../test/relaxng/tutor10_1_1.xml | 0 .../test/relaxng/tutor10_1_2.xml | 0 .../test/relaxng/tutor10_1_3.xml | 0 .../test/relaxng/tutor10_1_4.xml | 0 .../test/relaxng/tutor10_1_5.xml | 0 .../test/relaxng/tutor10_1_6.xml | 0 .../test/relaxng/tutor10_2.rng | 0 .../test/relaxng/tutor10_2_1.xml | 0 .../test/relaxng/tutor10_2_2.xml | 0 .../test/relaxng/tutor10_2_3.xml | 0 .../test/relaxng/tutor10_2_4.xml | 0 .../test/relaxng/tutor10_3.rng | 0 .../test/relaxng/tutor10_3_1.xml | 0 .../test/relaxng/tutor10_4.rng | 0 .../test/relaxng/tutor10_4_1.xml | 0 .../test/relaxng/tutor10_5.rng | 0 .../test/relaxng/tutor10_5_1.xml | 0 .../test/relaxng/tutor10_6.rng | 0 .../test/relaxng/tutor10_6_1.xml | 0 .../test/relaxng/tutor10_7.rng | 0 .../test/relaxng/tutor10_7_1.xml | 0 .../test/relaxng/tutor10_7_2.xml | 0 .../test/relaxng/tutor10_7_3.xml | 0 .../test/relaxng/tutor10_8.rng | 0 .../test/relaxng/tutor10_8_1.xml | 0 .../test/relaxng/tutor10_8_2.xml | 0 .../test/relaxng/tutor10_8_3.xml | 0 .../test/relaxng/tutor10_9.rng | 0 .../test/relaxng/tutor10_9_1.xml | 0 .../test/relaxng/tutor11_1.rng | 0 .../test/relaxng/tutor11_1_1.xml | 0 .../test/relaxng/tutor11_1_2.xml | 0 .../test/relaxng/tutor11_1_3.xml | 0 .../test/relaxng/tutor11_2.rng | 0 .../test/relaxng/tutor11_2_1.xml | 0 .../test/relaxng/tutor11_2_2.xml | 0 .../test/relaxng/tutor11_2_3.xml | 0 .../test/relaxng/tutor11_3.rng | 0 .../test/relaxng/tutor11_3_1.xml | 0 .../test/relaxng/tutor11_4.rng | 0 .../test/relaxng/tutor11_4_1.xml | 0 .../test/relaxng/tutor12_1.rng | 0 .../test/relaxng/tutor12_1_1.xml | 0 .../test/relaxng/tutor13_1.rng | 0 .../test/relaxng/tutor13_1_1.xml | 0 .../test/relaxng/tutor14_1.rng | 0 .../test/relaxng/tutor1_1.rng | 0 .../test/relaxng/tutor1_1_1.xml | 0 .../test/relaxng/tutor1_2.rng | 0 .../test/relaxng/tutor1_2_1.xml | 0 .../test/relaxng/tutor1_3.rng | 0 .../test/relaxng/tutor1_3_1.xml | 0 .../test/relaxng/tutor1_4.rng | 0 .../test/relaxng/tutor1_4_1.xml | 0 .../test/relaxng/tutor2_1.rng | 0 .../test/relaxng/tutor2_1_1.xml | 0 .../test/relaxng/tutor3_1.rng | 0 .../test/relaxng/tutor3_1_1.xml | 0 .../test/relaxng/tutor3_1_2.xml | 0 .../test/relaxng/tutor3_2.rng | 0 .../test/relaxng/tutor3_2_1.xml | 0 .../test/relaxng/tutor3_3.rng | 0 .../test/relaxng/tutor3_3_1.xml | 0 .../test/relaxng/tutor3_4.rng | 0 .../test/relaxng/tutor3_4_1.xml | 0 .../test/relaxng/tutor3_5.rng | 0 .../test/relaxng/tutor3_5_1.xml | 0 .../test/relaxng/tutor3_5_2.xml | 0 .../test/relaxng/tutor3_6.rng | 0 .../test/relaxng/tutor3_6_1.xml | 0 .../test/relaxng/tutor3_7.rng | 0 .../test/relaxng/tutor3_7_1.xml | 0 .../test/relaxng/tutor3_8.rng | 0 .../test/relaxng/tutor3_8_1.xml | 0 .../test/relaxng/tutor3_9.rng | 0 .../test/relaxng/tutor3_9_1.xml | 0 .../test/relaxng/tutor4_1.rng | 0 .../test/relaxng/tutor4_1_1.xml | 0 .../test/relaxng/tutor4_2.rng | 0 .../test/relaxng/tutor4_2_1.xml | 0 .../test/relaxng/tutor4_3.rng | 0 .../test/relaxng/tutor4_3_1.xml | 0 .../test/relaxng/tutor4_3_2.xml | 0 .../test/relaxng/tutor4_3_3.xml | 0 .../test/relaxng/tutor4_3_4.xml | 0 .../test/relaxng/tutor4_3_5.xml | 0 .../test/relaxng/tutor4_3_6.xml | 0 .../test/relaxng/tutor4_4.rng | 0 .../test/relaxng/tutor4_4_1.xml | 0 .../test/relaxng/tutor5_1.rng | 0 .../test/relaxng/tutor5_1_1.xml | 0 .../test/relaxng/tutor5_2.rng | 0 .../test/relaxng/tutor5_2_1.xml | 0 .../test/relaxng/tutor5_3.rng | 0 .../test/relaxng/tutor5_3_1.xml | 0 .../test/relaxng/tutor5_4.rng | 0 .../test/relaxng/tutor5_4_1.xml | 0 .../test/relaxng/tutor5_5.rng | 0 .../test/relaxng/tutor6_1.rng | 0 .../test/relaxng/tutor6_1_1.xml | 0 .../test/relaxng/tutor6_1_2.xml | 0 .../test/relaxng/tutor6_1_3.xml | 0 .../test/relaxng/tutor6_1_4.xml | 0 .../test/relaxng/tutor6_1_5.xml | 0 .../test/relaxng/tutor6_2.rng | 0 .../test/relaxng/tutor6_2_1.xml | 0 .../test/relaxng/tutor6_2_2.xml | 0 .../test/relaxng/tutor6_2_3.xml | 0 .../test/relaxng/tutor6_2_4.xml | 0 .../test/relaxng/tutor6_3.rng | 0 .../test/relaxng/tutor6_3_1.xml | 0 .../test/relaxng/tutor7_1.rng | 0 .../test/relaxng/tutor7_1_1.xml | 0 .../test/relaxng/tutor7_1_2.xml | 0 .../test/relaxng/tutor7_1_3.xml | 0 .../test/relaxng/tutor7_1_4.xml | 0 .../test/relaxng/tutor7_2.rng | 0 .../test/relaxng/tutor7_2_1.xml | 0 .../test/relaxng/tutor7_2_2.xml | 0 .../test/relaxng/tutor7_2_3.xml | 0 .../test/relaxng/tutor7_2_4.xml | 0 .../test/relaxng/tutor7_3.rng | 0 .../test/relaxng/tutor7_3_1.xml | 0 .../test/relaxng/tutor7_3_2.xml | 0 .../test/relaxng/tutor7_3_3.xml | 0 .../test/relaxng/tutor7_3_4.xml | 0 .../test/relaxng/tutor7_3_5.xml | 0 .../test/relaxng/tutor8_1.rng | 0 .../test/relaxng/tutor8_1_1.xml | 0 .../test/relaxng/tutor8_1_2.xml | 0 .../test/relaxng/tutor8_2.rng | 0 .../test/relaxng/tutor8_2_1.xml | 0 .../test/relaxng/tutor8_2_2.xml | 0 .../test/relaxng/tutor8_2_3.xml | 0 .../test/relaxng/tutor8_2_4.xml | 0 .../test/relaxng/tutor8_2_5.xml | 0 .../test/relaxng/tutor8_2_6.xml | 0 .../test/relaxng/tutor8_3.rng | 0 .../test/relaxng/tutor8_3_1.xml | 0 .../test/relaxng/tutor9_1.rng | 0 .../test/relaxng/tutor9_10.rng | 0 .../test/relaxng/tutor9_10_1.xml | 0 .../test/relaxng/tutor9_11.rng | 0 .../test/relaxng/tutor9_11_1.xml | 0 .../test/relaxng/tutor9_12.rng | 0 .../test/relaxng/tutor9_12_1.xml | 0 .../test/relaxng/tutor9_1_1.xml | 0 .../test/relaxng/tutor9_2.rng | 0 .../test/relaxng/tutor9_2_1.xml | 0 .../test/relaxng/tutor9_2_2.xml | 0 .../test/relaxng/tutor9_3.rng | 0 .../test/relaxng/tutor9_3_1.xml | 0 .../test/relaxng/tutor9_3_2.xml | 0 .../test/relaxng/tutor9_4.rng | 0 .../test/relaxng/tutor9_4_1.xml | 0 .../test/relaxng/tutor9_4_2.xml | 0 .../test/relaxng/tutor9_5.rng | 0 .../test/relaxng/tutor9_5_1.xml | 0 .../test/relaxng/tutor9_5_2.xml | 0 .../test/relaxng/tutor9_5_3.xml | 0 .../test/relaxng/tutor9_6.rng | 0 .../test/relaxng/tutor9_6_1.xml | 0 .../test/relaxng/tutor9_6_2.xml | 0 .../test/relaxng/tutor9_6_3.xml | 0 .../test/relaxng/tutor9_7.rng | 0 .../test/relaxng/tutor9_7_1.xml | 0 .../test/relaxng/tutor9_8.rng | 0 .../test/relaxng/tutor9_8_1.xml | 0 .../test/relaxng/tutor9_9.rng | 0 .../test/relaxng/tutor9_9_1.xml | 0 .../test/relaxng/tutorA.rng | 0 .../test/schemas/570702_0.xml | 0 .../test/schemas/570702_0.xsd | 0 .../test/schemas/579746_0.xml | 0 .../test/schemas/579746_0.xsd | 0 .../test/schemas/579746_1.xml | 0 .../test/schemas/579746_1.xsd | 0 .../test/schemas/579746_2.xml | 0 .../test/schemas/579746_3.xml | 0 .../test/schemas/579746_4.xml | 0 .../test/schemas/579746_5.xml | 0 .../test/schemas/582887-attribute.xsd | 0 .../test/schemas/582887-common.xsd | 0 .../test/schemas/582887-element.xsd | 0 .../test/schemas/582887_0.xml | 0 .../test/schemas/582887_0.xsd | 0 .../test/schemas/582906-1-common.xsd | 0 .../test/schemas/582906-1-prog1.xsd | 0 .../test/schemas/582906-1-prog2-include.xsd | 0 .../test/schemas/582906-1-prog2.xsd | 0 .../test/schemas/582906-1_0.xml | 0 .../test/schemas/582906-1_0.xsd | 0 .../test/schemas/582906-2-common.xsd | 0 .../test/schemas/582906-2-prog1.xsd | 0 .../test/schemas/582906-2-prog2-include.xsd | 0 .../test/schemas/582906-2-prog2.xsd | 0 .../test/schemas/582906-2_0.xml | 0 .../test/schemas/582906-2_0.xsd | 0 .../test/schemas/all.xsd | 0 .../test/schemas/all1_0.xml | 0 .../test/schemas/all1_0.xsd | 0 .../test/schemas/all_0.xml | 0 .../test/schemas/all_0.xsd | 0 .../test/schemas/all_1.xml | 0 .../test/schemas/all_1.xsd | 0 .../test/schemas/all_2.xml | 0 .../test/schemas/all_2.xsd | 0 .../test/schemas/all_3.xml | 0 .../test/schemas/all_4.xml | 0 .../test/schemas/all_5.xml | 0 .../test/schemas/all_6.xml | 0 .../test/schemas/all_7.xml | 0 .../test/schemas/allsg_0.xml | 0 .../test/schemas/allsg_0.xsd | 0 .../test/schemas/allsg_1.xml | 0 .../test/schemas/allsg_2.xml | 0 .../test/schemas/allsg_3.xml | 0 .../test/schemas/allsg_4.xml | 0 .../test/schemas/allsg_5.xml | 0 .../test/schemas/annot-err_0.xml | 0 .../test/schemas/annot-err_0.xsd | 0 .../test/schemas/any1_0.xml | 0 .../test/schemas/any1_0.xsd | 0 .../test/schemas/any2_0.xml | 0 .../test/schemas/any2_0.xsd | 0 .../test/schemas/any3_0.xml | 0 .../test/schemas/any3_0.xsd | 0 .../test/schemas/any4_0.xml | 0 .../test/schemas/any4_0.xsd | 0 .../test/schemas/any5_0.xml | 0 .../test/schemas/any5_0.xsd | 0 .../test/schemas/any5_1.xml | 0 .../test/schemas/any5_1.xsd | 0 .../test/schemas/any5_2.xml | 0 .../test/schemas/any5_3.xml | 0 .../test/schemas/any5_4.xml | 0 .../test/schemas/any5_5.xml | 0 .../test/schemas/any5_6.xml | 0 .../test/schemas/any6_0.xml | 0 .../test/schemas/any6_1.xsd | 0 .../test/schemas/any6_2.xsd | 0 .../test/schemas/any7_0.xml | 0 .../test/schemas/any7_1.xml | 0 .../test/schemas/any7_1.xsd | 0 .../test/schemas/any7_2.xml | 0 .../test/schemas/any7_2.xsd | 0 .../test/schemas/any8_0.xml | 0 .../test/schemas/any8_1.xsd | 0 .../test/schemas/anyAttr-derive-errors1_0.xml | 0 .../test/schemas/anyAttr-derive-errors1_0.xsd | 0 .../test/schemas/anyAttr-derive1_0.xml | 0 .../test/schemas/anyAttr-derive1_0.xsd | 0 .../test/schemas/anyAttr-derive2_0.xml | 0 .../test/schemas/anyAttr-derive2_0.xsd | 0 .../test/schemas/anyAttr-errors1_0.xml | 0 .../anyAttr-processContents-err1_0.xml | 0 .../anyAttr-processContents-err1_0.xsd | 0 .../schemas/anyAttr-processContents1_0.xml | 0 .../schemas/anyAttr-processContents1_0.xsd | 0 .../test/schemas/anyAttr.importA.1_0.xsd | 0 .../test/schemas/anyAttr.importB.1_0.xsd | 0 .../test/schemas/anyAttr1_0.xml | 0 .../test/schemas/anyAttr1_0.xsd | 0 .../test/schemas/attr0_0.xml | 0 .../test/schemas/attr0_0.xsd | 0 .../test/schemas/attruse_0_0.xml | 0 .../test/schemas/attruse_0_0.xsd | 0 .../test/schemas/attruse_0_1.xml | 0 .../test/schemas/attruse_0_2.xml | 0 .../test/schemas/bug141312_0.xml | 0 .../test/schemas/bug141312_0.xsd | 0 .../test/schemas/bug141333.xml | 0 .../test/schemas/bug141333.xsd | 0 .../test/schemas/bug141333_0.xml | 0 .../test/schemas/bug141333_0.xsd | 0 .../test/schemas/bug143951.imp | 0 .../test/schemas/bug143951_0.xml | 0 .../test/schemas/bug143951_0.xsd | 0 .../test/schemas/bug145246.xsd.imp | 0 .../test/schemas/bug145246_0.xml | 0 .../test/schemas/bug145246_0.xsd | 0 .../test/schemas/bug152470_1.xml | 0 .../test/schemas/bug152470_1.xsd | 0 .../test/schemas/bug167754_0.xml | 0 .../test/schemas/bug167754_0.xsd | 0 .../test/schemas/bug303566_1.xml | 0 .../test/schemas/bug303566_1.xsd | 0 .../test/schemas/bug306806_0.xml | 0 .../test/schemas/bug306806_1.xsd | 0 .../test/schemas/bug309338_0.xml | 0 .../test/schemas/bug309338_1.xsd | 0 .../test/schemas/bug310264_0.xml | 0 .../test/schemas/bug310264_0.xsd | 0 .../test/schemas/bug312957_0.xml | 0 .../test/schemas/bug312957_1.xsd | 0 .../test/schemas/bug313982_0.xml | 0 .../test/schemas/bug313982_0.xsd | 0 .../test/schemas/bug321475_0.xml | 0 .../test/schemas/bug321475_1.xsd | 0 .../test/schemas/bug322411_0.xml | 0 .../test/schemas/bug322411_1.xsd | 0 .../test/schemas/bug323510_0.xml | 0 .../test/schemas/bug323510_1.xsd | 0 .../test/schemas/bug455953_0.xml | 0 .../test/schemas/bug455953_0.xsd | 0 .../test/schemas/changelog093_0.xml | 0 .../test/schemas/changelog093_1.xsd | 0 .../test/schemas/choice_0.xml | 0 .../test/schemas/choice_0.xsd | 0 .../test/schemas/choice_1.xml | 0 .../test/schemas/choice_1.xsd | 0 .../test/schemas/choice_2.xml | 0 .../test/schemas/choice_2.xsd | 0 .../test/schemas/choice_3.xml | 0 .../test/schemas/choice_4.xml | 0 .../test/schemas/choice_5.xml | 0 .../test/schemas/choice_6.xml | 0 .../test/schemas/complex-type-extension_0.xml | 0 .../test/schemas/complex-type-extension_0.xsd | 0 .../test/schemas/cos-ct-extends-1-3_0.xml | 0 .../test/schemas/cos-ct-extends-1-3_0.xsd | 0 .../schemas/cos-st-restricts-1-2-err_0.xml | 0 .../schemas/cos-st-restricts-1-2-err_0.xsd | 0 .../test/schemas/ct-sc-nobase_0.xml | 0 .../test/schemas/ct-sc-nobase_0.xsd | 0 .../test/schemas/date_0.xml | 0 .../test/schemas/date_0.xsd | 0 .../test/schemas/decimal-1.xml | 0 .../test/schemas/decimal-1.xsd | 0 .../test/schemas/decimal-1_0.xml | 0 .../test/schemas/decimal-1_1.xsd | 0 .../test/schemas/decimal-2_0.xml | 0 .../test/schemas/decimal-2_1.xsd | 0 .../test/schemas/decimal-3_0.xml | 0 .../test/schemas/decimal-3_1.xsd | 0 .../schemas/derivation-ok-extension-err_0.xml | 0 .../schemas/derivation-ok-extension-err_0.xsd | 0 .../schemas/derivation-ok-extension_0.xml | 0 .../schemas/derivation-ok-extension_0.xsd | 0 .../derivation-ok-restriction-2-1-1_0.xml | 0 .../derivation-ok-restriction-2-1-1_0.xsd | 0 .../derivation-ok-restriction-4-1-err_0.xml | 0 .../derivation-ok-restriction-4-1-err_0.xsd | 0 .../derivation-restriction-anyAttr_0.xml | 0 .../derivation-restriction-anyAttr_0.xsd | 0 .../derivation-restriction-anyType.xml | 0 .../derivation-restriction-anyType.xsd | 0 .../test/schemas/deter0_0.xml | 0 .../test/schemas/deter0_0.xsd | 0 .../test/schemas/dur_0.xml | 0 .../test/schemas/dur_0.xsd | 0 .../test/schemas/elem0_0.xml | 0 .../test/schemas/elem0_0.xsd | 0 .../test/schemas/element-err_0.xml | 0 .../test/schemas/element-err_0.xsd | 0 .../test/schemas/element-minmax-err_0.xml | 0 .../test/schemas/element-minmax-err_0.xsd | 0 .../test/schemas/empty-value_0.xml | 0 .../test/schemas/empty-value_1.xml | 0 .../test/schemas/empty-value_1.xsd | 0 .../test/schemas/empty_0.xml | 0 .../test/schemas/empty_0.xsd | 0 .../test/schemas/empty_1.xsd | 0 .../test/schemas/extension0_0.xml | 0 .../test/schemas/extension0_0.xsd | 0 .../test/schemas/extension1_0.xml | 0 .../test/schemas/extension1_0.xsd | 0 .../test/schemas/extension1_1.xml | 0 .../test/schemas/extension1_2.xml | 0 .../test/schemas/extension2_0.xml | 0 .../test/schemas/extension2_1.xsd | 0 .../test/schemas/facet-unionST-err1_0.xml | 0 .../test/schemas/facet-unionST-err1_0.xsd | 0 .../test/schemas/facet-whiteSpace_0.xml | 0 .../test/schemas/facet-whiteSpace_0.xsd | 0 .../test/schemas/group0_0.xml | 0 .../test/schemas/group0_0.xsd | 0 .../test/schemas/hexbinary_0.xml | 0 .../test/schemas/hexbinary_0.xsd | 0 .../test/schemas/hexbinary_1.xml | 0 .../test/schemas/idc-keyref-err1_0.xml | 0 .../test/schemas/idc-keyref-err1_1.xsd | 0 .../test/schemas/import-455953.xsd | 0 .../test/schemas/import-bad-1_0.imp | 0 .../test/schemas/import0_0.imp | 0 .../test/schemas/import0_0.xml | 0 .../test/schemas/import0_0.xsd | 0 .../test/schemas/import1_0.imp | 0 .../test/schemas/import1_0.xml | 0 .../test/schemas/import1_0.xsd | 0 .../test/schemas/import1_0b.imp | 0 .../test/schemas/import2_0.imp | 0 .../test/schemas/import2_0.xml | 0 .../test/schemas/import2_0.xsd | 0 .../test/schemas/include1_0.inc | 0 .../test/schemas/include1_0.xml | 0 .../test/schemas/include1_0.xsd | 0 .../test/schemas/include2_0.inc | 0 .../test/schemas/include2_0.xml | 0 .../test/schemas/include2_0.xsd | 0 .../test/schemas/include3_0.inc | 0 .../test/schemas/include3_0.xml | 0 .../test/schemas/include3_0.xsd | 0 .../test/schemas/issue303_0.xml | 1 + .../test/schemas/issue303_0.xsd | 19 + .../test/schemas/issue40_0.xml | 0 .../test/schemas/issue40_0.xsd | 0 .../test/schemas/item_0.xml | 0 .../test/schemas/item_0.xsd | 0 .../test/schemas/item_1.xsd | 0 .../test/schemas/length1_0.xml | 0 .../test/schemas/length1_0.xsd | 0 .../test/schemas/length2_0.xml | 0 .../test/schemas/length2_0.xsd | 0 .../test/schemas/length3_0.xml | 0 .../test/schemas/length3_0.xsd | 0 .../test/schemas/list0_0.xml | 0 .../test/schemas/list0_0.xsd | 0 .../test/schemas/list0_1.xml | 0 .../test/schemas/list0_1.xsd | 0 .../test/schemas/list0_2.xml | 0 .../test/schemas/mixed0_0.xml | 0 .../test/schemas/mixed0_0.xsd | 0 .../test/schemas/mixed1_0.xml | 0 .../test/schemas/mixed1_0.xsd | 0 .../test/schemas/ns0_0.xml | 0 .../test/schemas/ns0_0.xsd | 0 .../test/schemas/ns0_1.xml | 0 .../test/schemas/ns0_1.xsd | 0 .../test/schemas/ns0_2.xml | 0 .../test/schemas/ns0_3.xml | 0 .../test/schemas/ns0_4.xml | 0 .../test/schemas/ns1_0.xml | 0 .../test/schemas/ns1_0.xsd | 0 .../test/schemas/ns2_0.xml | 0 .../test/schemas/ns2_0.xsd | 0 .../test/schemas/nvdcve_0.xml | 0 .../test/schemas/nvdcve_0.xsd | 0 .../test/schemas/po0_0.xml | 0 .../test/schemas/po0_0.xsd | 0 .../test/schemas/po1_0.xml | 0 .../test/schemas/po1_0.xsd | 0 .../test/schemas/poschargrp0_0.xml | 0 .../test/schemas/poschargrp0_0.xsd | 0 .../test/schemas/regexp-char-ref_0.xml | 0 .../test/schemas/regexp-char-ref_0.xsd | 0 .../test/schemas/regexp-char-ref_1.xsd | 0 .../test/schemas/restrict-CT-attr-ref_0.xml | 0 .../test/schemas/restrict-CT-attr-ref_0.xsd | 0 .../test/schemas/restriction-attr1_0.xml | 0 .../test/schemas/restriction-attr1_0.xsd | 0 .../test/schemas/restriction-enum-1_0.xml | 0 .../test/schemas/restriction-enum-1_1.xsd | 0 .../test/schemas/restriction0_0.xml | 0 .../test/schemas/restriction0_0.xsd | 0 .../test/schemas/scc-no-xmlns_0.xml | 0 .../test/schemas/scc-no-xmlns_0.xsd | 0 .../test/schemas/scc-no-xsi_0.xml | 0 .../test/schemas/scc-no-xsi_0.xsd | 0 .../test/schemas/seq-dubl-elem1_0.xml | 0 .../test/schemas/seq-dubl-elem1_0.xsd | 0 .../test/schemas/seq0_0.xml | 0 .../test/schemas/seq0_0.xsd | 0 .../test/schemas/src-attribute1_0.xml | 0 .../test/schemas/src-attribute1_0.xsd | 0 .../test/schemas/src-attribute2_0.xml | 0 .../test/schemas/src-attribute2_0.xsd | 0 .../test/schemas/src-attribute3-1_0.xml | 0 .../test/schemas/src-attribute3-1_0.xsd | 0 .../test/schemas/src-attribute3-2-form_0.xml | 0 .../test/schemas/src-attribute3-2-form_0.xsd | 0 .../test/schemas/src-attribute3-2-st_0.xml | 0 .../test/schemas/src-attribute3-2-st_0.xsd | 0 .../test/schemas/src-attribute3-2-type_0.xml | 0 .../test/schemas/src-attribute3-2-type_0.xsd | 0 .../test/schemas/src-attribute4_0.xml | 0 .../test/schemas/src-attribute4_0.xsd | 0 .../test/schemas/src-element1_0.xml | 0 .../test/schemas/src-element1_0.xsd | 0 .../test/schemas/src-element2-1_0.xml | 0 .../test/schemas/src-element2-1_0.xsd | 0 .../test/schemas/src-element2-2_0.xml | 0 .../test/schemas/src-element2-2_0.xsd | 0 .../test/schemas/src-element3_0.xml | 0 .../test/schemas/src-element3_0.xsd | 0 .../test/schemas/subst-group-1_0.xsd | 0 .../test/schemas/subst-group-1_1.xml | 0 .../test/schemas/union2_1.xml | 0 .../test/schemas/union2_1.xsd | 0 .../test/schemas/union_0_0.xml | 0 .../test/schemas/union_0_0.xsd | 0 .../test/schemas/vdv-complexTypes.xsd | 0 .../test/schemas/vdv-first0_0.xml | 0 .../test/schemas/vdv-first0_0.xsd | 0 .../test/schemas/vdv-first1_0.xml | 0 .../test/schemas/vdv-first1_0.xsd | 0 .../test/schemas/vdv-first2_0.xml | 0 .../test/schemas/vdv-first2_0.xsd | 0 .../test/schemas/vdv-first3_0.xml | 0 .../test/schemas/vdv-first3_0.xsd | 0 .../test/schemas/vdv-first4_0.xml | 0 .../test/schemas/vdv-first4_0.xsd | 0 .../test/schemas/vdv-first4_1.xml | 0 .../test/schemas/vdv-first4_2.xml | 0 .../test/schemas/vdv-first5_0.xml | 0 .../test/schemas/vdv-first5_0.xsd | 0 .../test/schemas/vdv-simpleTypes.xsd | 0 .../test/schemas/xml.xsd | 0 .../test/schemas/xsd-list-itemType_0.xml | 0 .../test/schemas/xsd-list-itemType_0.xsd | 0 .../schemas/xsd-simpleType-varieties_0.xml | 0 .../schemas/xsd-simpleType-varieties_0.xsd | 0 .../test/schematron/zvon1.sct | 0 .../test/schematron/zvon10.sct | 0 .../test/schematron/zvon10_0.xml | 0 .../test/schematron/zvon10_1.xml | 0 .../test/schematron/zvon11.sct | 0 .../test/schematron/zvon11_0.xml | 0 .../test/schematron/zvon11_1.xml | 0 .../test/schematron/zvon11_2.xml | 0 .../test/schematron/zvon11_3.xml | 0 .../test/schematron/zvon12.sct | 0 .../test/schematron/zvon12_0.xml | 0 .../test/schematron/zvon12_1.xml | 0 .../test/schematron/zvon12_2.xml | 0 .../test/schematron/zvon13.sct | 0 .../test/schematron/zvon13_0.xml | 0 .../test/schematron/zvon13_1.xml | 0 .../test/schematron/zvon13_2.xml | 0 .../test/schematron/zvon14.sct | 0 .../test/schematron/zvon14_0.xml | 0 .../test/schematron/zvon15.sct | 0 .../test/schematron/zvon15_0.xml | 0 .../test/schematron/zvon1_0.xml | 0 .../test/schematron/zvon1_1.xml | 0 .../test/schematron/zvon2.sct | 0 .../test/schematron/zvon2_0.xml | 0 .../test/schematron/zvon2_1.xml | 0 .../test/schematron/zvon2_2.xml | 0 .../test/schematron/zvon3.sct | 0 .../test/schematron/zvon3_0.xml | 0 .../test/schematron/zvon4.sct | 0 .../test/schematron/zvon4_0.xml | 0 .../test/schematron/zvon4_1.xml | 0 .../test/schematron/zvon5.sct | 0 .../test/schematron/zvon5_0.xml | 0 .../test/schematron/zvon5_1.xml | 0 .../test/schematron/zvon5_2.xml | 0 .../test/schematron/zvon6.sct | 0 .../test/schematron/zvon6_0.xml | 0 .../test/schematron/zvon6_1.xml | 0 .../test/schematron/zvon6_2.xml | 0 .../test/schematron/zvon7.sct | 0 .../test/schematron/zvon7_0.xml | 0 .../test/schematron/zvon7_1.xml | 0 .../test/schematron/zvon7_2.xml | 0 .../test/schematron/zvon7_3.xml | 0 .../test/schematron/zvon7_4.xml | 0 .../test/schematron/zvon8.sct | 0 .../test/schematron/zvon8_0.xml | 0 .../test/schematron/zvon8_1.xml | 0 .../test/schematron/zvon8_2.xml | 0 .../test/schematron/zvon9.sct | 0 .../test/schematron/zvon9_0.xml | 0 .../test/schematron/zvon9_1.xml | 0 .../test/schematron/zvon9_2.xml | 0 .../test/scripts/base.script | 0 .../test/scripts/base.xml | 0 .../test/scripts/base2.script | 0 .../test/scripts/base2.xml | 0 .../test/scripts/set1.script | 0 .../test/scripts/set1.xml | 0 .../test/scripts/set3.script | 0 .../test/scripts/set3.xml | 0 .../test/scripts/set4.script | 0 .../test/scripts/set4.xml | 0 .../test/slashdot.rdf | 0 .../test/slashdot.xml | 0 .../test/slashdot16.xml | Bin .../test/svg1 | 0 .../test/svg2 | 0 .../test/svg3 | 0 .../test/text-4-byte-UTF-16-BE-offset.xml | Bin 0 -> 4244 bytes .../test/text-4-byte-UTF-16-BE.xml | Bin 0 -> 4238 bytes .../test/text-4-byte-UTF-16-LE-offset.xml | Bin 0 -> 4244 bytes .../test/text-4-byte-UTF-16-LE.xml | Bin 0 -> 4238 bytes .../test/threads/a.example.org.xml | 0 .../test/threads/a/a.dtd | 0 .../test/threads/abc.dtd | 0 .../test/threads/abc.xml | 0 .../test/threads/acb.dtd | 0 .../test/threads/acb.xml | 0 .../test/threads/b.example.org.xml | 0 .../test/threads/b/b.dtd | 0 .../test/threads/bac.dtd | 0 .../test/threads/bac.xml | 0 .../test/threads/bca.dtd | 0 .../test/threads/bca.xml | 0 .../test/threads/c.example.org.xml | 0 .../test/threads/c/c.dtd | 0 .../test/threads/cab.dtd | 0 .../test/threads/cab.xml | 0 .../test/threads/cba.dtd | 0 .../test/threads/cba.xml | 0 .../test/threads/complex.xml | 0 .../test/threads/example.org.xml | 0 .../test/threads/invalid.xml | 0 .../test/title.xml | 0 .../test/tstblanks.xml | 0 .../test/utf16bebom.xml | Bin .../test/utf16bom.xml | Bin .../test/utf16lebom.xml | Bin .../test/utf8bom.xml | 0 .../test/valid/127772.xml | 0 .../test/valid/694228.xml | 0 .../test/valid/737840.xml | 0 .../test/valid/766956.xml | 0 .../test/valid/781333.xml | 0 .../test/valid/REC-xml-19980210.xml | 0 .../test/valid/UTF16Entity.xml | 0 .../test/valid/cond_sect1.xml | 0 .../test/valid/cond_sect2.xml | 0 .../test/valid/dia.xml | 0 .../test/valid/dtds/127772.dtd | 0 .../test/valid/dtds/694228.dtd | 0 .../test/valid/dtds/737840.ent | 0 .../test/valid/dtds/766956.dtd | 0 .../test/valid/dtds/NewsMLv1.2.dtd} | 1311 +- .../test/valid/dtds/cond_sect1.dtd | 0 .../test/valid/dtds/cond_sect2.dtd | 0 .../test/valid/dtds/destfoo.ent | 0 .../test/valid/dtds/external.ent | 0 .../test/valid/dtds/external2.ent | 0 .../test/valid/dtds/nitf-2-5.dtd | 0 .../test/valid/dtds/notes.dtd | 0 .../test/valid/dtds/objednavka.dtd | 0 .../test/valid/dtds/pe-test.dtd | 3 + .../test/valid/dtds/spec.dtd | 0 .../test/valid/dtds/utf16b.ent | Bin .../test/valid/dtds/utf16l.ent | Bin .../test/valid/dtds/xhtml-lat1.ent | 0 .../test/valid/dtds/xhtml-special.ent | 0 .../test/valid/dtds/xhtml-symbol.ent | 0 .../test/valid/dtds/xhtml.cat | 0 .../test/valid/dtds/xhtml1-frameset.dtd | 0 .../test/valid/dtds/xhtml1-strict.dtd | 0 .../test/valid/dtds/xhtml1-transitional.dtd | 0 .../test/valid/dtds/xhtml1.dcl | 0 .../test/valid/dtds/xmlspec.dtd | 0 .../test/valid/id1.xml | 0 .../test/valid/id2.xml | 0 .../test/valid/id3.xml | 0 .../test/valid/index.xml | 2 +- .../test/valid/mixed_ns.xml | 0 .../test/valid/notes.xml | 0 .../test/valid/ns.xml | 0 .../test/valid/ns2.xml | 0 .../test/valid/objednavka.xml | 0 .../libxml2-v2.10.x/test/valid/pe-test.xml | 2 + .../test/valid/rss.xml | 0 .../test/valid/t10.xml | 0 .../test/valid/t11.xml | 0 .../test/valid/t4.dtd | 0 .../test/valid/t4.xml | 0 .../test/valid/t4a.dtd | 0 .../test/valid/t4a.xml | 0 .../test/valid/t6.dtd | 0 .../test/valid/t6.xml | 0 .../test/valid/t8.xml | 0 .../test/valid/t8a.xml | 0 .../test/valid/t9.xml | 0 .../test/valid/t9a.xml | 0 .../test/valid/xhtml1.xhtml | 0 .../test/valid/xlink.xml | 0 .../test/wap.xml | 0 .../test/warning/ent8 | 0 .../test/warning/ent9 | 0 .../test/winblanks.xml | 0 .../test/wml.xml | 0 .../test/xhtml1 | 0 .../test/xhtmlcomp | 0 .../test/xml1 | 0 .../test/xml2 | 0 .../test/xmlid/id_err1.xml | 0 .../test/xmlid/id_err2.xml | 0 .../test/xmlid/id_tst1.xml | 0 .../test/xmlid/id_tst2.xml | 0 .../test/xmlid/id_tst3.xml | 0 .../test/xmlid/id_tst4.xml | 0 .../test/xsdtest/xsdtest.xml | 5 + .../test/xsdtest/xsdtest.xsl | 0 .../test/xsdtest/xsdtestsuite.xml | 0 .../testAutomata.c | 4 +- .../testModule.c | 0 .../testOOM.c | 12 - .../testOOMlib.c | 3 - .../testOOMlib.h | 6 +- .../testThreads.c | 0 .../testapi.c | 1589 +- .../testchar.c | 177 +- .../testdict.c | 0 .../testdso.c | 0 .../testlimits.c | 2 +- .../testrecurse.c | 6 +- .../threads.c | 48 +- .../timsort.h | 0 .../tree.c | 335 +- .../trio.c | 3 - .../trio.h | 0 .../triodef.h | 0 .../trionan.c | 0 .../trionan.h | 0 .../triop.h | 0 .../triostr.c | 0 .../triostr.h | 0 .../{libxml2-v2.9.x => libxml2-v2.10.x}/uri.c | 23 +- .../valid.c | 141 +- .../vms/build_libxml.com | 3 +- .../vms/config.vms | 67 - .../vms/diffs.vms | 0 .../vms/readme.vms | 0 .../win32/Makefile.bcb | 35 +- .../win32/Makefile.mingw | 50 +- .../win32/Makefile.msvc | 98 +- .../win32/Readme.txt | 0 .../win32/configure.js | 38 +- .../win32/defgen.xsl | 29 +- .../win32/libxml2.def.src | 47 +- .../win32/libxml2.rc | 2 +- .../xinclude.c | 52 +- .../xlink.c | 18 - .../xml2-config.in | 4 +- .../xmlIO.c | 102 +- .../xmlcatalog.c | 40 +- .../xmllint.c | 224 +- .../xmlmemory.c | 41 +- .../xmlmodule.c | 11 +- .../xmlreader.c | 210 +- .../xmlregexp.c | 107 +- .../xmlsave.c | 39 +- .../xmlschemas.c | 54 +- .../xmlschemastypes.c | 40 +- .../xmlstring.c | 81 +- .../xmlunicode.c | 62 +- .../xmlwriter.c | 6 +- .../xpath.c | 238 +- .../xpointer.c | 101 +- .../xstc/Makefile.am | 1 - .../xstc/fixup-tests.py | 2 +- .../xstc/xstc-to-python.xsl | 2 +- .../xstc/xstc.py | 8 +- .../xzlib.c | 15 +- .../xzlib.h | 0 .../libs/libxml2/libxml2-v2.9.x/DOCBparser.c | 305 - .../libxml2/libxml2-v2.9.x/INSTALL.libxml2 | 51 - trunk/libs/libxml2/libxml2-v2.9.x/MAINTAINERS | 9 - trunk/libs/libxml2/libxml2-v2.9.x/Makefile.am | 1327 - .../libs/libxml2/libxml2-v2.9.x/Makefile.win | 34 - trunk/libs/libxml2/libxml2-v2.9.x/README | 40 - .../libxml2/libxml2-v2.9.x/VxWorks/README | 86 - .../libxml2/libxml2-v2.9.x/VxWorks/build.sh | 85 - .../libs/libxml2/libxml2-v2.9.x/acinclude.m4 | 28 - .../libxml2-v2.9.x/bakefile/Bakefiles.bkgen | 15 - .../libxml2-v2.9.x/bakefile/Readme.txt | 92 - .../libxml2-v2.9.x/bakefile/libxml2.bkl | 745 - .../check-xinclude-test-suite.py | 221 - .../libxml2/libxml2-v2.9.x/doc/APIchunk0.html | 301 - .../libxml2/libxml2-v2.9.x/doc/APIchunk1.html | 382 - .../libxml2-v2.9.x/doc/APIchunk10.html | 675 - .../libxml2-v2.9.x/doc/APIchunk11.html | 334 - .../libxml2-v2.9.x/doc/APIchunk12.html | 926 - .../libxml2-v2.9.x/doc/APIchunk13.html | 655 - .../libxml2-v2.9.x/doc/APIchunk14.html | 472 - .../libxml2-v2.9.x/doc/APIchunk15.html | 456 - .../libxml2-v2.9.x/doc/APIchunk16.html | 374 - .../libxml2-v2.9.x/doc/APIchunk17.html | 515 - .../libxml2-v2.9.x/doc/APIchunk18.html | 459 - .../libxml2-v2.9.x/doc/APIchunk19.html | 372 - .../libxml2/libxml2-v2.9.x/doc/APIchunk2.html | 416 - .../libxml2-v2.9.x/doc/APIchunk20.html | 330 - .../libxml2-v2.9.x/doc/APIchunk21.html | 397 - .../libxml2-v2.9.x/doc/APIchunk22.html | 596 - .../libxml2-v2.9.x/doc/APIchunk23.html | 670 - .../libxml2-v2.9.x/doc/APIchunk24.html | 999 - .../libxml2-v2.9.x/doc/APIchunk25.html | 446 - .../libxml2-v2.9.x/doc/APIchunk26.html | 315 - .../libxml2-v2.9.x/doc/APIchunk27.html | 347 - .../libxml2-v2.9.x/doc/APIchunk28.html | 569 - .../libxml2-v2.9.x/doc/APIchunk29.html | 132 - .../libxml2/libxml2-v2.9.x/doc/APIchunk3.html | 360 - .../libxml2/libxml2-v2.9.x/doc/APIchunk4.html | 351 - .../libxml2/libxml2-v2.9.x/doc/APIchunk5.html | 293 - .../libxml2/libxml2-v2.9.x/doc/APIchunk6.html | 296 - .../libxml2/libxml2-v2.9.x/doc/APIchunk7.html | 330 - .../libxml2/libxml2-v2.9.x/doc/APIchunk8.html | 308 - .../libxml2/libxml2-v2.9.x/doc/APIchunk9.html | 273 - .../libxml2-v2.9.x/doc/APIconstructors.html | 595 - .../libxml2/libxml2-v2.9.x/doc/APIfiles.html | 3597 -- .../libxml2-v2.9.x/doc/APIfunctions.html | 2348 -- .../libxml2-v2.9.x/doc/APIsymbols.html | 3593 -- .../libxml2/libxml2-v2.9.x/doc/ChangeLog.awk | 49 - .../libxml2/libxml2-v2.9.x/doc/ChangeLog.xsl | 117 - trunk/libs/libxml2/libxml2-v2.9.x/doc/DOM.fig | 64 - trunk/libs/libxml2/libxml2-v2.9.x/doc/DOM.gif | Bin 3166 -> 0 bytes .../libs/libxml2/libxml2-v2.9.x/doc/DOM.html | 17 - .../libs/libxml2/libxml2-v2.9.x/doc/FAQ.html | 299 - .../doc/Libxml2-Logo-180x168.gif | Bin 8195 -> 0 bytes .../libxml2-v2.9.x/doc/Libxml2-Logo-90x34.gif | Bin 3070 -> 0 bytes .../libxml2/libxml2-v2.9.x/doc/Makefile.am | 356 - .../libxml2/libxml2-v2.9.x/doc/README.docs | 24 - .../libxml2/libxml2-v2.9.x/doc/XMLinfo.html | 35 - .../libs/libxml2/libxml2-v2.9.x/doc/XSLT.html | 13 - trunk/libs/libxml2/libxml2-v2.9.x/doc/api.xsl | 394 - .../libxml2-v2.9.x/doc/architecture.html | 24 - .../libs/libxml2/libxml2-v2.9.x/doc/bugs.html | 70 - .../libxml2/libxml2-v2.9.x/doc/catalog.fig | 62 - .../libxml2/libxml2-v2.9.x/doc/catalog.gif | Bin 6105 -> 0 bytes .../libxml2/libxml2-v2.9.x/doc/catalog.html | 261 - .../libxml2/libxml2-v2.9.x/doc/contribs.html | 41 - .../libxml2-v2.9.x/doc/devhelp/general.html | 38 - .../libxml2-v2.9.x/doc/devhelp/index.html | 67 - .../doc/devhelp/libxml2-DOCBparser.html | 138 - .../doc/devhelp/libxml2-HTMLparser.html | 373 - .../doc/devhelp/libxml2-HTMLtree.html | 172 - .../doc/devhelp/libxml2-SAX.html | 243 - .../doc/devhelp/libxml2-SAX2.html | 247 - .../doc/devhelp/libxml2-c14n.html | 91 - .../doc/devhelp/libxml2-catalog.html | 278 - .../doc/devhelp/libxml2-chvalid.html | 241 - .../doc/devhelp/libxml2-debugXML.html | 225 - .../doc/devhelp/libxml2-dict.html | 134 - .../doc/devhelp/libxml2-encoding.html | 226 - .../doc/devhelp/libxml2-entities.html | 166 - .../doc/devhelp/libxml2-globals.html | 383 - .../doc/devhelp/libxml2-hash.html | 219 - .../doc/devhelp/libxml2-list.html | 226 - .../doc/devhelp/libxml2-nanoftp.html | 187 - .../doc/devhelp/libxml2-nanohttp.html | 142 - .../doc/devhelp/libxml2-parser.html | 773 - .../doc/devhelp/libxml2-parserInternals.html | 688 - .../doc/devhelp/libxml2-pattern.html | 166 - .../doc/devhelp/libxml2-relaxng.html | 278 - .../doc/devhelp/libxml2-schemasInternals.html | 860 - .../doc/devhelp/libxml2-schematron.html | 166 - .../doc/devhelp/libxml2-threads.html | 161 - .../doc/devhelp/libxml2-tree.html | 1598 - .../doc/devhelp/libxml2-uri.html | 154 - .../doc/devhelp/libxml2-valid.html | 528 - .../doc/devhelp/libxml2-xinclude.html | 169 - .../doc/devhelp/libxml2-xlink.html | 160 - .../doc/devhelp/libxml2-xmlIO.html | 352 - .../doc/devhelp/libxml2-xmlautomata.html | 176 - .../doc/devhelp/libxml2-xmlexports.html | 87 - .../doc/devhelp/libxml2-xmlmemory.html | 186 - .../doc/devhelp/libxml2-xmlmodule.html | 97 - .../doc/devhelp/libxml2-xmlreader.html | 565 - .../doc/devhelp/libxml2-xmlregexp.html | 280 - .../doc/devhelp/libxml2-xmlsave.html | 133 - .../doc/devhelp/libxml2-xmlschemas.html | 314 - .../doc/devhelp/libxml2-xmlschemastypes.html | 237 - .../doc/devhelp/libxml2-xmlstring.html | 217 - .../doc/devhelp/libxml2-xmlunicode.html | 887 - .../doc/devhelp/libxml2-xmlversion.html | 292 - .../doc/devhelp/libxml2-xmlwriter.html | 479 - .../doc/devhelp/libxml2-xpath.html | 547 - .../doc/devhelp/libxml2-xpathInternals.html | 787 - .../doc/devhelp/libxml2-xpointer.html | 171 - .../doc/devhelp/libxml2.devhelp | 3580 -- .../libxml2/libxml2-v2.9.x/doc/docdescr.doc | 100 - .../libs/libxml2/libxml2-v2.9.x/doc/docs.html | 34 - .../libxml2/libxml2-v2.9.x/doc/downloads.html | 40 - .../libxml2/libxml2-v2.9.x/doc/elfgcchack.xsl | 160 - .../libxml2/libxml2-v2.9.x/doc/encoding.html | 217 - .../libxml2/libxml2-v2.9.x/doc/entities.html | 64 - .../libxml2/libxml2-v2.9.x/doc/epatents.png | Bin 1901 -> 0 bytes .../libxml2/libxml2-v2.9.x/doc/example.html | 187 - .../libxml2-v2.9.x/doc/examples/examples.xsl | 174 - .../libxml2-v2.9.x/doc/examples/index.html | 14 - .../libxml2-v2.9.x/doc/examples/index.py | 315 - .../libxml2-v2.9.x/doc/examples/io1.res | 5 - .../libxml2-v2.9.x/doc/examples/reader1.res | 14 - .../libxml2-v2.9.x/doc/examples/reader3.res | 13 - .../libxml2-v2.9.x/doc/examples/reader4.res | 3 - .../libxml2-v2.9.x/doc/examples/tree1.res | 4 - .../libxml2-v2.9.x/doc/examples/tree2.res | 18 - .../libxml2-v2.9.x/doc/examples/tst.xml | 7 - .../libxml2-v2.9.x/doc/examples/writer.xml | 2 - .../libxml2-v2.9.x/doc/examples/xpath1.res | 5 - .../libxml2-v2.9.x/doc/examples/xpath2.res | 30 - .../libxml2/libxml2-v2.9.x/doc/favicon.ico | Bin 1107 -> 0 bytes .../libxml2/libxml2-v2.9.x/doc/gnome2.png | Bin 3802 -> 0 bytes .../libxml2-v2.9.x/doc/guidelines.html | 374 - .../libs/libxml2/libxml2-v2.9.x/doc/help.html | 26 - .../libxml2-v2.9.x/doc/html/book1.html | 13 - .../libxml2/libxml2-v2.9.x/doc/html/home.png | Bin 654 -> 0 bytes .../libxml2-v2.9.x/doc/html/index.html | 13 - .../libxml2-v2.9.x/doc/html/index.sgml | 609 - .../libxml2/libxml2-v2.9.x/doc/html/left.png | Bin 459 -> 0 bytes .../doc/html/libxml-DOCBparser.html | 51 - .../doc/html/libxml-HTMLparser.html | 184 - .../doc/html/libxml-HTMLtree.html | 73 - .../libxml2-v2.9.x/doc/html/libxml-SAX.html | 125 - .../libxml2-v2.9.x/doc/html/libxml-SAX2.html | 128 - .../libxml2-v2.9.x/doc/html/libxml-c14n.html | 38 - .../doc/html/libxml-catalog.html | 142 - .../doc/html/libxml-chvalid.html | 72 - .../doc/html/libxml-debugXML.html | 120 - .../libxml2-v2.9.x/doc/html/libxml-dict.html | 58 - .../doc/html/libxml-encoding.html | 128 - .../doc/html/libxml-entities.html | 79 - .../doc/html/libxml-globals.html | 152 - .../libxml2-v2.9.x/doc/html/libxml-hash.html | 119 - .../libxml2-v2.9.x/doc/html/libxml-lib.html | 13 - .../libxml2-v2.9.x/doc/html/libxml-list.html | 120 - .../doc/html/libxml-nanoftp.html | 94 - .../doc/html/libxml-nanohttp.html | 65 - .../doc/html/libxml-parser.html | 563 - .../doc/html/libxml-parserInternals.html | 322 - .../doc/html/libxml-pattern.html | 76 - .../doc/html/libxml-relaxng.html | 162 - .../doc/html/libxml-schemasInternals.html | 373 - .../doc/html/libxml-schematron.html | 81 - .../doc/html/libxml-threads.html | 72 - .../libxml2-v2.9.x/doc/html/libxml-tree.html | 991 - .../libxml2-v2.9.x/doc/html/libxml-uri.html | 73 - .../libxml2-v2.9.x/doc/html/libxml-valid.html | 289 - .../doc/html/libxml-xinclude.html | 59 - .../libxml2-v2.9.x/doc/html/libxml-xlink.html | 82 - .../libxml2-v2.9.x/doc/html/libxml-xmlIO.html | 215 - .../doc/html/libxml-xmlautomata.html | 85 - .../doc/html/libxml-xmlerror.html | 865 - .../doc/html/libxml-xmlexports.html | 20 - .../doc/html/libxml-xmlmemory.html | 107 - .../doc/html/libxml-xmlmodule.html | 38 - .../doc/html/libxml-xmlreader.html | 330 - .../doc/html/libxml-xmlregexp.html | 143 - .../doc/html/libxml-xmlsave.html | 60 - .../doc/html/libxml-xmlschemas.html | 185 - .../doc/html/libxml-xmlschemastypes.html | 123 - .../doc/html/libxml-xmlstring.html | 108 - .../doc/html/libxml-xmlunicode.html | 512 - .../doc/html/libxml-xmlversion.html | 63 - .../doc/html/libxml-xmlwriter.html | 261 - .../libxml2-v2.9.x/doc/html/libxml-xpath.html | 321 - .../doc/html/libxml-xpathInternals.html | 394 - .../doc/html/libxml-xpointer.html | 83 - .../libxml2-v2.9.x/doc/html/libxml.devhelp | 618 - .../libxml2/libxml2-v2.9.x/doc/html/right.png | Bin 472 -> 0 bytes .../libxml2/libxml2-v2.9.x/doc/html/up.png | Bin 406 -> 0 bytes .../libxml2/libxml2-v2.9.x/doc/index.html | 77 - .../libs/libxml2/libxml2-v2.9.x/doc/index.py | 1258 - .../libxml2/libxml2-v2.9.x/doc/interface.html | 59 - .../libxml2/libxml2-v2.9.x/doc/intro.html | 32 - .../libxml2/libxml2-v2.9.x/doc/library.html | 158 - .../libxml2/libxml2-v2.9.x/doc/libxml.fig | 72 - .../libxml2/libxml2-v2.9.x/doc/libxml.gif | Bin 7692 -> 0 bytes .../libxml2-v2.9.x/doc/libxml2-refs.xml | 32004 ---------------- .../libxml2/libxml2-v2.9.x/doc/libxml2.xsa | 149 - .../libxml2-v2.9.x/doc/namespaces.html | 50 - .../libxml2/libxml2-v2.9.x/doc/newapi.xsl | 766 - .../libs/libxml2/libxml2-v2.9.x/doc/news.html | 3213 -- .../libs/libxml2/libxml2-v2.9.x/doc/news.xsl | 44 - .../libxml2/libxml2-v2.9.x/doc/python.html | 254 - .../libxml2/libxml2-v2.9.x/doc/queries.py | 119 - .../libxml2/libxml2-v2.9.x/doc/redhat.gif | Bin 697 -> 0 bytes .../libxml2/libxml2-v2.9.x/doc/search.php | 477 - .../libxml2/libxml2-v2.9.x/doc/searches.html | 61 - .../libxml2/libxml2-v2.9.x/doc/searches.xsl | 97 - .../doc/searches/AllQueries-20040408.xml | 52 - .../doc/searches/Queries-20040408.xml | 52 - .../libs/libxml2/libxml2-v2.9.x/doc/site.xsl | 741 - .../libxml2-v2.9.x/doc/smallfootonly.gif | Bin 2772 -> 0 bytes .../libxml2/libxml2-v2.9.x/doc/structure.fig | 242 - .../libxml2/libxml2-v2.9.x/doc/structure.gif | Bin 5559 -> 0 bytes .../libxml2/libxml2-v2.9.x/doc/threads.html | 30 - .../libs/libxml2/libxml2-v2.9.x/doc/tree.html | 53 - .../doc/tutorial/xmltutorial.pdf | Bin 51709 -> 0 bytes .../libxml2/libxml2-v2.9.x/doc/upgrade.html | 112 - trunk/libs/libxml2/libxml2-v2.9.x/doc/w3c.png | Bin 2028 -> 0 bytes .../libs/libxml2/libxml2-v2.9.x/doc/wiki.xsl | 589 - .../libs/libxml2/libxml2-v2.9.x/doc/xml.html | 6860 ---- .../libxml2/libxml2-v2.9.x/doc/xmldtd.html | 107 - .../libxml2/libxml2-v2.9.x/doc/xmlio.html | 141 - .../libxml2/libxml2-v2.9.x/doc/xmlmem.html | 122 - .../libxml2/libxml2-v2.9.x/doc/xmlreader.html | 475 - trunk/libs/libxml2/libxml2-v2.9.x/doc/xsa.xsl | 54 - .../libs/libxml2/libxml2-v2.9.x/elfgcchack.h | 17818 --------- .../libxml2-v2.9.x/example/Makefile.am | 7 - .../include/libxml/DOCBparser.h | 96 - .../include/libxml/xmlwin32version.h | 239 - .../include/libxml/xmlwin32version.h.in | 322 - .../libxml2-v2.9.x/include/win32config.h | 122 - .../libxml-2.0-uninstalled.pc.in | 12 - trunk/libs/libxml2/libxml2-v2.9.x/libxml.3 | 71 - .../libs/libxml2/libxml2-v2.9.x/libxml2.doap | 19 - .../libs/libxml2/libxml2-v2.9.x/macos/README | 8 - .../macos/libxml2.mcp.xml.sit.hqx | 1 - .../libxml2-v2.9.x/macos/src/XMLTestPrefix.h | 1 - .../libxml2-v2.9.x/macos/src/XMLTestPrefix2.h | 1 - .../libxml2-v2.9.x/macos/src/config-mac.h | 150 - .../macos/src/libxml2_GUSIConfig.cp | 1 - .../libxml2-v2.9.x/macos/src/macos_main.c | 1 - .../libxml2/libxml2-v2.9.x/regressions.py | 350 - .../libxml2/libxml2-v2.9.x/regressions.xml | 226 - .../libxml2-v2.9.x/result/HTML/53867.html.err | 0 .../libxml2-v2.9.x/result/HTML/Down.html.err | 0 .../result/HTML/attrents.html.err | 0 .../result/HTML/autoclose.html.err | 0 .../result/HTML/autoclose2.html.err | 0 .../result/HTML/autoclose3.html.err | 0 .../result/HTML/cf_128.html.err | 0 .../result/HTML/chunked_attr.html.err | 0 .../result/HTML/entities2.html.err | 0 .../result/HTML/html5_enc.html.err | 0 .../result/HTML/liclose.html.err | 0 .../libxml2-v2.9.x/result/HTML/lt.html.err | 0 .../result/HTML/noscript.html.err | 0 .../libxml2-v2.9.x/result/HTML/pre.html.err | 0 .../result/HTML/python.html.err | 0 .../libxml2-v2.9.x/result/HTML/reg1.html.err | 0 .../libxml2-v2.9.x/result/HTML/reg2.html.err | 0 .../libxml2-v2.9.x/result/HTML/reg3.html.err | 0 .../result/HTML/repeat.html.err | 0 .../result/HTML/script.html.err | 0 .../result/HTML/script2.html.err | 0 .../libxml2-v2.9.x/result/HTML/test2.html.err | 0 .../libxml2-v2.9.x/result/SVG/bike-errors.xml | 0 .../libxml2-v2.9.x/result/SVG/bike.xml | 44 - .../libxml2-v2.9.x/result/SVG/flower2.xml | 10 - .../libxml2-v2.9.x/result/SVG/parentns.xml | 9 - .../libxml2-v2.9.x/result/SVG/richdesc.xml | 11 - .../libxml2-v2.9.x/result/SVG/transform.xml | 20 - .../result/SVG/viewport-transform.xml | 36 - .../libxml2-v2.9.x/result/SVG/viewport.xml | 8 - .../libs/libxml2/libxml2-v2.9.x/result/VC/NS1 | 0 .../libxml2/libxml2-v2.9.x/result/VC/NS1.rdr | 0 .../result/XInclude/docids.xml.err | 0 .../result/XInclude/fallback.xml.err | 0 .../result/XInclude/fallback2.xml.err | 0 .../result/XInclude/fallback3.xml.err | 0 .../result/XInclude/fallback4.xml.err | 0 .../result/XInclude/fallback6.xml.rdr | 0 .../result/XInclude/include.xml.err | 0 .../result/XInclude/nodes.xml.err | 0 .../result/XInclude/nodes2.xml.err | 0 .../result/XInclude/nodes3.xml.err | 1 - .../result/XInclude/recursive.xml.err | 0 .../result/XInclude/tstencoding.xml.err | 0 .../result/XInclude/txtinclude.xml.err | 0 .../exc-without-comments/merlin-c14n-two-15 | 0 .../exc-without-comments/merlin-c14n-two-16 | 0 .../exc-without-comments/merlin-c14n-two-25 | 0 .../libxml2-v2.9.x/result/errors/754946.xml | 0 .../libxml2-v2.9.x/result/errors/754947.xml | 0 .../libxml2-v2.9.x/result/errors/758588.xml | 0 .../libxml2-v2.9.x/result/errors/759020.xml | 0 .../libxml2-v2.9.x/result/errors/759398.xml | 0 .../libxml2-v2.9.x/result/errors/759573-2.xml | 0 .../libxml2-v2.9.x/result/errors/759573.xml | 0 .../libxml2-v2.9.x/result/errors/759579.xml | 0 .../libxml2-v2.9.x/result/errors/attr1.xml | 0 .../libxml2-v2.9.x/result/errors/attr2.xml | 0 .../libxml2-v2.9.x/result/errors/attr4.xml | 0 .../libxml2-v2.9.x/result/errors/cdata.xml | 0 .../libxml2-v2.9.x/result/errors/charref1.xml | 0 .../libxml2-v2.9.x/result/errors/comment1.xml | 0 .../libxml2-v2.9.x/result/errors/content1.xml | 0 .../result/errors/extparsedent.xml.err | 0 .../result/errors/extparsedent.xml.str | 0 .../libxml2-v2.9.x/result/errors/name.xml | 0 .../libxml2-v2.9.x/result/errors/name2.xml | 0 .../result/errors/rec_ext_ent.xml.err | 0 .../result/errors/rec_ext_ent.xml.str | 0 .../libxml2-v2.9.x/result/errors10/781205.xml | 0 .../libxml2-v2.9.x/result/errors10/781361.xml | 0 .../libxml2/libxml2-v2.9.x/result/example.dtd | 0 .../result/namespaces/err_0.xml.err | 0 .../result/namespaces/err_10.xml | 0 .../result/namespaces/err_11.xml | 0 .../libxml2-v2.9.x/result/relaxng/302836_0 | 0 .../libxml2-v2.9.x/result/relaxng/302836_err | 1 - .../result/relaxng/302836_valid | 0 .../libxml2-v2.9.x/result/relaxng/307377_0 | 0 .../libxml2-v2.9.x/result/relaxng/307377_1 | 0 .../libxml2-v2.9.x/result/relaxng/307377_2 | 0 .../libxml2-v2.9.x/result/relaxng/307377_err | 1 - .../result/relaxng/307377_valid | 0 .../libxml2-v2.9.x/result/relaxng/492317_0 | 0 .../libxml2-v2.9.x/result/relaxng/492317_1 | 0 .../libxml2-v2.9.x/result/relaxng/492317_2 | 0 .../libxml2-v2.9.x/result/relaxng/492317_err | 1 - .../result/relaxng/492317_valid | 0 .../libxml2-v2.9.x/result/relaxng/558452_0 | 0 .../libxml2-v2.9.x/result/relaxng/558452_1 | 0 .../libxml2-v2.9.x/result/relaxng/558452_2 | 0 .../libxml2-v2.9.x/result/relaxng/558452_3 | 0 .../libxml2-v2.9.x/result/relaxng/558452_4 | 0 .../libxml2-v2.9.x/result/relaxng/558452_err | 1 - .../result/relaxng/558452_valid | 0 .../libxml2-v2.9.x/result/relaxng/565219_0 | 0 .../libxml2-v2.9.x/result/relaxng/565219_1 | 0 .../libxml2-v2.9.x/result/relaxng/565219_2 | 0 .../libxml2-v2.9.x/result/relaxng/565219_err | 1 - .../result/relaxng/565219_valid | 0 .../result/relaxng/595792-ext_err | 1 - .../result/relaxng/595792-ext_valid | 0 .../libxml2-v2.9.x/result/relaxng/595792_0 | 0 .../libxml2-v2.9.x/result/relaxng/595792_err | 1 - .../result/relaxng/595792_valid | 0 .../libxml2-v2.9.x/result/relaxng/710744_1 | 0 .../libxml2-v2.9.x/result/relaxng/710744_2 | 0 .../libxml2-v2.9.x/result/relaxng/710744_err | 1 - .../result/relaxng/710744_valid | 0 .../result/relaxng/OpenDocumentSub_0 | 0 .../result/relaxng/OpenDocumentSub_err | 1 - .../result/relaxng/OpenDocumentSub_valid | 0 .../result/relaxng/addressBook_err | 1 - .../result/relaxng/addressBook_valid | 0 .../result/relaxng/ambig_name-class2_err | 1 - .../result/relaxng/ambig_name-class2_valid | 0 .../result/relaxng/ambig_name-class_err | 1 - .../result/relaxng/ambig_name-class_valid | 0 .../libxml2-v2.9.x/result/relaxng/anyName0_0 | 0 .../result/relaxng/anyName0_err | 1 - .../result/relaxng/anyName0_valid | 0 .../libxml2-v2.9.x/result/relaxng/choice0_0 | 0 .../libxml2-v2.9.x/result/relaxng/choice0_1 | 0 .../libxml2-v2.9.x/result/relaxng/choice0_2 | 0 .../libxml2-v2.9.x/result/relaxng/choice0_3 | 0 .../libxml2-v2.9.x/result/relaxng/choice0_4 | 0 .../libxml2-v2.9.x/result/relaxng/choice0_5 | 0 .../libxml2-v2.9.x/result/relaxng/choice0_6 | 0 .../libxml2-v2.9.x/result/relaxng/choice0_7 | 0 .../libxml2-v2.9.x/result/relaxng/choice0_8 | 0 .../libxml2-v2.9.x/result/relaxng/choice0_err | 1 - .../result/relaxng/choice0_valid | 0 .../libxml2-v2.9.x/result/relaxng/compare0_0 | 0 .../result/relaxng/compare0_err | 1 - .../result/relaxng/compare0_valid | 0 .../libxml2-v2.9.x/result/relaxng/comps_0 | 0 .../libxml2-v2.9.x/result/relaxng/comps_err | 1 - .../libxml2-v2.9.x/result/relaxng/comps_valid | 0 .../libxml2-v2.9.x/result/relaxng/demo2_err | 1 - .../libxml2-v2.9.x/result/relaxng/demo2_valid | 0 .../libxml2-v2.9.x/result/relaxng/demo3_err | 1 - .../libxml2-v2.9.x/result/relaxng/demo3_valid | 0 .../libxml2-v2.9.x/result/relaxng/demo_err | 1 - .../libxml2-v2.9.x/result/relaxng/demo_valid | 0 .../libxml2-v2.9.x/result/relaxng/docbook_0 | 0 .../libxml2-v2.9.x/result/relaxng/docbook_err | 1 - .../result/relaxng/docbook_valid | 0 .../libxml2-v2.9.x/result/relaxng/empty0_0 | 0 .../libxml2-v2.9.x/result/relaxng/empty0_err | 1 - .../result/relaxng/empty0_valid | 0 .../libxml2-v2.9.x/result/relaxng/empty1_0 | 0 .../libxml2-v2.9.x/result/relaxng/empty1_1 | 0 .../libxml2-v2.9.x/result/relaxng/empty1_err | 1 - .../result/relaxng/empty1_valid | 0 .../libxml2-v2.9.x/result/relaxng/include0_0 | 0 .../result/relaxng/include0_err | 1 - .../result/relaxng/include0_valid | 0 .../libxml2-v2.9.x/result/relaxng/include1_0 | 0 .../result/relaxng/include1_err | 1 - .../result/relaxng/include1_valid | 0 .../libxml2-v2.9.x/result/relaxng/inline2_err | 1 - .../result/relaxng/inline2_valid | 0 .../libxml2-v2.9.x/result/relaxng/inline3_err | 1 - .../result/relaxng/inline3_valid | 0 .../libxml2-v2.9.x/result/relaxng/inline_err | 1 - .../result/relaxng/inline_valid | 0 .../result/relaxng/interleave0_0_err | 1 - .../result/relaxng/interleave0_0_valid | 0 .../result/relaxng/interleave1_0_err | 1 - .../result/relaxng/interleave1_0_valid | 0 .../libxml2-v2.9.x/result/relaxng/libvirt_0 | 0 .../libxml2-v2.9.x/result/relaxng/libvirt_err | 1 - .../result/relaxng/libvirt_valid | 0 .../libxml2-v2.9.x/result/relaxng/list_0 | 0 .../libxml2-v2.9.x/result/relaxng/list_1 | 0 .../libxml2-v2.9.x/result/relaxng/list_err | 1 - .../libxml2-v2.9.x/result/relaxng/list_valid | 0 .../result/relaxng/pattern1_err | 1 - .../result/relaxng/pattern1_valid | 0 .../result/relaxng/pattern2_err | 1 - .../result/relaxng/pattern2_valid | 0 .../libxml2-v2.9.x/result/relaxng/pattern3_1 | 0 .../result/relaxng/pattern3_err | 1 - .../result/relaxng/pattern3_valid | 0 .../result/relaxng/proofsystem_err | 1 - .../result/relaxng/proofsystem_valid | 0 .../result/relaxng/rngbug-001_err | 1 - .../result/relaxng/rngbug-001_valid | 0 .../libxml2-v2.9.x/result/relaxng/spec1_1 | 0 .../libxml2-v2.9.x/result/relaxng/spec1_err | 1 - .../libxml2-v2.9.x/result/relaxng/spec1_valid | 0 .../libxml2-v2.9.x/result/relaxng/spec_0 | 0 .../libxml2-v2.9.x/result/relaxng/spec_err | 1 - .../libxml2-v2.9.x/result/relaxng/spec_valid | 0 .../libxml2-v2.9.x/result/relaxng/table_err | 1 - .../libxml2-v2.9.x/result/relaxng/table_valid | 0 .../result/relaxng/tutor10_10_1 | 0 .../result/relaxng/tutor10_10_err | 1 - .../result/relaxng/tutor10_10_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor10_1_1 | 0 .../libxml2-v2.9.x/result/relaxng/tutor10_1_2 | 0 .../libxml2-v2.9.x/result/relaxng/tutor10_1_3 | 0 .../libxml2-v2.9.x/result/relaxng/tutor10_1_4 | 0 .../libxml2-v2.9.x/result/relaxng/tutor10_1_5 | 0 .../libxml2-v2.9.x/result/relaxng/tutor10_1_6 | 0 .../result/relaxng/tutor10_1_err | 1 - .../result/relaxng/tutor10_1_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor10_2_1 | 0 .../libxml2-v2.9.x/result/relaxng/tutor10_2_2 | 0 .../libxml2-v2.9.x/result/relaxng/tutor10_2_3 | 0 .../libxml2-v2.9.x/result/relaxng/tutor10_2_4 | 0 .../result/relaxng/tutor10_2_err | 1 - .../result/relaxng/tutor10_2_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor10_3_1 | 0 .../result/relaxng/tutor10_3_err | 1 - .../result/relaxng/tutor10_3_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor10_4_1 | 0 .../result/relaxng/tutor10_4_err | 1 - .../result/relaxng/tutor10_4_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor10_5_1 | 0 .../result/relaxng/tutor10_5_err | 1 - .../result/relaxng/tutor10_5_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor10_6_1 | 0 .../result/relaxng/tutor10_6_err | 1 - .../result/relaxng/tutor10_6_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor10_7_1 | 0 .../libxml2-v2.9.x/result/relaxng/tutor10_7_2 | 0 .../libxml2-v2.9.x/result/relaxng/tutor10_7_3 | 0 .../result/relaxng/tutor10_7_err | 1 - .../result/relaxng/tutor10_7_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor10_8_1 | 0 .../libxml2-v2.9.x/result/relaxng/tutor10_8_2 | 0 .../libxml2-v2.9.x/result/relaxng/tutor10_8_3 | 0 .../result/relaxng/tutor10_8_err | 1 - .../result/relaxng/tutor10_8_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor10_9_1 | 0 .../result/relaxng/tutor10_9_err | 1 - .../result/relaxng/tutor10_9_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor11_1_1 | 0 .../libxml2-v2.9.x/result/relaxng/tutor11_1_2 | 0 .../libxml2-v2.9.x/result/relaxng/tutor11_1_3 | 0 .../result/relaxng/tutor11_1_err | 1 - .../result/relaxng/tutor11_1_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor11_2_1 | 0 .../libxml2-v2.9.x/result/relaxng/tutor11_2_2 | 0 .../libxml2-v2.9.x/result/relaxng/tutor11_2_3 | 0 .../result/relaxng/tutor11_2_err | 1 - .../result/relaxng/tutor11_2_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor11_3_1 | 0 .../result/relaxng/tutor11_3_err | 1 - .../result/relaxng/tutor11_3_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor11_4_1 | 0 .../result/relaxng/tutor11_4_err | 1 - .../result/relaxng/tutor11_4_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor12_1_1 | 0 .../result/relaxng/tutor12_1_err | 1 - .../result/relaxng/tutor12_1_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor13_1_1 | 0 .../result/relaxng/tutor13_1_err | 1 - .../result/relaxng/tutor13_1_valid | 0 .../result/relaxng/tutor14_1_err | 1 - .../result/relaxng/tutor14_1_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor1_1_1 | 0 .../result/relaxng/tutor1_1_err | 1 - .../result/relaxng/tutor1_1_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor1_2_1 | 0 .../result/relaxng/tutor1_2_err | 1 - .../result/relaxng/tutor1_2_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor1_3_1 | 0 .../result/relaxng/tutor1_3_err | 1 - .../result/relaxng/tutor1_3_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor1_4_1 | 0 .../result/relaxng/tutor1_4_err | 1 - .../result/relaxng/tutor1_4_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor2_1_1 | 0 .../result/relaxng/tutor2_1_err | 1 - .../result/relaxng/tutor2_1_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor3_1_1 | 0 .../libxml2-v2.9.x/result/relaxng/tutor3_1_2 | 0 .../result/relaxng/tutor3_1_err | 1 - .../result/relaxng/tutor3_1_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor3_2_1 | 0 .../result/relaxng/tutor3_2_err | 1 - .../result/relaxng/tutor3_2_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor3_3_1 | 0 .../result/relaxng/tutor3_3_err | 1 - .../result/relaxng/tutor3_3_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor3_4_1 | 0 .../result/relaxng/tutor3_4_err | 1 - .../result/relaxng/tutor3_4_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor3_5_1 | 0 .../libxml2-v2.9.x/result/relaxng/tutor3_5_2 | 0 .../result/relaxng/tutor3_5_err | 1 - .../result/relaxng/tutor3_5_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor3_6_1 | 0 .../result/relaxng/tutor3_6_err | 1 - .../result/relaxng/tutor3_6_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor3_7_1 | 0 .../result/relaxng/tutor3_7_err | 4 - .../result/relaxng/tutor3_7_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor3_8_1 | 0 .../result/relaxng/tutor3_8_err | 1 - .../result/relaxng/tutor3_8_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor3_9_1 | 0 .../result/relaxng/tutor3_9_err | 1 - .../result/relaxng/tutor3_9_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor4_1_1 | 0 .../result/relaxng/tutor4_1_err | 1 - .../result/relaxng/tutor4_1_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor4_2_1 | 0 .../result/relaxng/tutor4_2_err | 1 - .../result/relaxng/tutor4_2_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor4_3_1 | 0 .../libxml2-v2.9.x/result/relaxng/tutor4_3_2 | 0 .../libxml2-v2.9.x/result/relaxng/tutor4_3_3 | 0 .../libxml2-v2.9.x/result/relaxng/tutor4_3_4 | 0 .../libxml2-v2.9.x/result/relaxng/tutor4_3_5 | 0 .../libxml2-v2.9.x/result/relaxng/tutor4_3_6 | 0 .../result/relaxng/tutor4_3_err | 1 - .../result/relaxng/tutor4_3_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor4_4_1 | 0 .../result/relaxng/tutor4_4_err | 1 - .../result/relaxng/tutor4_4_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor5_1_1 | 0 .../result/relaxng/tutor5_1_err | 1 - .../result/relaxng/tutor5_1_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor5_2_1 | 0 .../result/relaxng/tutor5_2_err | 1 - .../result/relaxng/tutor5_2_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor5_3_1 | 0 .../result/relaxng/tutor5_3_err | 1 - .../result/relaxng/tutor5_3_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor5_4_1 | 0 .../result/relaxng/tutor5_4_err | 1 - .../result/relaxng/tutor5_4_valid | 0 .../result/relaxng/tutor5_5_err | 1 - .../result/relaxng/tutor5_5_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor6_1_1 | 0 .../libxml2-v2.9.x/result/relaxng/tutor6_1_2 | 0 .../libxml2-v2.9.x/result/relaxng/tutor6_1_3 | 0 .../libxml2-v2.9.x/result/relaxng/tutor6_1_4 | 0 .../libxml2-v2.9.x/result/relaxng/tutor6_1_5 | 0 .../result/relaxng/tutor6_1_err | 1 - .../result/relaxng/tutor6_1_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor6_2_1 | 0 .../libxml2-v2.9.x/result/relaxng/tutor6_2_2 | 0 .../libxml2-v2.9.x/result/relaxng/tutor6_2_3 | 0 .../libxml2-v2.9.x/result/relaxng/tutor6_2_4 | 0 .../result/relaxng/tutor6_2_err | 1 - .../result/relaxng/tutor6_2_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor6_3_1 | 0 .../result/relaxng/tutor6_3_err | 1 - .../result/relaxng/tutor6_3_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor7_1_1 | 0 .../libxml2-v2.9.x/result/relaxng/tutor7_1_2 | 0 .../libxml2-v2.9.x/result/relaxng/tutor7_1_3 | 0 .../libxml2-v2.9.x/result/relaxng/tutor7_1_4 | 0 .../result/relaxng/tutor7_1_err | 1 - .../result/relaxng/tutor7_1_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor7_2_1 | 0 .../libxml2-v2.9.x/result/relaxng/tutor7_2_2 | 0 .../libxml2-v2.9.x/result/relaxng/tutor7_2_3 | 0 .../libxml2-v2.9.x/result/relaxng/tutor7_2_4 | 0 .../result/relaxng/tutor7_2_err | 1 - .../result/relaxng/tutor7_2_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor7_3_1 | 0 .../libxml2-v2.9.x/result/relaxng/tutor7_3_2 | 0 .../libxml2-v2.9.x/result/relaxng/tutor7_3_3 | 0 .../libxml2-v2.9.x/result/relaxng/tutor7_3_4 | 0 .../libxml2-v2.9.x/result/relaxng/tutor7_3_5 | 0 .../result/relaxng/tutor7_3_err | 1 - .../result/relaxng/tutor7_3_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor8_1_1 | 0 .../libxml2-v2.9.x/result/relaxng/tutor8_1_2 | 0 .../result/relaxng/tutor8_1_err | 1 - .../result/relaxng/tutor8_1_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor8_2_1 | 0 .../libxml2-v2.9.x/result/relaxng/tutor8_2_2 | 0 .../libxml2-v2.9.x/result/relaxng/tutor8_2_3 | 0 .../libxml2-v2.9.x/result/relaxng/tutor8_2_4 | 0 .../libxml2-v2.9.x/result/relaxng/tutor8_2_5 | 0 .../libxml2-v2.9.x/result/relaxng/tutor8_2_6 | 0 .../result/relaxng/tutor8_2_err | 1 - .../result/relaxng/tutor8_2_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor8_3_1 | 0 .../result/relaxng/tutor8_3_err | 1 - .../result/relaxng/tutor8_3_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor9_10_1 | 0 .../result/relaxng/tutor9_10_err | 1 - .../result/relaxng/tutor9_10_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor9_11_1 | 0 .../result/relaxng/tutor9_11_err | 1 - .../result/relaxng/tutor9_11_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor9_12_1 | 0 .../result/relaxng/tutor9_12_err | 1 - .../result/relaxng/tutor9_12_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor9_1_1 | 0 .../result/relaxng/tutor9_1_err | 1 - .../result/relaxng/tutor9_1_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor9_2_1 | 0 .../libxml2-v2.9.x/result/relaxng/tutor9_2_2 | 0 .../result/relaxng/tutor9_2_err | 1 - .../result/relaxng/tutor9_2_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor9_3_1 | 0 .../libxml2-v2.9.x/result/relaxng/tutor9_3_2 | 0 .../result/relaxng/tutor9_3_err | 1 - .../result/relaxng/tutor9_3_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor9_4_1 | 0 .../libxml2-v2.9.x/result/relaxng/tutor9_4_2 | 0 .../result/relaxng/tutor9_4_err | 1 - .../result/relaxng/tutor9_4_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor9_5_1 | 0 .../libxml2-v2.9.x/result/relaxng/tutor9_5_2 | 0 .../libxml2-v2.9.x/result/relaxng/tutor9_5_3 | 0 .../result/relaxng/tutor9_5_err | 1 - .../result/relaxng/tutor9_5_valid | 0 .../result/relaxng/tutor9_6.rng | 24 - .../libxml2-v2.9.x/result/relaxng/tutor9_6_1 | 0 .../libxml2-v2.9.x/result/relaxng/tutor9_6_2 | 0 .../libxml2-v2.9.x/result/relaxng/tutor9_6_3 | 0 .../result/relaxng/tutor9_6_err | 1 - .../result/relaxng/tutor9_6_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor9_7_1 | 0 .../result/relaxng/tutor9_7_err | 1 - .../result/relaxng/tutor9_7_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor9_8_1 | 0 .../result/relaxng/tutor9_8_err | 1 - .../result/relaxng/tutor9_8_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutor9_9_1 | 0 .../result/relaxng/tutor9_9_err | 1 - .../result/relaxng/tutor9_9_valid | 0 .../libxml2-v2.9.x/result/relaxng/tutorA_err | 1 - .../result/relaxng/tutorA_valid | 0 .../result/schemas/570702_0_0.err | 0 .../result/schemas/579746_0_0.err | 0 .../result/schemas/579746_0_1.err | 0 .../result/schemas/579746_0_2.err | 0 .../result/schemas/579746_0_4.err | 0 .../result/schemas/579746_1_0.err | 0 .../result/schemas/579746_1_1.err | 0 .../result/schemas/579746_1_2.err | 0 .../result/schemas/579746_1_4.err | 0 .../result/schemas/582887_0_0.err | 0 .../result/schemas/582906-1_0_0.err | 0 .../result/schemas/582906-2_0_0 | 0 .../result/schemas/all1_0_0.err | 0 .../libxml2-v2.9.x/result/schemas/all_0_0.err | 0 .../libxml2-v2.9.x/result/schemas/all_0_1.err | 0 .../libxml2-v2.9.x/result/schemas/all_0_2.err | 0 .../libxml2-v2.9.x/result/schemas/all_1_0.err | 0 .../libxml2-v2.9.x/result/schemas/all_1_1.err | 0 .../libxml2-v2.9.x/result/schemas/all_1_2.err | 0 .../libxml2-v2.9.x/result/schemas/all_1_4.err | 0 .../libxml2-v2.9.x/result/schemas/all_2_3.err | 0 .../libxml2-v2.9.x/result/schemas/all_2_6.err | 0 .../libxml2-v2.9.x/result/schemas/all_2_7.err | 0 .../result/schemas/allsg_0_0.err | 0 .../result/schemas/allsg_0_1.err | 0 .../result/schemas/allsg_0_2.err | 0 .../result/schemas/annot-err_0_0 | 0 .../result/schemas/any1_0_0.err | 0 .../result/schemas/any2_0_0.err | 0 .../libxml2-v2.9.x/result/schemas/any4_0_0 | 0 .../result/schemas/any5_0_3.err | 0 .../result/schemas/any5_1_2.err | 0 .../result/schemas/any5_1_5.err | 0 .../result/schemas/any6_1_0.err | 0 .../result/schemas/any6_2_0.err | 0 .../result/schemas/any7_1_2.err | 0 .../result/schemas/any7_2_2.err | 0 .../result/schemas/any8_1_0.err | 0 .../schemas/anyAttr-derive-errors1_0_0.err | 0 .../result/schemas/anyAttr-derive1_0_0.err | 0 .../result/schemas/anyAttr-derive2_0_0.err | 0 .../schemas/anyAttr-processContents1_0_0.err | 0 .../result/schemas/anyAttr1_0_0.err | 0 .../result/schemas/attr0_0_0.err | 0 .../result/schemas/attruse_0_0.err | 0 .../result/schemas/bug141312_0_0.err | 0 .../result/schemas/bug141333_0_0.err | 0 .../result/schemas/bug143951_0_0.err | 0 .../result/schemas/bug145246_0_0.err | 0 .../result/schemas/bug152470_1_1.err | 0 .../result/schemas/bug167754_0_0.err | 0 .../result/schemas/bug306806_1_0.err | 0 .../result/schemas/bug309338_1_0.err | 0 .../result/schemas/bug310264_0_0.err | 0 .../result/schemas/bug313982_0_0.err | 0 .../result/schemas/bug321475_1_0.err | 0 .../result/schemas/bug322411_1_0.err | 0 .../result/schemas/bug455953_0_0.err | 0 .../result/schemas/choice_0_0.err | 0 .../result/schemas/choice_0_1.err | 0 .../result/schemas/choice_1_0.err | 0 .../result/schemas/choice_1_1.err | 0 .../result/schemas/choice_1_4.err | 0 .../result/schemas/choice_2_0.err | 0 .../result/schemas/choice_2_1.err | 0 .../result/schemas/choice_2_2.err | 0 .../result/schemas/choice_2_3.err | 0 .../result/schemas/choice_2_5.err | 0 .../schemas/complex-type-extension_0_0.err | 0 .../result/schemas/cos-ct-extends-1-3_0_0.err | 0 .../result/schemas/ct-sc-nobase_0_0.err | 0 .../result/schemas/date_0_0.err | 0 .../schemas/derivation-ok-extension-err_0_0 | 0 .../derivation-ok-restriction-2-1-1_0_0 | 0 .../derivation-ok-restriction-4-1-err_0_0 | 0 .../derivation-restriction-anyAttr_0_0.err | 0 .../libxml2-v2.9.x/result/schemas/deter0_0_0 | 0 .../libxml2-v2.9.x/result/schemas/dur_0_0.err | 0 .../result/schemas/elem0_0_0.err | 0 .../result/schemas/element-err_0_0 | 0 .../result/schemas/element-minmax-err_0_0 | 0 .../result/schemas/empty-value_1_0.err | 0 .../result/schemas/empty-value_1_1.err | 0 .../result/schemas/empty_0_0.err | 0 .../result/schemas/empty_1_0.err | 0 .../result/schemas/extension0_0_0.err | 0 .../result/schemas/extension1_0_0.err | 0 .../result/schemas/extension2_1_0.err | 0 .../result/schemas/facet-whiteSpace_0_0.err | 0 .../result/schemas/group0_0_0.err | 0 .../result/schemas/hexbinary_0_0.err | 0 .../result/schemas/import0_0_0.err | 0 .../libxml2-v2.9.x/result/schemas/import1_0_0 | 0 .../result/schemas/import2_0_0.err | 0 .../result/schemas/include1_0_0.err | 0 .../result/schemas/include2_0_0.err | 0 .../result/schemas/include3_0_0 | 0 .../result/schemas/issue40_0_0.err | 0 .../result/schemas/item_0_0.err | 0 .../result/schemas/item_1_0.err | 0 .../result/schemas/length1_0_0.err | 0 .../result/schemas/length2_0_0.err | 0 .../libxml2-v2.9.x/result/schemas/length3_0_0 | 0 .../result/schemas/list0_0_0.err | 0 .../result/schemas/list0_0_2.err | 0 .../result/schemas/list0_1_2.err | 0 .../result/schemas/mixed0_0_0.err | 0 .../result/schemas/mixed1_0_0.err | 0 .../libxml2-v2.9.x/result/schemas/ns0_0_0.err | 0 .../libxml2-v2.9.x/result/schemas/ns0_0_1.err | 0 .../libxml2-v2.9.x/result/schemas/ns0_1_3.err | 0 .../libxml2-v2.9.x/result/schemas/ns0_1_4.err | 0 .../libxml2-v2.9.x/result/schemas/ns1_0_0.err | 0 .../libxml2-v2.9.x/result/schemas/ns2_0_0.err | 0 .../result/schemas/nvdcve_0_0.err | 0 .../libxml2-v2.9.x/result/schemas/po0_0_0.err | 0 .../libxml2-v2.9.x/result/schemas/po1_0_0.err | 0 .../result/schemas/poschargrp0_0_0.err | 0 .../result/schemas/regexp-char-ref_0_0.err | 0 .../result/schemas/regexp-char-ref_1_0.err | 0 .../schemas/restrict-CT-attr-ref_0_0.err | 0 .../result/schemas/restriction-attr1_0_0 | 0 .../result/schemas/restriction0_0_0.err | 0 .../result/schemas/scc-no-xmlns_0_0 | 0 .../result/schemas/scc-no-xsi_0_0 | 0 .../result/schemas/seq-dubl-elem1_0_0.err | 0 .../result/schemas/seq0_0_0.err | 0 .../result/schemas/src-attribute1_0_0 | 0 .../result/schemas/src-attribute2_0_0 | 0 .../result/schemas/src-attribute3-1_0_0 | 0 .../result/schemas/src-attribute3-2-form_0_0 | 0 .../result/schemas/src-attribute3-2-st_0_0 | 0 .../result/schemas/src-attribute3-2-type_0_0 | 0 .../result/schemas/src-attribute4_0_0 | 0 .../result/schemas/src-element1_0_0 | 0 .../result/schemas/src-element2-1_0_0 | 0 .../result/schemas/src-element2-2_0_0 | 0 .../result/schemas/src-element3_0_0 | 0 .../result/schemas/subst-group-1_0_1.err | 0 .../result/schemas/union_0_0.err | 0 .../result/schemas/vdv-first0_0_0.err | 0 .../result/schemas/vdv-first1_0_0.err | 0 .../result/schemas/vdv-first2_0_0.err | 0 .../result/schemas/vdv-first3_0_0.err | 0 .../result/schemas/vdv-first4_0_0.err | 0 .../result/schemas/vdv-first5_0_0.err | 0 .../result/schemas/xsd-list-itemType_0_0.err | 0 .../schemas/xsd-simpleType-varieties_0_0.err | 0 .../libxml2-v2.9.x/result/scripts/base.err | 0 .../libxml2-v2.9.x/result/scripts/base2.err | 0 .../libxml2-v2.9.x/result/scripts/set1.err | 0 .../libxml2-v2.9.x/result/scripts/set4.err | 0 .../result/valid/127772.xml.err | 0 .../result/valid/127772.xml.err.rdr | 0 .../result/valid/694228.xml.err | 0 .../result/valid/694228.xml.err.rdr | 0 .../result/valid/737840.xml.err | 0 .../result/valid/737840.xml.err.rdr | 0 .../libxml2-v2.9.x/result/valid/766956.xml | 0 .../result/valid/REC-xml-19980210.xml.err | 0 .../result/valid/REC-xml-19980210.xml.err.rdr | 0 .../result/valid/UTF16Entity.xml.err | 0 .../result/valid/UTF16Entity.xml.err.rdr | 0 .../result/valid/cond_sect1.xml.err | 0 .../result/valid/cond_sect1.xml.err.rdr | 0 .../result/valid/cond_sect2.xml | 0 .../libxml2-v2.9.x/result/valid/dia.xml.err | 0 .../result/valid/dia.xml.err.rdr | 0 .../libxml2-v2.9.x/result/valid/id1.xml.err | 0 .../result/valid/id1.xml.err.rdr | 0 .../libxml2-v2.9.x/result/valid/id2.xml.err | 0 .../result/valid/id2.xml.err.rdr | 0 .../libxml2-v2.9.x/result/valid/id3.xml.err | 0 .../result/valid/id3.xml.err.rdr | 0 .../libxml2-v2.9.x/result/valid/index.xml.err | 0 .../result/valid/index.xml.err.rdr | 0 .../result/valid/mixed_ns.xml.err | 0 .../result/valid/mixed_ns.xml.err.rdr | 0 .../libxml2-v2.9.x/result/valid/notes.xml.err | 0 .../result/valid/notes.xml.err.rdr | 0 .../libxml2-v2.9.x/result/valid/ns.xml.err | 0 .../result/valid/ns.xml.err.rdr | 0 .../libxml2-v2.9.x/result/valid/ns2.xml.err | 0 .../result/valid/ns2.xml.err.rdr | 0 .../result/valid/objednavka.xml.err | 0 .../result/valid/objednavka.xml.err.rdr | 0 .../libxml2-v2.9.x/result/valid/t10.xml.err | 0 .../result/valid/t10.xml.err.rdr | 0 .../libxml2-v2.9.x/result/valid/t11.xml.err | 0 .../result/valid/t11.xml.err.rdr | 0 .../libxml2-v2.9.x/result/valid/t4.dtd | 0 .../result/valid/t4.dtd.err.rdr | 6 - .../libxml2-v2.9.x/result/valid/t4.xml.err | 0 .../result/valid/t4.xml.err.rdr | 0 .../libxml2-v2.9.x/result/valid/t4a.dtd | 0 .../result/valid/t4a.dtd.err.rdr | 6 - .../libxml2-v2.9.x/result/valid/t4a.xml.err | 0 .../result/valid/t4a.xml.err.rdr | 0 .../libxml2-v2.9.x/result/valid/t6.dtd | 0 .../result/valid/t6.dtd.err.rdr | 6 - .../libxml2-v2.9.x/result/valid/t6.xml.err | 0 .../result/valid/t6.xml.err.rdr | 0 .../libxml2-v2.9.x/result/valid/t8.xml | 0 .../libxml2-v2.9.x/result/valid/t8a.xml | 0 .../libxml2-v2.9.x/result/valid/t9.xml.err | 0 .../result/valid/t9.xml.err.rdr | 0 .../libxml2-v2.9.x/result/valid/t9a.xml.err | 0 .../result/valid/t9a.xml.err.rdr | 0 .../result/valid/xhtml1.xhtml.err | 0 .../result/valid/xhtml1.xhtml.err.rdr | 0 .../result/xmlid/id_tst1.xml.err | 0 trunk/libs/libxml2/libxml2-v2.9.x/testC14N.c | 373 - trunk/libs/libxml2/libxml2-v2.9.x/testHTML.c | 880 - .../libs/libxml2/libxml2-v2.9.x/testReader.c | 145 - .../libs/libxml2/libxml2-v2.9.x/testRegexp.c | 402 - trunk/libs/libxml2/libxml2-v2.9.x/testRelax.c | 188 - trunk/libs/libxml2/libxml2-v2.9.x/testSAX.c | 1198 - .../libs/libxml2/libxml2-v2.9.x/testSchemas.c | 179 - trunk/libs/libxml2/libxml2-v2.9.x/testURI.c | 135 - trunk/libs/libxml2/libxml2-v2.9.x/testXPath.c | 229 - .../libxml2-v2.9.x/win32/VC10/README.vc10 | 27 - .../win32/VC10/RuleSet1.ruleset | 3 - .../win32/VC10/libxml2-focus.vcxproj | 184 - .../libxml2-v2.9.x/win32/VC10/libxml2.sln | 49 - .../libxml2-v2.9.x/win32/VC10/libxml2.vcxproj | 137 - .../win32/VC10/libxml2.vcxproj.filters | 171 - .../win32/VC10/runsuite.vcxproj | 85 - .../libxml2-v2.9.x/win32/wince/libxml2.vcb | 1 - .../libxml2-v2.9.x/win32/wince/libxml2.vcl | 122 - .../libxml2-v2.9.x/win32/wince/libxml2.vco | 1 - .../libxml2-v2.9.x/win32/wince/libxml2.vcp | 5273 --- .../libxml2-v2.9.x/win32/wince/libxml2.vcw | 41 - .../libxml2-v2.9.x/win32/wince/wincecompat.c | 68 - .../libxml2-v2.9.x/win32/wince/wincecompat.h | 50 - .../libs/libxml2/libxml2-v2.9.x/xml2-config.1 | 31 - .../libxml2/libxml2-v2.9.x/xml2Conf.sh.in | 8 - .../squashfs3.2-r2/squashfs-tools/read_fs.c | 678 + trunk/user/accel-pptpd/Makefile | 2 +- trunk/user/dnsmasq/dnsmasq-2.8x/Makefile | 49 +- trunk/user/dnsmasq/dnsmasq-2.8x/VERSION | 2 +- .../dnsmasq/dnsmasq-2.8x/contrib/Suse/README | 6 - .../contrib/Suse/README.susefirewall | 27 - .../contrib/Suse/dnsmasq-SuSE.patch | 23 - .../contrib/Suse/dnsmasq-suse.spec | 111 - .../dnsmasq-2.8x/contrib/Suse/rc.dnsmasq-suse | 79 - .../contrib/lease-tools/dhcp_release.c | 1 + .../contrib/lease-tools/dhcp_release6.c | 37 +- .../dnsmasq/dnsmasq-2.8x/dbus/DBus-interface | 4 + .../dnsmasq/dnsmasq-2.8x/dnsmasq.conf.example | 10 + trunk/user/dnsmasq/dnsmasq-2.8x/man/dnsmasq.8 | 140 +- trunk/user/dnsmasq/dnsmasq-2.8x/po/de.po | 114 +- trunk/user/dnsmasq/dnsmasq-2.8x/po/es.po | 4 +- trunk/user/dnsmasq/dnsmasq-2.8x/po/fi.po | 2 +- trunk/user/dnsmasq/dnsmasq-2.8x/po/fr.po | 4 +- trunk/user/dnsmasq/dnsmasq-2.8x/po/id.po | 4 +- trunk/user/dnsmasq/dnsmasq-2.8x/po/it.po | 2 +- trunk/user/dnsmasq/dnsmasq-2.8x/po/no.po | 4 +- trunk/user/dnsmasq/dnsmasq-2.8x/po/pl.po | 4 +- trunk/user/dnsmasq/dnsmasq-2.8x/po/pt_BR.po | 2 +- trunk/user/dnsmasq/dnsmasq-2.8x/po/ro.po | 4 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/arp.c | 2 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/auth.c | 52 +- .../user/dnsmasq/dnsmasq-2.8x/src/blockdata.c | 4 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/bpf.c | 2 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/cache.c | 209 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/config.h | 14 +- .../user/dnsmasq/dnsmasq-2.8x/src/conntrack.c | 2 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/crypto.c | 2 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/dbus.c | 37 +- .../dnsmasq/dnsmasq-2.8x/src/dhcp-common.c | 70 +- .../dnsmasq/dnsmasq-2.8x/src/dhcp-protocol.h | 3 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/dhcp.c | 179 +- .../dnsmasq/dnsmasq-2.8x/src/dhcp6-protocol.h | 5 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/dhcp6.c | 97 +- .../dnsmasq/dnsmasq-2.8x/src/dns-protocol.h | 2 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/dnsmasq.c | 82 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/dnsmasq.h | 141 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/dnssec.c | 89 +- .../dnsmasq/dnsmasq-2.8x/src/domain-match.c | 290 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/domain.c | 33 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/dump.c | 144 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/edns0.c | 142 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/forward.c | 546 +- .../dnsmasq/dnsmasq-2.8x/src/hash-questions.c | 10 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/helper.c | 80 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/inotify.c | 11 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/ip6addr.h | 2 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/lease.c | 10 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/log.c | 25 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/loop.c | 2 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/metrics.c | 2 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/metrics.h | 2 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/netlink.c | 24 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/network.c | 113 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/nftset.c | 94 + trunk/user/dnsmasq/dnsmasq-2.8x/src/option.c | 544 +- .../user/dnsmasq/dnsmasq-2.8x/src/outpacket.c | 2 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/pattern.c | 10 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/poll.c | 19 +- .../dnsmasq/dnsmasq-2.8x/src/radv-protocol.h | 2 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/radv.c | 50 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/rfc1035.c | 233 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/rfc2131.c | 26 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/rfc3315.c | 295 +- .../user/dnsmasq/dnsmasq-2.8x/src/rrfilter.c | 55 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/slaac.c | 2 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/tftp.c | 53 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/ubus.c | 2 +- trunk/user/dnsmasq/dnsmasq-2.8x/src/util.c | 103 +- trunk/user/e2fsprogs/Makefile | 2 +- trunk/user/ipset/Makefile | 2 +- trunk/user/nfsd/nfs-utils-2.x/Makefile.in | 26 +- trunk/user/nfsd/nfs-utils-2.x/NEWS | 63 + trunk/user/nfsd/nfs-utils-2.x/aclocal.m4 | 327 +- .../nfsd/nfs-utils-2.x/aclocal/bsdsignals.m4 | 7 +- .../nfsd/nfs-utils-2.x/aclocal/kerberos5.m4 | 2 +- .../nfsd/nfs-utils-2.x/aclocal/libblkid.m4 | 5 +- .../nfsd/nfs-utils-2.x/aclocal/libsqlite3.m4 | 5 +- .../nfsd/nfs-utils-2.x/aclocal/libtirpc.m4 | 9 +- .../nfsd/nfs-utils-2.x/aclocal/libtool.m4 | 227 +- .../nfsd/nfs-utils-2.x/aclocal/ltoptions.m4 | 4 +- .../nfsd/nfs-utils-2.x/aclocal/ltsugar.m4 | 2 +- .../nfsd/nfs-utils-2.x/aclocal/ltversion.m4 | 13 +- .../nfsd/nfs-utils-2.x/aclocal/lt~obsolete.m4 | 4 +- .../nfsd/nfs-utils-2.x/aclocal/nfs-utils.m4 | 5 +- .../nfsd/nfs-utils-2.x/aclocal/rpcsec_vers.m4 | 2 +- trunk/user/nfsd/nfs-utils-2.x/compile | 2 +- trunk/user/nfsd/nfs-utils-2.x/config.guess | 1458 +- trunk/user/nfsd/nfs-utils-2.x/config.sub | 710 +- trunk/user/nfsd/nfs-utils-2.x/configure | 11826 +++--- trunk/user/nfsd/nfs-utils-2.x/configure.ac | 122 +- trunk/user/nfsd/nfs-utils-2.x/depcomp | 2 +- trunk/user/nfsd/nfs-utils-2.x/install-dep | 21 + trunk/user/nfsd/nfs-utils-2.x/install-sh | 148 +- .../nfsd/nfs-utils-2.x/linux-nfs/Makefile.in | 19 +- trunk/user/nfsd/nfs-utils-2.x/ltmain.sh | 866 +- trunk/user/nfsd/nfs-utils-2.x/missing | 2 +- trunk/user/nfsd/nfs-utils-2.x/nfs.conf | 5 +- .../nfsd/nfs-utils-2.x/support/Makefile.am | 1 - .../nfsd/nfs-utils-2.x/support/Makefile.in | 21 +- .../nfs-utils-2.x/support/export/Makefile.am | 1 - .../nfs-utils-2.x/support/export/Makefile.in | 37 +- .../nfs-utils-2.x/support/export/v4clients.c | 6 + .../nfs-utils-2.x/support/include/Makefile.in | 23 +- .../nfs-utils-2.x/support/include/config.h.in | 124 +- .../support/include/nfs/Makefile.in | 21 +- .../support/include/rpcsvc/Makefile.in | 21 +- .../support/include/sys/Makefile.in | 21 +- .../support/include/sys/fs/Makefile.in | 21 +- .../nfs-utils-2.x/support/include/version.h | 1 + .../support/junction/Makefile.in | 30 +- .../nfs-utils-2.x/support/misc/Makefile.in | 31 +- .../nfs-utils-2.x/support/nfs/Makefile.am | 3 +- .../nfs-utils-2.x/support/nfs/Makefile.in | 34 +- .../nfsd/nfs-utils-2.x/support/nfs/cacheio.c | 1 - .../nfs-utils-2.x/support/nfs/rpcdispatch.c | 5 +- .../support/nfsidmap/Makefile.am | 2 +- .../support/nfsidmap/Makefile.in | 47 +- .../support/nfsidmap/idmapd.conf.5 | 4 +- .../nfsd/nfs-utils-2.x/support/nfsidmap/nss.c | 6 +- .../nfs-utils-2.x/support/nfsidmap/regex.c | 1 + .../nfs-utils-2.x/support/nsm/Makefile.in | 35 +- .../nfsd/nfs-utils-2.x/systemd/50-nfs.conf | 16 + .../nfsd/nfs-utils-2.x/systemd/Makefile.am | 20 +- .../nfsd/nfs-utils-2.x/systemd/Makefile.in | 62 +- .../nfsd/nfs-utils-2.x/systemd/nfs.conf.man | 12 +- .../systemd/rpc-pipefs-generator.c | 7 +- .../nfs-utils-2.x/systemd/rpc-statd.service | 2 +- .../systemd/rpc_pipefs.target.in | 3 + .../systemd/var-lib-nfs-rpc_pipefs.mount.in | 10 + trunk/user/nfsd/nfs-utils-2.x/test-driver | 19 +- .../user/nfsd/nfs-utils-2.x/tests/Makefile.in | 32 +- .../tests/nsm_client/Makefile.am | 1 - .../tests/nsm_client/Makefile.in | 34 +- .../tests/t0001-statd-basic-mon-unmon.sh | 3 +- .../user/nfsd/nfs-utils-2.x/tests/test-lib.sh | 9 + .../user/nfsd/nfs-utils-2.x/tools/Makefile.am | 2 +- .../user/nfsd/nfs-utils-2.x/tools/Makefile.in | 27 +- .../nfs-utils-2.x/tools/locktest/Makefile.in | 29 +- .../tools/mountstats/Makefile.in | 19 +- .../tools/mountstats/mountstats.py | 5 +- .../tools/nfs-iostat/Makefile.in | 19 +- .../nfs-utils-2.x/tools/nfsconf/Makefile.in | 29 +- .../nfs-utils-2.x/tools/nfsdclddb/Makefile.in | 19 +- .../nfs-utils-2.x/tools/nfsdclnts/Makefile.in | 19 +- .../tools/nfsrahead/99-nfs.rules | 1 + .../tools/nfsrahead/99-nfs.rules.in | 1 + .../nfs-utils-2.x/tools/nfsrahead/Makefile.am | 16 + .../nfsd/nfs-utils-2.x/tools/nfsrahead/main.c | 192 + .../tools/nfsrahead/nfsrahead.man | 72 + .../nfs-utils-2.x/tools/nlmtest/Makefile.in | 19 +- .../nfs-utils-2.x/tools/rpcctl/Makefile.am | 13 + .../nfs-utils-2.x/tools/rpcctl/rpcctl.man | 67 + .../nfsd/nfs-utils-2.x/tools/rpcctl/rpcctl.py | 262 + .../nfs-utils-2.x/tools/rpcdebug/Makefile.in | 29 +- .../nfs-utils-2.x/tools/rpcgen/Makefile.in | 30 +- .../nfs-utils-2.x/tools/rpcgen/rpc_main.c | 6 + .../user/nfsd/nfs-utils-2.x/utils/Makefile.in | 21 +- .../nfs-utils-2.x/utils/blkmapd/Makefile.am | 1 - .../nfs-utils-2.x/utils/blkmapd/Makefile.in | 29 +- .../utils/blkmapd/device-discovery.c | 2 +- .../nfs-utils-2.x/utils/exportd/Makefile.am | 2 - .../nfs-utils-2.x/utils/exportd/Makefile.in | 29 +- .../nfs-utils-2.x/utils/exportfs/Makefile.in | 29 +- .../nfsd/nfs-utils-2.x/utils/gssd/Makefile.am | 2 - .../nfsd/nfs-utils-2.x/utils/gssd/Makefile.in | 31 +- .../user/nfsd/nfs-utils-2.x/utils/gssd/gssd.c | 10 +- .../user/nfsd/nfs-utils-2.x/utils/gssd/gssd.h | 2 +- .../nfsd/nfs-utils-2.x/utils/gssd/krb5_util.c | 18 +- .../nfsd/nfs-utils-2.x/utils/gssd/svcgssd.c | 12 +- .../nfsd/nfs-utils-2.x/utils/gssd/svcgssd.man | 13 + .../nfs-utils-2.x/utils/gssd/svcgssd_krb5.c | 2 +- .../nfs-utils-2.x/utils/idmapd/Makefile.am | 2 - .../nfs-utils-2.x/utils/idmapd/Makefile.in | 29 +- .../nfsd/nfs-utils-2.x/utils/idmapd/idmapd.c | 4 +- .../nfs-utils-2.x/utils/idmapd/idmapd.man | 4 +- .../nfs-utils-2.x/utils/mount/Makefile.am | 10 +- .../nfs-utils-2.x/utils/mount/Makefile.in | 40 +- .../nfs-utils-2.x/utils/mount/configfile.c | 2 +- .../nfs-utils-2.x/utils/mount/mount.nfs.man | 2 +- .../nfsd/nfs-utils-2.x/utils/mount/network.c | 19 +- .../nfsd/nfs-utils-2.x/utils/mount/nfs.man | 40 +- .../nfs-utils-2.x/utils/mount/nfsmount.conf | 2 +- .../utils/mount/nfsmount.conf.man | 2 +- .../nfsd/nfs-utils-2.x/utils/mount/stropts.c | 28 +- .../nfs-utils-2.x/utils/mountd/Makefile.am | 2 - .../nfs-utils-2.x/utils/mountd/Makefile.in | 29 +- .../nfs-utils-2.x/utils/mountd/mountd.man | 3 +- .../nfsd/nfs-utils-2.x/utils/mountd/rmtab.c | 3 + .../nfsd/nfs-utils-2.x/utils/nfsd/Makefile.am | 2 - .../nfsd/nfs-utils-2.x/utils/nfsd/Makefile.in | 30 +- .../user/nfsd/nfs-utils-2.x/utils/nfsd/nfsd.c | 2 - .../nfsd/nfs-utils-2.x/utils/nfsd/nfsd.man | 6 +- .../nfsd/nfs-utils-2.x/utils/nfsd/nfssvc.c | 2 +- .../nfs-utils-2.x/utils/nfsdcld/Makefile.am | 1 - .../nfs-utils-2.x/utils/nfsdcld/Makefile.in | 30 +- .../nfs-utils-2.x/utils/nfsdcld/nfsdcld.c | 2 +- .../utils/nfsdcltrack/Makefile.am | 10 +- .../utils/nfsdcltrack/Makefile.in | 42 +- .../utils/nfsdcltrack/nfsdcltrack.c | 5 +- .../nfs-utils-2.x/utils/nfsdcltrack/sqlite.c | 5 +- .../nfs-utils-2.x/utils/nfsdcltrack/sqlite.h | 2 +- .../nfs-utils-2.x/utils/nfsidmap/Makefile.in | 29 +- .../nfs-utils-2.x/utils/nfsidmap/nfsidmap.man | 2 +- .../nfs-utils-2.x/utils/nfsref/Makefile.am | 1 - .../nfs-utils-2.x/utils/nfsref/Makefile.in | 30 +- .../nfs-utils-2.x/utils/nfsstat/Makefile.in | 29 +- .../nfs-utils-2.x/utils/showmount/Makefile.in | 29 +- .../nfs-utils-2.x/utils/statd/Makefile.am | 2 - .../nfs-utils-2.x/utils/statd/Makefile.in | 38 +- trunk/user/pppd/Makefile | 24 +- trunk/user/shared/defaults.c | 14 +- trunk/user/shared/defaults.h | 10 +- trunk/user/www/Makefile | 4 +- 7045 files changed, 161223 insertions(+), 232845 deletions(-) create mode 100644 trunk/libs/libcurl/curl-7.x/CHANGES create mode 100644 trunk/libs/libcurl/curl-7.x/CMake/FindLibPSL.cmake create mode 100644 trunk/libs/libcurl/curl-7.x/CMake/FindMSH3.cmake create mode 100644 trunk/libs/libcurl/curl-7.x/COPYING create mode 100644 trunk/libs/libcurl/curl-7.x/README create mode 100644 trunk/libs/libcurl/curl-7.x/RELEASE-NOTES delete mode 100644 trunk/libs/libcurl/curl-7.x/docs/ECH.md delete mode 100644 trunk/libs/libcurl/curl-7.x/docs/examples/Makefile.netware delete mode 100644 trunk/libs/libcurl/curl-7.x/docs/examples/curlx.c delete mode 100644 trunk/libs/libcurl/curl-7.x/docs/examples/fopen.c create mode 100644 trunk/libs/libcurl/curl-7.x/docs/examples/headerapi.c delete mode 100644 trunk/libs/libcurl/curl-7.x/docs/examples/rtsp.c delete mode 100644 trunk/libs/libcurl/curl-7.x/docs/examples/sampleconv.c create mode 100644 trunk/libs/libcurl/curl-7.x/docs/libcurl/curl_easy_header.3 create mode 100644 trunk/libs/libcurl/curl-7.x/docs/libcurl/curl_easy_nextheader.3 create mode 100644 trunk/libs/libcurl/curl-7.x/docs/libcurl/curl_url_strerror.3 create mode 100644 trunk/libs/libcurl/curl-7.x/docs/libcurl/opts/CURLINFO_CAINFO.3 create mode 100644 trunk/libs/libcurl/curl-7.x/docs/libcurl/opts/CURLINFO_CAPATH.3 create mode 100644 trunk/libs/libcurl/curl-7.x/docs/libcurl/opts/CURLOPT_MAXLIFETIME_CONN.3 create mode 100644 trunk/libs/libcurl/curl-7.x/docs/libcurl/opts/CURLOPT_MIME_OPTIONS.3 create mode 100644 trunk/libs/libcurl/curl-7.x/docs/libcurl/opts/CURLOPT_PREREQDATA.3 create mode 100644 trunk/libs/libcurl/curl-7.x/docs/libcurl/opts/CURLOPT_PREREQFUNCTION.3 create mode 100644 trunk/libs/libcurl/curl-7.x/docs/libcurl/opts/CURLOPT_PROTOCOLS_STR.3 create mode 100644 trunk/libs/libcurl/curl-7.x/docs/libcurl/opts/CURLOPT_REDIR_PROTOCOLS_STR.3 rename trunk/libs/libcurl/curl-7.x/docs/libcurl/opts/{CURLOPT_FTP_RESPONSE_TIMEOUT.3 => CURLOPT_SERVER_RESPONSE_TIMEOUT.3} (72%) create mode 100644 trunk/libs/libcurl/curl-7.x/docs/libcurl/opts/CURLOPT_SSH_HOSTKEYDATA.3 create mode 100644 trunk/libs/libcurl/curl-7.x/docs/libcurl/opts/CURLOPT_SSH_HOSTKEYFUNCTION.3 create mode 100644 trunk/libs/libcurl/curl-7.x/docs/libcurl/opts/CURLOPT_SSH_HOST_PUBLIC_KEY_SHA256.3 create mode 100644 trunk/libs/libcurl/curl-7.x/docs/libcurl/opts/CURLSHOPT_LOCKFUNC.3 create mode 100644 trunk/libs/libcurl/curl-7.x/docs/libcurl/opts/CURLSHOPT_SHARE.3 create mode 100644 trunk/libs/libcurl/curl-7.x/docs/libcurl/opts/CURLSHOPT_UNLOCKFUNC.3 create mode 100644 trunk/libs/libcurl/curl-7.x/docs/libcurl/opts/CURLSHOPT_UNSHARE.3 create mode 100644 trunk/libs/libcurl/curl-7.x/docs/libcurl/opts/CURLSHOPT_USERDATA.3 create mode 100644 trunk/libs/libcurl/curl-7.x/include/curl/header.h delete mode 100644 trunk/libs/libcurl/curl-7.x/lib/Makefile.netware delete mode 100644 trunk/libs/libcurl/curl-7.x/lib/Makefile.vxworks delete mode 100644 trunk/libs/libcurl/curl-7.x/lib/config-tpf.h delete mode 100644 trunk/libs/libcurl/curl-7.x/lib/config-vxworks.h create mode 100644 trunk/libs/libcurl/curl-7.x/lib/easy_lock.h create mode 100644 trunk/libs/libcurl/curl-7.x/lib/fopen.c rename trunk/libs/libcurl/curl-7.x/{src/tool_convert.h => lib/fopen.h} (61%) create mode 100644 trunk/libs/libcurl/curl-7.x/lib/h2h3.c create mode 100644 trunk/libs/libcurl/curl-7.x/lib/h2h3.h create mode 100644 trunk/libs/libcurl/curl-7.x/lib/headers.c create mode 100644 trunk/libs/libcurl/curl-7.x/lib/headers.h create mode 100644 trunk/libs/libcurl/curl-7.x/lib/libcurl.plist.in delete mode 100755 trunk/libs/libcurl/curl-7.x/lib/mk-ca-bundle.vbs delete mode 100644 trunk/libs/libcurl/curl-7.x/lib/non-ascii.c delete mode 100644 trunk/libs/libcurl/curl-7.x/lib/non-ascii.h delete mode 100644 trunk/libs/libcurl/curl-7.x/lib/nwlib.c delete mode 100644 trunk/libs/libcurl/curl-7.x/lib/nwos.c create mode 100644 trunk/libs/libcurl/curl-7.x/lib/timediff.c create mode 100644 trunk/libs/libcurl/curl-7.x/lib/timediff.h create mode 100644 trunk/libs/libcurl/curl-7.x/lib/vquic/msh3.c rename trunk/libs/libcurl/curl-7.x/lib/{vtls/mesalink.h => vquic/msh3.h} (74%) rename trunk/libs/libcurl/curl-7.x/lib/{ => vtls}/hostcheck.c (54%) rename trunk/libs/libcurl/curl-7.x/lib/{ => vtls}/hostcheck.h (80%) delete mode 100644 trunk/libs/libcurl/curl-7.x/lib/vtls/mesalink.c rename trunk/libs/libcurl/curl-7.x/lib/{ => vtls}/x509asn1.c (83%) rename trunk/libs/libcurl/curl-7.x/lib/{ => vtls}/x509asn1.h (58%) delete mode 100644 trunk/libs/libcurl/curl-7.x/m4/ax_compile_check_sizeof.m4 delete mode 100644 trunk/libs/libcurl/curl-7.x/m4/curl-mesalink.m4 delete mode 100644 trunk/libs/libcurl/curl-7.x/packages/TPF/curl.mak delete mode 100644 trunk/libs/libcurl/curl-7.x/packages/TPF/maketpf.env_curl delete mode 100644 trunk/libs/libcurl/curl-7.x/packages/TPF/maketpf.env_curllib delete mode 100644 trunk/libs/libcurl/curl-7.x/projects/README create mode 100644 trunk/libs/libcurl/curl-7.x/projects/README.md rename trunk/libs/libcurl/curl-7.x/projects/Windows/{VC15 => VC14.10}/curl-all.sln (100%) rename trunk/libs/libcurl/curl-7.x/projects/Windows/{VC15 => VC14.10}/lib/libcurl.sln (100%) rename trunk/libs/libcurl/curl-7.x/projects/Windows/{VC15 => VC14.10}/lib/libcurl.vcxproj (91%) rename trunk/libs/libcurl/curl-7.x/projects/Windows/{VC15 => VC14.10}/lib/libcurl.vcxproj.filters (100%) rename trunk/libs/libcurl/curl-7.x/projects/Windows/{VC15 => VC14.10}/src/curl.sln (100%) rename trunk/libs/libcurl/curl-7.x/projects/Windows/{VC15 => VC14.10}/src/curl.vcxproj (90%) rename trunk/libs/libcurl/curl-7.x/projects/Windows/{VC15 => VC14.10}/src/curl.vcxproj.filters (100%) rename trunk/libs/libcurl/curl-7.x/projects/Windows/{VC8 => VC14.30}/curl-all.sln (85%) rename trunk/libs/libcurl/curl-7.x/projects/Windows/{VC8 => VC14.30}/lib/libcurl.sln (85%) create mode 100644 trunk/libs/libcurl/curl-7.x/projects/Windows/VC14.30/lib/libcurl.vcxproj rename trunk/libs/{libxml2/libxml2-v2.9.x/win32/VC10/runsuite.vcxproj.filters => libcurl/curl-7.x/projects/Windows/VC14.30/lib/libcurl.vcxproj.filters} (74%) rename trunk/libs/libcurl/curl-7.x/projects/Windows/{VC8 => VC14.30}/src/curl.sln (85%) create mode 100644 trunk/libs/libcurl/curl-7.x/projects/Windows/VC14.30/src/curl.vcxproj create mode 100644 trunk/libs/libcurl/curl-7.x/projects/Windows/VC14.30/src/curl.vcxproj.filters delete mode 100644 trunk/libs/libcurl/curl-7.x/projects/Windows/VC6/curl-all.dsw delete mode 100644 trunk/libs/libcurl/curl-7.x/projects/Windows/VC6/lib/libcurl.dsp delete mode 100644 trunk/libs/libcurl/curl-7.x/projects/Windows/VC6/lib/libcurl.dsw delete mode 100644 trunk/libs/libcurl/curl-7.x/projects/Windows/VC6/src/curl.dsp delete mode 100644 trunk/libs/libcurl/curl-7.x/projects/Windows/VC6/src/curl.dsw delete mode 100644 trunk/libs/libcurl/curl-7.x/projects/Windows/VC7.1/curl-all.sln delete mode 100644 trunk/libs/libcurl/curl-7.x/projects/Windows/VC7.1/lib/libcurl.sln delete mode 100644 trunk/libs/libcurl/curl-7.x/projects/Windows/VC7.1/lib/libcurl.vcproj delete mode 100644 trunk/libs/libcurl/curl-7.x/projects/Windows/VC7.1/src/curl.sln delete mode 100644 trunk/libs/libcurl/curl-7.x/projects/Windows/VC7.1/src/curl.vcproj delete mode 100644 trunk/libs/libcurl/curl-7.x/projects/Windows/VC7/curl-all.sln delete mode 100644 trunk/libs/libcurl/curl-7.x/projects/Windows/VC7/lib/libcurl.sln delete mode 100644 trunk/libs/libcurl/curl-7.x/projects/Windows/VC7/lib/libcurl.vcproj delete mode 100644 trunk/libs/libcurl/curl-7.x/projects/Windows/VC7/src/curl.sln delete mode 100644 trunk/libs/libcurl/curl-7.x/projects/Windows/VC7/src/curl.vcproj delete mode 100644 trunk/libs/libcurl/curl-7.x/projects/Windows/VC8/lib/libcurl.vcproj delete mode 100644 trunk/libs/libcurl/curl-7.x/projects/Windows/VC8/src/curl.vcproj delete mode 100644 trunk/libs/libcurl/curl-7.x/projects/Windows/VC9/curl-all.sln delete mode 100644 trunk/libs/libcurl/curl-7.x/projects/Windows/VC9/lib/libcurl.sln delete mode 100644 trunk/libs/libcurl/curl-7.x/projects/Windows/VC9/lib/libcurl.vcproj delete mode 100644 trunk/libs/libcurl/curl-7.x/projects/Windows/VC9/src/curl.sln delete mode 100644 trunk/libs/libcurl/curl-7.x/projects/Windows/VC9/src/curl.vcproj rename trunk/libs/libcurl/curl-7.x/{lib => scripts}/checksrc.pl (95%) rename trunk/libs/libcurl/curl-7.x/{lib => scripts}/firefox-db2pem.sh (81%) mode change 100644 => 100755 rename trunk/libs/libcurl/curl-7.x/{lib => scripts}/mk-ca-bundle.pl (74%) delete mode 100644 trunk/libs/libcurl/curl-7.x/src/Makefile.netware delete mode 100644 trunk/libs/libcurl/curl-7.x/src/macos/MACINSTALL.TXT delete mode 100644 trunk/libs/libcurl/curl-7.x/src/macos/curl.mcp.xml.sit.hqx delete mode 100644 trunk/libs/libcurl/curl-7.x/src/macos/src/curl_GUSIConfig.cpp delete mode 100644 trunk/libs/libcurl/curl-7.x/src/macos/src/macos_main.cpp delete mode 100644 trunk/libs/libcurl/curl-7.x/src/tool_convert.c create mode 100644 trunk/libs/libcurl/curl-7.x/src/tool_findfile.c rename trunk/libs/libcurl/curl-7.x/src/{tool_homedir.h => tool_findfile.h} (78%) delete mode 100644 trunk/libs/libcurl/curl-7.x/src/tool_homedir.c create mode 100644 trunk/libs/libcurl/curl-7.x/src/tool_listhelp.c create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test1185 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test1186 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test1187 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test1189 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test1274 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test1467 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test1468 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test1542 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test1543 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test1597 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test1635 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test1670 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test1671 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test1680 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test1681 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test1682 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test1683 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test1919 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test1937 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test1938 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test1939 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test1940 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test1941 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test1942 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test1943 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test1944 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test1945 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test1946 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test2033 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test2079 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test2082 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test2083 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test2084 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test2085 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test2086 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test2087 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test3021 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test3022 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test3023 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test3024 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test3025 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test3026 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test367 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test368 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test369 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test370 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test371 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test372 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test373 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test374 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test375 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test376 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test378 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test379 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test380 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test381 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test383 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test384 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test385 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test386 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test387 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test388 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test389 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test390 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test391 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test398 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test399 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test411 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test412 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test413 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test414 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test436 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test440 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test441 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test442 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test443 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test444 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test530 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test679 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test680 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test681 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test682 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test683 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test684 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test685 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test719 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test720 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test721 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test898 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test973 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test974 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test975 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test976 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/data/test977 create mode 100644 trunk/libs/libcurl/curl-7.x/tests/libtest/lib1542.c create mode 100644 trunk/libs/libcurl/curl-7.x/tests/libtest/lib1597.c create mode 100644 trunk/libs/libcurl/curl-7.x/tests/libtest/lib1919.c create mode 100644 trunk/libs/libcurl/curl-7.x/tests/libtest/lib1937.c create mode 100644 trunk/libs/libcurl/curl-7.x/tests/libtest/lib1938.c create mode 100644 trunk/libs/libcurl/curl-7.x/tests/libtest/lib1939.c create mode 100644 trunk/libs/libcurl/curl-7.x/tests/libtest/lib1940.c create mode 100644 trunk/libs/libcurl/curl-7.x/tests/libtest/lib1945.c create mode 100644 trunk/libs/libcurl/curl-7.x/tests/libtest/lib3025.c create mode 100644 trunk/libs/libcurl/curl-7.x/tests/libtest/lib3026.c create mode 100644 trunk/libs/libcurl/curl-7.x/tests/libtest/lib530.c create mode 100644 trunk/libs/libcurl/curl-7.x/tests/libtest/libprereq.c rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/.gitignore (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/.gitlab-ci.yml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/.travis.yml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/CMakeLists.txt (81%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/Copyright (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/HTMLparser.c (95%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/HTMLtree.c (95%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/Makefile.am rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/Makefile.tests (99%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/NEWS create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/README.md create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/README.tests create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/README.zOS rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/SAX.c (71%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/SAX2.c (95%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/TODO create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/TODO_SCHEMAS rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/autogen.sh (93%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/buf.c (81%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/buf.h (88%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/build_glob.py (92%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/c14n.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/catalog.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/check-relaxng-test-suite.py (59%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/check-relaxng-test-suite2.py (57%) create mode 100755 trunk/libs/libxml2/libxml2-v2.10.x/check-xinclude-test-suite.py rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/check-xml-test-suite.py (50%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/check-xsddata-test-suite.py (56%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/chvalid.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/chvalid.def (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/config.h.cmake.in (61%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/configure.ac (77%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/dbgen.pl (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/dbgenattr.pl (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/debugXML.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/dict.c (97%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/Makefile.am rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/apibuild.py (88%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/buildDocBookCatalog (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/checkapisym.xsl (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/devhelp/Makefile.am (77%) rename trunk/libs/libxml2/{libxml2-v2.9.x/doc/devhelp/devhelp.xsl => libxml2-v2.10.x/doc/devhelp/devhelp2.xsl} (88%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/general.html rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/devhelp/home.png (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/devhelp/html.xsl (96%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/index.html rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/devhelp/left.png (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-HTMLparser.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-HTMLtree.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-SAX.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-SAX2.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-c14n.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-catalog.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-chvalid.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-debugXML.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-dict.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-encoding.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-entities.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-globals.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-hash.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-list.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-nanoftp.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-nanohttp.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-parser.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-parserInternals.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-pattern.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-relaxng.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-schemasInternals.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-schematron.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-threads.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-tree.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-uri.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-valid.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-xinclude.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-xlink.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-xmlIO.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-xmlautomata.html rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/devhelp/libxml2-xmlerror.html (81%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-xmlexports.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-xmlmemory.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-xmlmodule.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-xmlreader.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-xmlregexp.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-xmlsave.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-xmlschemas.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-xmlschemastypes.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-xmlstring.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-xmlunicode.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-xmlversion.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-xmlwriter.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-xpath.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-xpathInternals.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2-xpointer.html rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/devhelp/libxml2-xzlib.html (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/devhelp/libxml2.devhelp2 rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/devhelp/right.png (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/devhelp/style.css (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/devhelp/up.png (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/examples/Makefile.am (53%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/examples/examples.xml (93%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/examples/examples.xsl create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/examples/index.html create mode 100755 trunk/libs/libxml2/libxml2-v2.10.x/doc/examples/index.py rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/examples/io1.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/examples/io2.c (93%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/examples/parse1.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/examples/parse2.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/examples/parse3.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/examples/parse4.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/examples/reader1.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/examples/reader2.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/examples/reader3.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/examples/reader4.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/examples/test1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/examples/test2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/examples/test3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/examples/testWriter.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/examples/tree1.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/examples/tree2.c (94%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/examples/xpath1.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/examples/xpath2.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/libxml-doc.el (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/libxml2-api.xml (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/symbols.xml (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/syms.xsl (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/apa.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/apb.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/apc.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/apd.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/ape.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/apf.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/apg.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/aph.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/api.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/ar01s02.html (66%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/ar01s03.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/ar01s04.html (85%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/ar01s05.html (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/ar01s06.html (96%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/ar01s07.html (95%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/ar01s08.html (95%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/ar01s09.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/customfo.xsl (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/customhtml.xsl (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/images/blank.png (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/images/callouts/1.png (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/images/callouts/10.png (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/images/callouts/2.png (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/images/callouts/3.png (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/images/callouts/4.png (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/images/callouts/5.png (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/images/callouts/6.png (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/images/callouts/7.png (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/images/callouts/8.png (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/images/callouts/9.png (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/images/caution.png (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/images/draft.png (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/images/home.png (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/images/important.png (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/images/next.png (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/images/note.png (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/images/prev.png (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/images/tip.png (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/images/toc-blank.png (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/images/toc-minus.png (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/images/toc-plus.png (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/images/up.png (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/images/warning.png (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/includeaddattribute.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/includeaddkeyword.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/includeconvert.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/includegetattribute.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/includekeyword.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/includestory.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/includexpath.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/index.html (96%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/ix01.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/tutorial/xmltutorial.xml (93%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/doc/xml2-config.1 rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/xmlcatalog.1 (94%) rename trunk/libs/libxml2/{libxml2-v2.9.x/doc/xmlcatalog_man.html => libxml2-v2.10.x/doc/xmlcatalog.html} (94%) rename trunk/libs/libxml2/{libxml2-v2.9.x/doc/xmlcatalog_man.xml => libxml2-v2.10.x/doc/xmlcatalog.xml} (97%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/xmllint.1 (96%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/xmllint.html (97%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/doc/xmllint.xml (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/enc.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/encoding.c (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/entities.c (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/error.c (99%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/example/Makefile.am rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/example/gjobread.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/example/gjobs.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/fuzz/.gitignore (56%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/fuzz/Makefile.am (74%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/fuzz/README (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/fuzz/fuzz.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/fuzz/fuzz.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/fuzz/genSeed.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/fuzz/html.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/fuzz/html.dict (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/fuzz/html.options (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/fuzz/regexp.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/fuzz/regexp.dict (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/fuzz/regexp.options (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/fuzz/schema.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/fuzz/schema.dict (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/fuzz/schema.options (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/fuzz/testFuzzer.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/fuzz/uri.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/fuzz/uri.options (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/fuzz/xml.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/fuzz/xml.dict (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/fuzz/xml.options (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/fuzz/xpath.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/fuzz/xpath.dict (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/fuzz/xpath.options (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/genChRanges.py (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/genUnicode.py (85%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/gentest.py (72%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/global.data (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/globals.c (95%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/hash.c (97%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/Makefile.am (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/HTMLparser.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/HTMLtree.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/Makefile.am (95%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/SAX.h (88%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/SAX2.h (93%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/c14n.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/catalog.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/chvalid.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/debugXML.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/dict.h (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/encoding.h (93%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/entities.h (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/globals.h (97%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/hash.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/list.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/nanoftp.h (88%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/nanohttp.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/parser.h (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/parserInternals.h (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/pattern.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/relaxng.h (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/schemasInternals.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/schematron.h (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/threads.h (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/tree.h (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/uri.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/valid.h (97%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/xinclude.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/xlink.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/xmlIO.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/xmlautomata.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/xmlerror.h (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/xmlexports.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/xmlmemory.h (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/xmlmodule.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/xmlreader.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/xmlregexp.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/xmlsave.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/xmlschemas.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/xmlschemastypes.h (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/xmlstring.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/xmlunicode.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/xmlversion.h.in (93%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/xmlwriter.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/xpath.h (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/xpathInternals.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/libxml/xpointer.h (88%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/include/win32config.h rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/include/wsockcompat.h (95%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/legacy.c (99%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/libxml-2.0-uninstalled.pc.in rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/libxml-2.0.pc.in (62%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/libxml.h (83%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/libxml.m4 (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/libxml.spec.in (94%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/libxml2-config.cmake.cmake.in (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/libxml2-config.cmake.in (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/libxml2.doap rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/libxml2.syms (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/list.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/nanoftp.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/nanohttp.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/optim/TOTRY (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/optim/hash_dict.txt (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/README400 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/dlfcn/dlfcn.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/dlfcn/dlfcn.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/iconv/README.iconv (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/iconv/bldcsndfa/bldcsndfa.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/iconv/bldcsndfa/ccsid_mibenum.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/iconv/bldcsndfa/ccsid_mibenum.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/iconv/bldcsndfa/character-sets.xhtml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/iconv/ianatables.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/iconv/iconv.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/iconv/iconv.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/initscript.sh (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlmain.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/DOCBparser.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/HTMLparser.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/HTMLtree.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/SAX.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/SAX2.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/c14n.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/catalog.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/chvalid.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/debugXML.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/dict.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/encoding.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/entities.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/globals.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/hash.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/list.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/nanoftp.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/nanohttp.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/parser.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/parserInternals.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/pattern.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/relaxng.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/schemasInternals.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/schematron.rpgle (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/threads.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/transcode.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/tree.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/uri.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/valid.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/xinclude.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/xlink.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/xmlIO.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/xmlTypesC.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/xmlautomata.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/xmlerror.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/xmlexports.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/xmlmemory.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/xmlmodule.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/xmlreader.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/xmlregexp.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/xmlsave.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/xmlschemas.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/xmlschemastypes.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/xmlstdarg.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/xmlstring.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/xmlunicode.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/xmlversion.rpgle.in (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/xmlwriter.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/xpath.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/xpathInternals.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/libxmlrpg/xpointer.rpgle (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/make-bldcsndfa.sh (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/make-include.sh (96%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/make-rpg.sh (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/make-src.sh (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/make.sh (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/os400config.h.in (57%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/rpgsupport.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/rpgsupport.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/transcode.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/transcode.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/wrappers.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/wrappers.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/xmlcatlgcl.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/os400/xmllintcl.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/parser.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/parserInternals.c (91%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/pattern.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/Makefile.am (56%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/README (86%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/TODO (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/drv_libxml2.py (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/generator.py (96%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/libxml.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/libxml.py (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/libxml2-python-api.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/libxml_wrap.h (94%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/setup.py.in (84%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/Makefile.am (92%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/attribs.py (97%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/build.py (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/compareNodes.py (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/ctxterror.py (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/cutnpaste.py (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/dtdvalid.py (96%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/error.py (97%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/inbuf.py (95%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/indexes.py (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/input_callback.py (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/invalid.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/nsdel.py (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/outbuf.py (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/push.py (97%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/pushSAX.py (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/pushSAXhtml.py (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/reader.py (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/reader2.py (97%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/reader3.py (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/reader4.py (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/reader5.py (87%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/reader6.py (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/reader7.py (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/reader8.py (96%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/readererr.py (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/readernext.py (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/regexp.py (96%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/relaxng.py (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/resolver.py (97%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/schema.py (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/serialize.py (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/sync.py (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/test.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/thread2.py (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/tst.py (96%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/tst.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/tstLastError.py (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/tstURI.py (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/tstmem.py (85%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/tstxpath.py (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/valid.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/validDTD.py (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/validRNG.py (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/validSchemas.py (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/validate.py (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/walker.py (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/xpath.py (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/xpathext.py (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/xpathleak.py (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/xpathns.py (96%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/tests/xpathret.py (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/python/types.c (84%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/relaxng.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/53867.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/53867.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/758518-entity.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/758518-entity.html.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/758518-entity.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/758518-tag.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/758518-tag.html.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/758518-tag.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/758605.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/758605.html.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/758605.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/758606.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/758606.html.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/758606.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/758606_2.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/758606_2.html.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/758606_2.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/Down.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/Down.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/attrents.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/attrents.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/autoclose.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/autoclose.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/autoclose2.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/autoclose2.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/autoclose3.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/autoclose3.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/cf_128.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/cf_128.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/chunked_attr.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/chunked_attr.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/comments.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/comments.html.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/comments.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/comments2.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/comments2.html.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/comments2.html.sax (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/HTML/comments3.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/HTML/comments3.html.err create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/HTML/comments3.html.sax rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/doc2.htm (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/doc2.htm.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/doc2.htm.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/doc3.htm (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/doc3.htm.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/doc3.htm.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/entities.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/entities.html.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/entities.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/entities2.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/entities2.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/fp40.htm (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/fp40.htm.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/fp40.htm.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/html5_enc.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/html5_enc.html.sax (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/HTML/issue318.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/HTML/issue318.html.sax create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/HTML/issue380.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/HTML/issue380.html.err create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/HTML/issue380.html.sax rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/liclose.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/liclose.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/lt.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/lt.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/noscript.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/noscript.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/pre.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/pre.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/python.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/python.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/reg1.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/reg1.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/reg2.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/reg2.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/reg3.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/reg3.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/reg4.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/reg4.html.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/reg4.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/repeat.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/repeat.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/script.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/script.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/script2.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/script2.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/test2.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/test2.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/test3.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/test3.html.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/test3.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/utf8bug.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/utf8bug.html.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/utf8bug.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/wired.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/wired.html.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/HTML/wired.html.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/4rects.xml (61%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/a-valid.xml (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/a-wf.xml (99%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/SVG/bike.xml rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/circle.xml (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/defs.xml (90%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/desc.xml (76%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/ellipse.xml (99%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/SVG/flower2.xml rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/gradient.xml (91%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/group01.xml (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/group02.xml (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/group03.xml (81%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/image-valid.xml (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/image-wf.xml (63%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/lin-gradient.xml (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/marker.xml (78%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/mask.xml (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/mathswitch.xml (75%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/SVG/parentns.xml rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/path01.xml (74%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/path02.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/patternfill.xml (85%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/polyline.xml (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/private.xml (77%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/rad-gradient.xml (72%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/rectangle.xml (99%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/SVG/richdesc.xml rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/script.xml (92%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/structure01.xml (50%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/style.xml (93%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/switch.xml (73%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/symbol-use.xml (62%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/template.xml (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/text01.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/text02.xml (51%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/text03.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/toap01.xml (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/toap02.xml (99%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/SVG/transform.xml rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/trivial.xml (77%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/twin-gradients.xml (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/v-template.xml (84%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/viewport-nest.xml (81%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/SVG/viewport-transform.xml create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/SVG/viewport.xml rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/SVG/wf-template.xml (86%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/URI/smith.uri (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/URI/uri.data (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/AttributeDefaultLegal (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/AttributeDefaultLegal.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/AttributeNmtokens (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/AttributeNmtokens.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/DuplicateType (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/DuplicateType.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/ElementValid (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/ElementValid.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/ElementValid2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/ElementValid2.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/ElementValid3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/ElementValid3.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/ElementValid4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/ElementValid4.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/ElementValid5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/ElementValid5.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/ElementValid6 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/ElementValid6.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/ElementValid7 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/ElementValid7.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/ElementValid8 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/ElementValid8.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/Enumeration (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/Enumeration.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/NS2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/NS2.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/NS3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/NS3.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/OneID (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/OneID.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/OneID2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/OneID2.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/OneID3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/OneID3.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/PENesting (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/PENesting.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/PENesting2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/PENesting2.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/UniqueElementTypeDeclaration (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/UniqueElementTypeDeclaration.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/UniqueElementTypeDeclaration2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/VC/UniqueElementTypeDeclaration2.rdr (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/XInclude/coalesce.xml create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/XInclude/coalesce.xml.rdr rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XInclude/docids.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XInclude/docids.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XInclude/fallback.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XInclude/fallback.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XInclude/fallback2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XInclude/fallback2.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XInclude/fallback3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XInclude/fallback3.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XInclude/fallback4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XInclude/fallback4.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XInclude/fallback5.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XInclude/fallback5.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XInclude/fallback6.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XInclude/include.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XInclude/include.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XInclude/nodes.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XInclude/nodes.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XInclude/nodes2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XInclude/nodes2.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XInclude/nodes3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XInclude/nodes3.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XInclude/ns1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XInclude/ns1.xml.rdr (93%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XInclude/recursive.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XInclude/recursive.xml.rdr (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/XInclude/red.xml create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/XInclude/red.xml.rdr rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XInclude/tstencoding.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XInclude/tstencoding.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XInclude/txtinclude.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XInclude/txtinclude.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XPath/expr/base (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XPath/expr/compare (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XPath/expr/equality (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XPath/expr/floats (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XPath/expr/functions (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XPath/expr/strings (85%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XPath/tests/chaptersbase (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XPath/tests/chaptersprefol (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XPath/tests/idsimple (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XPath/tests/langsimple (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XPath/tests/mixedpat (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XPath/tests/nodespat (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XPath/tests/nssimple (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XPath/tests/simpleabbr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XPath/tests/simplebase (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XPath/tests/strbase (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XPath/tests/usr1check (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XPath/tests/vidbase (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x/result/XPath/xptr => libxml2-v2.10.x/result/XPath/xptr-xp1}/chapterschildseq (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/XPath/xptr-xp1/chaptersparts create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/XPath/xptr-xp1/issue289base create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/XPath/xptr-xp1/vidbase rename trunk/libs/libxml2/{libxml2-v2.9.x/result/XPath/xptr => libxml2-v2.10.x/result/XPath/xptr-xp1}/vidchildseq (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/XPath/xptr-xp1/viderror create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/XPath/xptr-xp1/vidparts rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XPath/xptr/chaptersparts (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XPath/xptr/chaptersrange (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/XPath/xptr/issue289base rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XPath/xptr/strpoint (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XPath/xptr/strrange (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XPath/xptr/strrange2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XPath/xptr/strrange3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XPath/xptr/vidbase (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XPath/xptr/viderror (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/XPath/xptr/vidparts (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att1.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att1.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att1.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att1.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att10 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att10.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att10.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att10.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att10.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att11 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att11.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att11.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att11.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att11.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att2.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att2.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att2.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att2.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att3.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att3.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att3.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att3.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att4.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att4.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att4.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att4.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att5.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att5.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att5.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att5.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att6 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att6.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att6.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att6.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att6.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att7 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att7.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att7.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att7.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att7.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att8 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att8.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att8.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att8.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att8.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att9 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att9.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att9.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att9.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/att9.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/attrib.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/attrib.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/attrib.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/attrib.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/attrib.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/automata/a (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/automata/aba (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/automata/abaa (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/automata/abba (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/automata/po (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/badcomment.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/badcomment.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/badcomment.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/badcomment.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/badcomment.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/bigentname.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/bigentname.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/bigentname.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/bigentname.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/bigentname.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/bigname.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/bigname.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/bigname.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/bigname.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/bigname.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/bigname2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/bigname2.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/bigname2.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/bigname2.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/bigname2.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/1-1-without-comments/example-1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/1-1-without-comments/example-2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/1-1-without-comments/example-3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/1-1-without-comments/example-4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/1-1-without-comments/example-5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/1-1-without-comments/example-6 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/1-1-without-comments/example-7 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/1-1-without-comments/example-8 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/1-1-without-comments/xmlbase-c14n11spec-102 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/1-1-without-comments/xmlbase-c14n11spec2-102 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/1-1-without-comments/xmlbase-c14n11spec3-102 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/1-1-without-comments/xmlbase-prop-1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/1-1-without-comments/xmlbase-prop-2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/1-1-without-comments/xmlbase-prop-3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/1-1-without-comments/xmlbase-prop-4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/1-1-without-comments/xmlbase-prop-5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/1-1-without-comments/xmlbase-prop-6 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/1-1-without-comments/xmlbase-prop-7 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/1-1-without-comments/xmlid-prop-1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/1-1-without-comments/xmlid-prop-2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/1-1-without-comments/xmllang-prop-1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/1-1-without-comments/xmllang-prop-2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/1-1-without-comments/xmllang-prop-3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/1-1-without-comments/xmllang-prop-4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/1-1-without-comments/xmlspace-prop-1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/1-1-without-comments/xmlspace-prop-2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/1-1-without-comments/xmlspace-prop-3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/1-1-without-comments/xmlspace-prop-4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/exc-without-comments/merlin-c14n-two-09 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/exc-without-comments/merlin-c14n-two-10 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/exc-without-comments/merlin-c14n-two-11 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/exc-without-comments/merlin-c14n-two-12 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/exc-without-comments/merlin-c14n-two-13 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/exc-without-comments/merlin-c14n-two-14 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/exc-without-comments/merlin-c14n-two-17 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/exc-without-comments/merlin-c14n-two-18 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/exc-without-comments/merlin-c14n-two-19 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/exc-without-comments/merlin-c14n-two-20 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/exc-without-comments/merlin-c14n-two-21 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/exc-without-comments/merlin-c14n-two-22 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/exc-without-comments/merlin-c14n-two-23 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/exc-without-comments/merlin-c14n-two-24 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/exc-without-comments/merlin-c14n-two-26 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/exc-without-comments/test-0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/exc-without-comments/test-1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/exc-without-comments/test-2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/with-comments/example-1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/with-comments/example-2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/with-comments/example-3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/with-comments/example-4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/with-comments/example-5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/with-comments/example-6 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/with-comments/example-7 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/without-comments/example-1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/without-comments/example-2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/without-comments/example-3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/without-comments/example-4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/without-comments/example-5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/without-comments/example-6 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/without-comments/example-7 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/without-comments/merlin-c14n-two-00 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/without-comments/merlin-c14n-two-01 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/without-comments/merlin-c14n-two-02 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/without-comments/merlin-c14n-two-03 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/without-comments/merlin-c14n-two-04 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/without-comments/merlin-c14n-two-05 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/without-comments/merlin-c14n-two-06 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/without-comments/merlin-c14n-two-07 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/without-comments/merlin-c14n-two-08 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/without-comments/test-0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/without-comments/test-1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/without-comments/test-2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/c14n/without-comments/test-3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/catalogs/catal (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/catalogs/docbook (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/catalogs/mycatalog.empty (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/catalogs/mycatalog.full (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/catalogs/registry (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/catalogs/whites (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/catalogs/whitex (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/cdata (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/cdata-2-byte-UTF-8.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/cdata-2-byte-UTF-8.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/cdata-2-byte-UTF-8.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/cdata-2-byte-UTF-8.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/cdata-2-byte-UTF-8.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/cdata-3-byte-UTF-8.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/cdata-3-byte-UTF-8.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/cdata-3-byte-UTF-8.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/cdata-3-byte-UTF-8.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/cdata-3-byte-UTF-8.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/cdata-4-byte-UTF-8.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/cdata-4-byte-UTF-8.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/cdata-4-byte-UTF-8.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/cdata-4-byte-UTF-8.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/cdata-4-byte-UTF-8.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/cdata.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/cdata.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/cdata.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/cdata.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/cdata2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/cdata2.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/cdata2.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/cdata2.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/cdata2.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment2.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment2.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment2.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment2.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment3.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment3.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment3.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment3.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment4.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment4.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment4.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment4.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment5.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment5.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment5.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment5.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment5.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment6.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment6.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment6.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment6.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/comment6.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav1.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav1.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav1.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav1.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav10 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav10.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav10.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav10.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav10.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav11 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav11.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav11.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav11.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav11.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav12 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav12.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav12.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav12.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav12.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav13 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav13.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav13.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav13.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav13.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav15 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav15.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav15.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav15.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav15.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav16 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav16.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav16.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav16.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav16.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav17 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav17.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav17.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav17.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav17.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav18 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav18.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav18.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav18.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav18.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav19 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav19.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav19.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav19.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav19.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav2.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav2.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav2.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav2.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav3.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav3.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav3.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav3.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav4.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav4.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav4.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav4.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav5.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav5.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav5.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav5.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav6 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav6.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav6.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav6.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav6.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav7 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav7.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav7.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav7.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav7.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav8 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav8.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav8.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav8.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav8.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav9 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav9.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav9.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav9.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dav9.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/defattr.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/defattr.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/defattr.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/defattr.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/defattr.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/defattr2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/defattr2.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/defattr2.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/defattr2.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/defattr2.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dia1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dia1.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dia1.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dia1.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dia1.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dia2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dia2.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dia2.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dia2.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dia2.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd1.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd1.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd1.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd1.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd10 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd10.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd10.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd10.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd10.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd11 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd11.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd11.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd11.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd11.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd12 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd12.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd12.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd12.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd12.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd13 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd13.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd13.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd13.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd13.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd2.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd2.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd2.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd2.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd3.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd3.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd3.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd3.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd4.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd4.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd4.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd4.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd5.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd5.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd5.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd5.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd6 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd6.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd6.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd6.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd6.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd7 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd7.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd7.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd7.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd7.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd8 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd8.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd8.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd8.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd8.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd9 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd9.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd9.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd9.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/dtd9.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ebcdic_566012.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ebcdic_566012.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ebcdic_566012.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ebcdic_566012.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ebcdic_566012.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/emptycdata.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/emptycdata.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/emptycdata.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/emptycdata.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/emptycdata.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent1.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent1.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent1.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent1.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent10 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent10.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent10.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent10.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent10.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent11 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent11.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent11.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent11.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent11.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent12 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent12.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent12.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent12.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent12.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent13 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent13.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent13.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent13.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent13.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent2.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent2.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent2.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent2.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent3.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent3.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent3.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent3.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent4.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent4.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent4.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent4.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent5.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent5.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent5.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent5.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent6 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent6.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent6.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent6.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent6.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent6hex (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent6hex.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent6hex.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent6hex.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent6hex.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent7 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent7.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent7.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent7.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent7.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent8 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent8.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent8.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent8.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent8.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent9 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent9.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent9.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent9.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent9.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent_738805.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent_738805.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent_738805.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent_738805.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ent_738805.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/754946.xml.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/754946.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/754946.xml.str (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/754947.xml.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/754947.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/754947.xml.str (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/758588.xml.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/758588.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/758588.xml.str (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/759020.xml.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/759020.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/759020.xml.str (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/759398.xml.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/759398.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/759398.xml.str (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/759573-2.xml.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/759573-2.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/759573-2.xml.str (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/759573.xml.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/759573.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/759573.xml.str (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/759579.xml.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/759579.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/759579.xml.str (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/attr1.xml.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/attr1.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/attr1.xml.str (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/attr2.xml.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/attr2.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/attr2.xml.str (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/attr3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/attr3.xml.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/attr3.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/attr3.xml.str (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/attr4.xml.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/attr4.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/attr4.xml.str (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/cdata.xml.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/cdata.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/cdata.xml.str (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/charref1.xml.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/charref1.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/charref1.xml.str (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/comment1.xml.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/comment1.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/comment1.xml.str (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/content1.xml.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/content1.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/content1.xml.str (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x/doc/examples/io2.res => libxml2-v2.10.x/result/errors/ent_redecl.xml} (50%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/errors/ent_redecl.xml.ent create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/errors/ent_redecl.xml.err create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/errors/ent_redecl.xml.str rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/extparsedent.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/extparsedent.xml.ent (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/errors/issue151.xml.ent create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/errors/issue151.xml.err create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/errors/issue151.xml.str rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/name.xml.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/name.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/name.xml.str (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/name2.xml.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/name2.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/name2.xml.str (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/rec_ext_ent.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors/rec_ext_ent.xml.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors10/781205.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/errors10/781361.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/eve.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/eve.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/eve.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/eve.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/eve.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/expr/base (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/icu_parse_test.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/icu_parse_test.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/icu_parse_test.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/icu_parse_test.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/icu_parse_test.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/intsubset.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/intsubset.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/intsubset.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/intsubset.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/intsubset.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/intsubset2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/intsubset2.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/intsubset2.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/intsubset2.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/intsubset2.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/isolat1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/isolat1.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/isolat1.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/isolat1.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/isolat1.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/isolat2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/isolat2.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/isolat2.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/isolat2.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/isolat2.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/isolat3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/isolat3.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/isolat3.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/isolat3.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/isolat3.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/japancrlf.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/japancrlf.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/japancrlf.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/japancrlf.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/japancrlf.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/namespaces/err_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/namespaces/err_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/namespaces/err_1.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/namespaces/err_10.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/namespaces/err_11.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/namespaces/err_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/namespaces/err_2.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/namespaces/err_3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/namespaces/err_3.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/namespaces/err_4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/namespaces/err_4.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/namespaces/err_5.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/namespaces/err_5.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/namespaces/err_6.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/namespaces/err_6.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/namespaces/err_7.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/namespaces/err_7.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/namespaces/err_8.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/namespaces/err_8.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/namespaces/err_9.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/namespaces/err_9.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/att1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/att1.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/att10 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/att10.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/att11 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/att11.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/att2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/att2.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/att3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/att3.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/att4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/att4.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/att5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/att5.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/att6 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/att6.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/att7 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/att7.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/att8 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/att8.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/att9 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/att9.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/attrib.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/attrib.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/badcomment.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/badcomment.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/bigentname.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/bigentname.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/bigname.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/bigname.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/bigname2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/bigname2.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/cdata (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/cdata-2-byte-UTF-8.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/cdata-2-byte-UTF-8.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/cdata-3-byte-UTF-8.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/cdata-3-byte-UTF-8.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/cdata-4-byte-UTF-8.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/cdata-4-byte-UTF-8.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/cdata.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/cdata2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/cdata2.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/comment.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/comment.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/comment2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/comment2.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/comment3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/comment3.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/comment4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/comment4.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/comment5.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/comment5.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/comment6.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/comment6.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav1.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav10 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav10.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav11 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav11.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav12 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav12.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav13 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav13.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav15 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav15.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav16 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav16.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav17 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav17.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav18 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav18.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav19 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav19.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav2.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav3.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav4.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav5.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav6 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav6.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav7 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav7.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav8 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav8.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav9 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dav9.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/defattr.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/defattr.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/defattr2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/defattr2.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dia1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dia1.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dia2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dia2.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dtd1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dtd1.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dtd10 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dtd10.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dtd11 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dtd11.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dtd12 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dtd12.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dtd13 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dtd13.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dtd2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dtd2.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dtd3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dtd3.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dtd4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dtd4.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dtd5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dtd5.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dtd6 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dtd6.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dtd7 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dtd7.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dtd8 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dtd8.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dtd9 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/dtd9.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ebcdic_566012.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ebcdic_566012.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/emptycdata.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/emptycdata.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent1.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent10 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent10.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent11 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent11.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent12 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent12.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent13 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent13.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent2.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent3.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent4.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent5.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent6 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent6.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent6hex (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent6hex.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent7 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent7.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent8 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent8.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent9 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent9.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent_738805.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ent_738805.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/eve.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/eve.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/icu_parse_test.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/icu_parse_test.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/intsubset.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/intsubset.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/intsubset2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/intsubset2.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/isolat1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/isolat1.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/isolat2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/isolat2.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/isolat3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/isolat3.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/japancrlf.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/japancrlf.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ns (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ns.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ns2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ns2.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ns3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ns3.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ns4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ns4.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ns5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ns5.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ns6 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ns6.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ns7 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/ns7.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/nsclean.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/nsclean.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/p3p (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/p3p.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/pi.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/pi.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/pi2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/pi2.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/rdf1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/rdf1.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/rdf2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/rdf2.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/slashdot.rdf (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/slashdot.rdf.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/slashdot.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/slashdot.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/slashdot16.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/slashdot16.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/svg1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/svg1.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/svg2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/svg2.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/svg3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/svg3.sax2 (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/noent/text-4-byte-UTF-16-BE-offset.xml create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/noent/text-4-byte-UTF-16-BE-offset.xml.sax2 create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/noent/text-4-byte-UTF-16-BE.xml create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/noent/text-4-byte-UTF-16-BE.xml.sax2 create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/noent/text-4-byte-UTF-16-LE-offset.xml create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/noent/text-4-byte-UTF-16-LE-offset.xml.sax2 create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/noent/text-4-byte-UTF-16-LE.xml create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/noent/text-4-byte-UTF-16-LE.xml.sax2 rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/title.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/title.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/tstblanks.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/tstblanks.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/utf16bebom.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/utf16bebom.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/utf16bom.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/utf16bom.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/utf16lebom.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/utf16lebom.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/utf8bom.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/utf8bom.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/wap.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/wap.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/winblanks.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/winblanks.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/wml.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/wml.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/xhtml1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/xhtml1.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/xhtmlcomp (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/xhtmlcomp.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/xml1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/xml1.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/xml2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/noent/xml2.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns2.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns2.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns2.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns2.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns3.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns3.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns3.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns3.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns4.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns4.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns4.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns4.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns5.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns5.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns5.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns5.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns6 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns6.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns6.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns6.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns6.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns7 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns7.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns7.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns7.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/ns7.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/nsclean.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/nsclean.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/nsclean.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/nsclean.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/nsclean.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/p3p (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/p3p.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/p3p.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/p3p.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/p3p.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/pattern/conj (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/pattern/multiple (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/pattern/namespaces (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/pattern/simple (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/pi.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/pi.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/pi.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/pi.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/pi.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/pi2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/pi2.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/pi2.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/pi2.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/pi2.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/rdf1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/rdf1.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/rdf1.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/rdf1.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/rdf1.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/rdf2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/rdf2.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/rdf2.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/rdf2.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/rdf2.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/regexp/branch (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/regexp/bug316338 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/regexp/bug420596 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/regexp/bug649244 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/regexp/bug757711 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/regexp/bug757711.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/regexp/bug783015 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/regexp/bug783015.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/regexp/content (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/regexp/hard (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/regexp/issue301 create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/regexp/issue370 create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/regexp/issue65 rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/regexp/ncname (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/regexp/ranges (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/regexp/ranges2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/regexp/xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/302836_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/307377_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/307377_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/307377_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/492317_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/492317_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/492317_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/558452_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/558452_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/558452_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/558452_3.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/558452_4.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/565219_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/565219_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/565219_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/595792_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/710744_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/710744_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/OpenDocumentSub_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/anyName0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/choice0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/choice0_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/choice0_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/choice0_3.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/choice0_4.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/choice0_5.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/choice0_6.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/choice0_7.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/choice0_8.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/compare0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/comps_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/docbook_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/empty0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/empty1_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/empty1_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/include0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/include1_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/libvirt_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/list_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/list_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/pattern3_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/spec1_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/spec_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor10_10_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor10_1_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor10_1_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor10_1_3.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor10_1_4.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor10_1_5.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor10_1_6.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor10_2_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor10_2_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor10_2_3.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor10_2_4.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor10_3_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor10_4_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor10_5_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor10_6_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor10_7_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor10_7_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor10_7_3.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor10_8_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor10_8_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor10_8_3.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor10_9_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor11_1_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor11_1_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor11_1_3.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor11_2_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor11_2_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor11_2_3.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor11_3_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor11_4_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor12_1_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor13_1_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor1_1_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor1_2_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor1_3_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor1_4_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor2_1_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor3_1_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor3_1_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor3_2_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor3_3_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor3_4_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor3_5_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor3_5_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor3_6_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor3_7_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor3_8_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor3_9_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor4_1_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor4_2_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor4_3_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor4_3_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor4_3_3.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor4_3_4.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor4_3_5.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor4_3_6.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor4_4_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor5_1_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor5_2_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor5_3_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor5_4_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor6_1_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor6_1_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor6_1_3.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor6_1_4.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor6_1_5.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor6_2_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor6_2_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor6_2_3.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor6_2_4.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor6_3_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor7_1_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor7_1_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor7_1_3.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor7_1_4.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor7_2_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor7_2_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor7_2_3.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor7_2_4.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor7_3_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor7_3_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor7_3_3.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor7_3_4.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor7_3_5.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor8_1_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor8_1_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor8_2_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor8_2_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor8_2_3.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor8_2_4.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor8_2_5.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor8_2_6.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor8_3_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor9_10_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor9_11_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor9_12_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor9_1_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor9_2_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor9_2_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor9_3_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor9_3_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor9_4_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor9_4_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor9_5_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor9_5_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor9_5_3.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor9_6_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor9_6_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor9_6_3.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor9_7_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor9_8_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/relaxng/tutor9_9_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/570702_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/579746_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/579746_0_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/579746_0_2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/579746_0_3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/579746_0_3.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/579746_0_4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/579746_0_5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/579746_0_5.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/579746_1_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/579746_1_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/579746_1_2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/579746_1_3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/579746_1_3.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/579746_1_4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/579746_1_5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/579746_1_5.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/582887_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/582906-1_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/582906-2_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all1_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_0_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_0_2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_0_3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_0_3.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_0_4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_0_4.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_0_5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_0_5.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_0_6 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_0_6.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_0_7 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_0_7.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_1_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_1_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_1_2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_1_3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_1_3.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_1_4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_1_5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_1_5.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_1_6 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_1_6.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_1_7 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_1_7.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_2_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_2_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_2_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_2_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_2_2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_2_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_2_3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_2_4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_2_4.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_2_5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_2_5.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_2_6 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/all_2_7 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/allsg_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/allsg_0_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/allsg_0_2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/allsg_0_3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/allsg_0_3.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/allsg_0_4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/allsg_0_4.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/allsg_0_5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/allsg_0_5.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/annot-err_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any1_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any2_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any3_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any3_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any4_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any5_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any5_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any5_0_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any5_0_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any5_0_2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any5_0_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any5_0_3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any5_0_4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any5_0_4.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any5_0_5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any5_0_5.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any5_0_6 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any5_0_6.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any5_1_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any5_1_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any5_1_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any5_1_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any5_1_2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any5_1_3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any5_1_3.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any5_1_4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any5_1_4.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any5_1_5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any5_1_6 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any5_1_6.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any6_1_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any6_2_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any7_1_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any7_1_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any7_1_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any7_1_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any7_1_2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any7_2_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any7_2_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any7_2_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any7_2_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any7_2_2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/any8_1_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/anyAttr-derive-errors1_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/anyAttr-derive1_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/anyAttr-derive2_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/anyAttr-processContents-err1_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/anyAttr-processContents-err1_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/anyAttr-processContents1_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/anyAttr1_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/attr0_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/attruse_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/attruse_0_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/attruse_0_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/attruse_0_2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/attruse_0_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/bug141312_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/bug141333_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/bug143951_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/bug145246_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/bug152470_1_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/bug167754_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/bug303566_1_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/bug303566_1_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/bug306806_1_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/bug309338_1_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/bug310264_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/bug312957_1_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/bug312957_1_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/bug313982_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/bug321475_1_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/bug322411_1_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/bug323510_1_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/bug323510_1_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/bug455953_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/changelog093_1_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/changelog093_1_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_0_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_0_2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_0_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_0_3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_0_3.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_0_4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_0_4.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_0_5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_0_5.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_0_6 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_0_6.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_1_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_1_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_1_2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_1_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_1_3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_1_3.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_1_4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_1_5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_1_5.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_1_6 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_1_6.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_2_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_2_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_2_2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_2_3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_2_4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_2_4.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_2_5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_2_6 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/choice_2_6.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/complex-type-extension_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/cos-ct-extends-1-3_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/cos-st-restricts-1-2-err_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/cos-st-restricts-1-2-err_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/ct-sc-nobase_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/date_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/decimal-1_1_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/decimal-1_1_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/decimal-2_1_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/decimal-2_1_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/decimal-3_1_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/decimal-3_1_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/derivation-ok-extension-err_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/derivation-ok-extension_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/derivation-ok-extension_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/derivation-ok-restriction-2-1-1_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/derivation-ok-restriction-4-1-err_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/derivation-restriction-anyAttr_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/deter0_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/dur_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/elem0_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/element-err_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/element-minmax-err_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/empty-value_1_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/empty-value_1_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/empty_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/empty_1_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/extension0_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/extension1_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/extension1_0_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/extension1_0_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/extension1_0_2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/extension1_0_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/extension2_1_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/facet-unionST-err1_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/facet-unionST-err1_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/facet-whiteSpace_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/group0_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/hexbinary_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/hexbinary_0_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/hexbinary_0_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/idc-keyref-err1_1_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/idc-keyref-err1_1_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/import0_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/import1_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/import2_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/include1_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/include2_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/include3_0_0.err (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/schemas/issue303_0_0 rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/issue40_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/item_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/item_1_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/length1_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/length2_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/length3_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/list0_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/list0_0_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/list0_0_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/list0_0_2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/list0_1_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/list0_1_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/list0_1_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/list0_1_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/list0_1_2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/mixed0_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/mixed1_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/ns0_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/ns0_0_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/ns0_0_2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/ns0_0_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/ns0_0_3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/ns0_0_3.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/ns0_0_4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/ns0_0_4.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/ns0_1_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/ns0_1_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/ns0_1_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/ns0_1_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/ns0_1_2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/ns0_1_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/ns0_1_3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/ns0_1_4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/ns1_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/ns2_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/nvdcve_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/po0_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/po1_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/poschargrp0_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/regexp-char-ref_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/regexp-char-ref_1_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/restrict-CT-attr-ref_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/restriction-attr1_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/restriction-enum-1_1_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/restriction-enum-1_1_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/restriction0_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/scc-no-xmlns_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/scc-no-xsi_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/seq-dubl-elem1_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/seq0_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/src-attribute1_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/src-attribute2_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/src-attribute3-1_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/src-attribute3-2-form_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/src-attribute3-2-st_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/src-attribute3-2-type_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/src-attribute4_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/src-element1_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/src-element2-1_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/src-element2-2_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/src-element3_0_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/subst-group-1_0_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/union2_1_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/union2_1_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/union_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/vdv-first0_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/vdv-first1_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/vdv-first2_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/vdv-first3_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/vdv-first4_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/vdv-first4_0_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/vdv-first4_0_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/vdv-first4_0_2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/vdv-first4_0_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/vdv-first5_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/xsd-list-itemType_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schemas/xsd-simpleType-varieties_0_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon10_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon10_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon10_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon10_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon11_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon11_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon11_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon11_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon11_2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon11_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon11_3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon11_3.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon12_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon12_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon12_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon12_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon12_2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon12_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon13_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon13_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon13_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon13_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon13_2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon13_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon14_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon14_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon15_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon15_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon1_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon1_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon1_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon1_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon2_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon2_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon2_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon2_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon2_2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon2_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon3_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon3_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon4_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon4_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon4_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon4_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon5_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon5_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon5_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon5_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon5_2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon5_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon6_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon6_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon6_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon6_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon6_2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon6_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon7_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon7_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon7_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon7_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon7_2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon7_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon7_3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon7_3.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon7_4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon7_4.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon8_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon8_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon8_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon8_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon8_2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon8_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon9_0 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon9_0.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon9_1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon9_1.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon9_2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/schematron/zvon9_2.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/scripts/base (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/scripts/base2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/scripts/set1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/scripts/set3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/scripts/set3.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/scripts/set4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/slashdot.rdf (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/slashdot.rdf.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/slashdot.rdf.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/slashdot.rdf.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/slashdot.rdf.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/slashdot.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/slashdot.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/slashdot.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/slashdot.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/slashdot.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/slashdot16.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/slashdot16.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/slashdot16.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/slashdot16.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/slashdot16.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/svg1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/svg1.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/svg1.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/svg1.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/svg1.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/svg2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/svg2.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/svg2.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/svg2.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/svg2.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/svg3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/svg3.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/svg3.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/svg3.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/svg3.sax2 (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/text-4-byte-UTF-16-BE-offset.xml create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/text-4-byte-UTF-16-BE-offset.xml.rde create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/text-4-byte-UTF-16-BE-offset.xml.rdr create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/text-4-byte-UTF-16-BE-offset.xml.sax create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/text-4-byte-UTF-16-BE-offset.xml.sax2 create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/text-4-byte-UTF-16-BE.xml create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/text-4-byte-UTF-16-BE.xml.rde create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/text-4-byte-UTF-16-BE.xml.rdr create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/text-4-byte-UTF-16-BE.xml.sax create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/text-4-byte-UTF-16-BE.xml.sax2 create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/text-4-byte-UTF-16-LE-offset.xml create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/text-4-byte-UTF-16-LE-offset.xml.rde create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/text-4-byte-UTF-16-LE-offset.xml.rdr create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/text-4-byte-UTF-16-LE-offset.xml.sax create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/text-4-byte-UTF-16-LE-offset.xml.sax2 create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/text-4-byte-UTF-16-LE.xml create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/text-4-byte-UTF-16-LE.xml.rde create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/text-4-byte-UTF-16-LE.xml.rdr create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/text-4-byte-UTF-16-LE.xml.sax create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/text-4-byte-UTF-16-LE.xml.sax2 rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/title.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/title.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/title.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/title.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/title.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/tstblanks.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/tstblanks.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/tstblanks.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/tstblanks.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/tstblanks.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/utf16bebom.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/utf16bebom.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/utf16bebom.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/utf16bebom.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/utf16bebom.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/utf16bom.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/utf16bom.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/utf16bom.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/utf16bom.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/utf16bom.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/utf16lebom.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/utf16lebom.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/utf16lebom.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/utf16lebom.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/utf16lebom.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/utf8bom.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/utf8bom.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/utf8bom.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/utf8bom.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/utf8bom.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/127772.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/694228.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/737840.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/766956.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/766956.xml.err.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/781333.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/781333.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/781333.xml.err.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/REC-xml-19980210.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/UTF16Entity.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/cond_sect1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/cond_sect2.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/cond_sect2.xml.err.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/dia.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/id1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/id2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/id3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/index.xml (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/mixed_ns.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/notes.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/ns.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/ns2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/objednavka.xml (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/result/valid/pe-test.xml rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/rss.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/rss.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/rss.xml.err.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/t10.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/t11.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/t4.dtd.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/t4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/t4a.dtd.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/t4a.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/t6.dtd.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/t6.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/t8.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/t8.xml.err.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/t8a.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/t8a.xml.err.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/t9.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/t9a.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/xhtml1.xhtml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/xlink.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/xlink.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/valid/xlink.xml.err.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/wap.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/wap.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/wap.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/wap.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/wap.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/winblanks.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/winblanks.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/winblanks.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/winblanks.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/winblanks.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/wml.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/wml.xml.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/wml.xml.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/wml.xml.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/wml.xml.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xhtml1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xhtml1.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xhtml1.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xhtml1.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xhtml1.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xhtmlcomp (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xhtmlcomp.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xhtmlcomp.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xhtmlcomp.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xhtmlcomp.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xml1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xml1.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xml1.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xml1.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xml1.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xml2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xml2.rde (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xml2.rdr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xml2.sax (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xml2.sax2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xmlid/id_err1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xmlid/id_err1.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xmlid/id_err2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xmlid/id_err2.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xmlid/id_tst1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xmlid/id_tst2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xmlid/id_tst2.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xmlid/id_tst3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xmlid/id_tst3.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xmlid/id_tst4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/result/xmlid/id_tst4.xml.err (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/rngparser.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/runsuite.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/runtest.c (93%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/runxmlconf.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/save.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/schematron.c (52%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/53867.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/758518-entity.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/758518-tag.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/758605.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/758606.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/758606_2.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/Down.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/attrents.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/autoclose.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/autoclose2.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/autoclose3.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/cf_128.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/chunked_attr.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/comments.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/comments2.html (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/test/HTML/comments3.html rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/doc2.htm (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/doc3.htm (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/entities.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/entities2.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/fp40.htm (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/html5_enc.html (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/test/HTML/issue318.html create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/test/HTML/issue380.html rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/liclose.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/lt.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/noscript.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/pre.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/python.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/reg1.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/reg2.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/reg3.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/reg4.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/repeat.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/script.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/script2.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/test2.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/test3.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/utf8bug.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/HTML/wired.html (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/4rects.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/a-valid.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/a-wf.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/bike.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/circle.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/defs.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/desc.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/ellipse.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/flower2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/gradient.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/group01.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/group02.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/group03.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/image-valid.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/image-wf.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/lin-gradient.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/marker.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/mask.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/mathswitch.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/parentns.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/path01.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/path02.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/patternfill.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/polyline.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/private.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/rad-gradient.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/rectangle.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/richdesc.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/script.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/structure01.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/style.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/switch.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/symbol-use.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/template.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/text01.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/text02.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/text03.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/toap01.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/toap02.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/transform.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/trivial.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/twin-gradients.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/v-template.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/viewport-nest.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/viewport-transform.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/viewport.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/SVG/wf-template.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/URI/smith.uri (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/URI/uri.data (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VC/AttributeDefaultLegal (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VC/AttributeNmtokens (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VC/DuplicateType (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VC/ElementValid (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VC/ElementValid2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VC/ElementValid3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VC/ElementValid4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VC/ElementValid5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VC/ElementValid6 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VC/ElementValid7 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VC/ElementValid8 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VC/Enumeration (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VC/NS1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VC/NS2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VC/NS3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VC/OneID (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VC/OneID2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VC/OneID3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VC/PENesting (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VC/PENesting2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VC/UniqueElementTypeDeclaration (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VC/UniqueElementTypeDeclaration2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VC/dtds/a.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VC/dtds/doc.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VCM/21.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VCM/AttributeNmtokens.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VCM/v1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VCM/v10.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VCM/v11.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VCM/v12.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VCM/v13.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VCM/v14.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VCM/v15.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VCM/v16.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VCM/v17.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VCM/v18.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VCM/v19.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VCM/v2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VCM/v20.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VCM/v21.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VCM/v22.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VCM/v23.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VCM/v24.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VCM/v3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VCM/v4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VCM/v5.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VCM/v6.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VCM/v7.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VCM/v8.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/VCM/v9.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/WFC/ElemTypeMatch (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/WFC/EntityDeclared (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/WFC/EntityDeclared2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/WFC/EntityDeclared3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/WFC/EntityDeclared4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/WFC/EntityDeclared5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/WFC/LegalCharacter (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/WFC/NoExternalEntityRef (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/WFC/NoLtInAttValue (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/WFC/NoRecursion (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/WFC/PEintsubset (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/WFC/UniqueAttSpec (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/WFC/UniqueAttSpec2 (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/test/XInclude/docs/coalesce.xml rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XInclude/docs/docids.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XInclude/docs/fallback.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XInclude/docs/fallback2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XInclude/docs/fallback3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XInclude/docs/fallback4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XInclude/docs/fallback5.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XInclude/docs/fallback6.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XInclude/docs/include.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XInclude/docs/nodes.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XInclude/docs/nodes2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XInclude/docs/nodes3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XInclude/docs/ns1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XInclude/docs/recursive.xml (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/test/XInclude/docs/red.xml rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XInclude/docs/tstencoding.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XInclude/docs/txtinclude.xml (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/test/XInclude/ents/coalesce1.xml rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XInclude/ents/ids.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XInclude/ents/inc.txt (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XInclude/ents/isolatin.txt (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XInclude/ents/something.txt (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XInclude/ents/something.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XInclude/ents/sub-inc.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/docs/chapters (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/docs/id (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/test/XPath/docs/issue289 rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/docs/lang (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/docs/mixed (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/docs/nodes (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/docs/ns (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/docs/simple (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/docs/str (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/docs/usr1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/docs/vid (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/expr/base (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/expr/compare (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/expr/equality (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/expr/floats (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/expr/functions (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/expr/strings (84%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/tests/chaptersbase (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/tests/chaptersprefol (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/tests/idsimple (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/tests/langsimple (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/tests/mixedpat (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/tests/nodespat (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/tests/nssimple (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/tests/simpleabbr (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/tests/simplebase (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/tests/strbase (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/tests/usr1check (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/tests/vidbase (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x/test/XPath/xptr => libxml2-v2.10.x/test/XPath/xptr-xp1}/chapterschildseq (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/test/XPath/xptr-xp1/chaptersparts create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/test/XPath/xptr-xp1/issue289base create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/test/XPath/xptr-xp1/vidbase rename trunk/libs/libxml2/{libxml2-v2.9.x/test/XPath/xptr => libxml2-v2.10.x/test/XPath/xptr-xp1}/vidchildseq (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/test/XPath/xptr-xp1/viderror create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/test/XPath/xptr-xp1/vidparts rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/xptr/chaptersparts (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/xptr/chaptersrange (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/test/XPath/xptr/issue289base rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/xptr/strpoint (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/xptr/strrange (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/xptr/strrange2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/xptr/strrange3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/xptr/vidbase (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/xptr/viderror (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/XPath/xptr/vidparts (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/att1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/att10 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/att11 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/att2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/att3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/att4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/att5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/att6 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/att7 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/att8 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/att9 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/attrib.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/automata/a (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/automata/aba (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/automata/abaa (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/automata/abba (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/automata/po (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/badcomment.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/bigentname.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/bigname.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/bigname2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/doc.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/example-1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/example-2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/example-3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/example-4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/example-5.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/example-6.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/example-7.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/example-7.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/example-8.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/example-8.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/world.txt (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlbase-c14n11spec-102.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlbase-c14n11spec-102.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlbase-c14n11spec2-102.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlbase-c14n11spec2-102.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlbase-c14n11spec3-102.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlbase-c14n11spec3-102.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlbase-prop-1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlbase-prop-1.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlbase-prop-2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlbase-prop-2.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlbase-prop-3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlbase-prop-3.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlbase-prop-4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlbase-prop-4.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlbase-prop-5.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlbase-prop-5.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlbase-prop-6.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlbase-prop-6.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlbase-prop-7.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlbase-prop-7.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlid-prop-1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlid-prop-1.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlid-prop-2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlid-prop-2.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmllang-prop-1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmllang-prop-1.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmllang-prop-2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmllang-prop-2.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmllang-prop-3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmllang-prop-3.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmllang-prop-4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmllang-prop-4.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlspace-prop-1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlspace-prop-1.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlspace-prop-2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlspace-prop-2.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlspace-prop-3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlspace-prop-3.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlspace-prop-4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/1-1-without-comments/xmlspace-prop-4.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-09.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-09.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-10.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-10.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-11.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-11.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-12.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-12.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-13.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-13.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-14.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-14.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-15.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-15.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-16.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-16.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-17.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-17.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-18.ns (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-18.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-18.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-19.ns (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-19.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-19.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-20.ns (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-20.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-20.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-21.ns (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-21.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-21.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-22.ns (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-22.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-22.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-23.ns (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-23.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-23.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-24.ns (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-24.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-24.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-25.ns (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-25.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-25.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-26.ns (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-26.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/merlin-c14n-two-26.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/test-0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/test-0.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/test-1.ns (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/test-1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/test-1.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/test-2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/exc-without-comments/test-2.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/with-comments/doc.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/with-comments/example-1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/with-comments/example-2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/with-comments/example-3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/with-comments/example-4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/with-comments/example-5.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/with-comments/example-6.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/with-comments/example-7.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/with-comments/example-7.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/with-comments/world.txt (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/doc.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/example-1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/example-2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/example-3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/example-4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/example-5.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/example-6.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/example-7.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/example-7.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/merlin-c14n-two-00.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/merlin-c14n-two-00.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/merlin-c14n-two-01.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/merlin-c14n-two-01.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/merlin-c14n-two-02.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/merlin-c14n-two-02.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/merlin-c14n-two-03.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/merlin-c14n-two-03.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/merlin-c14n-two-04.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/merlin-c14n-two-04.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/merlin-c14n-two-05.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/merlin-c14n-two-05.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/merlin-c14n-two-06.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/merlin-c14n-two-06.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/merlin-c14n-two-07.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/merlin-c14n-two-07.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/merlin-c14n-two-08.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/merlin-c14n-two-08.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/test-0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/test-0.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/test-1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/test-1.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/test-2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/test-2.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/test-3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/test-3.xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/c14n/without-comments/world.txt (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/catalogs/catal.script (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/catalogs/catal.sgml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/catalogs/catal1.sgml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/catalogs/catal2.sgml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/catalogs/catal3.sgml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/catalogs/docbook.script (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/catalogs/docbook.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/catalogs/registry.script (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/catalogs/registry.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/catalogs/stylesheet.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/catalogs/whites.script (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/catalogs/whites.sgml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/catalogs/whitex.script (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/catalogs/whitex.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/cdata (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/cdata-2-byte-UTF-8.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/cdata-3-byte-UTF-8.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/cdata-4-byte-UTF-8.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/cdata2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/comment.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/comment2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/comment3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/comment4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/comment5.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/comment6.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dav1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dav10 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dav11 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dav12 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dav13 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dav15 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dav16 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dav17 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dav18 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dav19 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dav2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dav3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dav4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dav5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dav6 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dav7 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dav8 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dav9 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/defattr.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/defattr2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dia1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dia2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dtd1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dtd10 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dtd11 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dtd12 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dtd13 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dtd2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dtd3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dtd4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dtd5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dtd6 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dtd7 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dtd8 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dtd9 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/dtds/eve.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/ebcdic_566012.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/emptycdata.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/ent1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/ent10 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/ent11 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/ent12 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/ent13 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/ent2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/ent3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/ent4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/ent5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/ent6 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/ent6hex (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/ent7 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/ent8 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/ent9 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/ent_738805.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/errors/754946.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/errors/754947.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/errors/758588.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/errors/759020.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/errors/759398.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/errors/759573-2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/errors/759573.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/errors/759579.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/errors/attr1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/errors/attr2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/errors/attr3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/errors/attr4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/errors/cdata.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/errors/charref1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/errors/comment1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/errors/content1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/errors/dtd13 (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/test/errors/ent_redecl.xml rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/errors/extparsedent.xml (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/test/errors/issue151.xml rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/errors/name.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/errors/name2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/errors/rec_ext.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/errors/rec_ext_ent.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/errors10/781205.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/errors10/781361.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/eve.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/expr/base (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/icu_parse_test.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/intsubset.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/intsubset2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/isolat1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/isolat2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/isolat3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/japancrlf.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/namespaces/err_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/namespaces/err_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/namespaces/err_10.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/namespaces/err_11.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/namespaces/err_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/namespaces/err_3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/namespaces/err_4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/namespaces/err_5.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/namespaces/err_6.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/namespaces/err_7.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/namespaces/err_8.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/namespaces/err_9.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/namespaces/reconcile/tests-to-c.xsl (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/namespaces/reconcile/tests.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/ns (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/ns2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/ns3 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/ns4 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/ns5 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/ns6 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/ns7 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/nsclean.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/p3p (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/pattern/conj.pat (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/pattern/conj.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/pattern/multiple.pat (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/pattern/multiple.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/pattern/namespaces.pat (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/pattern/namespaces.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/pattern/simple.pat (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/pattern/simple.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/pi.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/pi2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/rdf1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/rdf2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/recurse/good.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/recurse/goodattr.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/recurse/lol1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/recurse/lol2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/recurse/lol3.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/recurse/lol3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/recurse/lol4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/recurse/lol5.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/recurse/lol6.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/regexp/branch (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/regexp/bug316338 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/regexp/bug420596 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/regexp/bug649244 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/regexp/bug757711 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/regexp/bug783015 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/regexp/content (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/regexp/hard (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/test/regexp/issue301 create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/test/regexp/issue370 create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/test/regexp/issue65 rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/regexp/ncname (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/regexp/ranges (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/regexp/ranges2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/regexp/xpath (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/302836.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/302836_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/307377.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/307377_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/307377_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/307377_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/492317.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/492317_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/492317_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/492317_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/558452.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/558452_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/558452_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/558452_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/558452_3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/558452_4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/565219.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/565219_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/565219_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/565219_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/595792-ext.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/595792.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/595792_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/710744.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/710744_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/710744_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/OASIS/spectest.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/OpenDocumentSub.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/OpenDocumentSub_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/addressBook.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/ambig_name-class.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/ambig_name-class.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/ambig_name-class2.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/ambig_name-class2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/anyName0.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/anyName0_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/choice0.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/choice0_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/choice0_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/choice0_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/choice0_3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/choice0_4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/choice0_5.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/choice0_6.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/choice0_7.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/choice0_8.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/compare0.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/compare0_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/comps.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/comps_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/demo.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/demo.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/demo2.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/demo3.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/docbook.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/docbook_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/empty0.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/empty0_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/empty1.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/empty1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/empty1_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/include0.inc (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/include0.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/include0_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/include1-0.inc (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/include1-1.inc (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/include1.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/include1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/inline.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/inline2.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/inline3.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/interleave0_0.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/interleave1_0.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/libvirt.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/libvirt_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/list.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/list_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/list_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/pattern1.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/pattern2.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/pattern3.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/pattern3_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/proofsystem.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/rngbug-001.ext (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/rngbug-001.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/rngbug-001.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/spec.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/spec1.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/spec1_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/spec_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/table.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/testsuite.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_1.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_10.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_10_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_1_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_1_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_1_3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_1_4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_1_5.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_1_6.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_2.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_2_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_2_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_2_3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_2_4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_3.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_3_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_4.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_4_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_5.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_5_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_6.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_6_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_7.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_7_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_7_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_7_3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_8.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_8_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_8_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_8_3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_9.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor10_9_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor11_1.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor11_1_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor11_1_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor11_1_3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor11_2.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor11_2_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor11_2_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor11_2_3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor11_3.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor11_3_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor11_4.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor11_4_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor12_1.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor12_1_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor13_1.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor13_1_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor14_1.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor1_1.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor1_1_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor1_2.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor1_2_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor1_3.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor1_3_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor1_4.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor1_4_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor2_1.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor2_1_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor3_1.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor3_1_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor3_1_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor3_2.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor3_2_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor3_3.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor3_3_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor3_4.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor3_4_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor3_5.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor3_5_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor3_5_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor3_6.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor3_6_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor3_7.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor3_7_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor3_8.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor3_8_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor3_9.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor3_9_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor4_1.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor4_1_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor4_2.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor4_2_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor4_3.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor4_3_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor4_3_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor4_3_3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor4_3_4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor4_3_5.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor4_3_6.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor4_4.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor4_4_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor5_1.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor5_1_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor5_2.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor5_2_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor5_3.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor5_3_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor5_4.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor5_4_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor5_5.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor6_1.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor6_1_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor6_1_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor6_1_3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor6_1_4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor6_1_5.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor6_2.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor6_2_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor6_2_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor6_2_3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor6_2_4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor6_3.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor6_3_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor7_1.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor7_1_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor7_1_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor7_1_3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor7_1_4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor7_2.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor7_2_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor7_2_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor7_2_3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor7_2_4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor7_3.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor7_3_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor7_3_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor7_3_3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor7_3_4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor7_3_5.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor8_1.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor8_1_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor8_1_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor8_2.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor8_2_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor8_2_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor8_2_3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor8_2_4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor8_2_5.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor8_2_6.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor8_3.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor8_3_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_1.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_10.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_10_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_11.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_11_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_12.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_12_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_1_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_2.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_2_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_2_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_3.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_3_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_3_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_4.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_4_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_4_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_5.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_5_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_5_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_5_3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_6.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_6_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_6_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_6_3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_7.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_7_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_8.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_8_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_9.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutor9_9_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/relaxng/tutorA.rng (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/570702_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/570702_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/579746_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/579746_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/579746_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/579746_1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/579746_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/579746_3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/579746_4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/579746_5.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/582887-attribute.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/582887-common.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/582887-element.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/582887_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/582887_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/582906-1-common.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/582906-1-prog1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/582906-1-prog2-include.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/582906-1-prog2.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/582906-1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/582906-1_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/582906-2-common.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/582906-2-prog1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/582906-2-prog2-include.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/582906-2-prog2.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/582906-2_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/582906-2_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/all.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/all1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/all1_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/all_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/all_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/all_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/all_1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/all_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/all_2.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/all_3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/all_4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/all_5.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/all_6.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/all_7.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/allsg_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/allsg_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/allsg_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/allsg_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/allsg_3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/allsg_4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/allsg_5.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/annot-err_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/annot-err_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/any1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/any1_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/any2_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/any2_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/any3_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/any3_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/any4_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/any4_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/any5_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/any5_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/any5_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/any5_1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/any5_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/any5_3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/any5_4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/any5_5.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/any5_6.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/any6_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/any6_1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/any6_2.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/any7_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/any7_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/any7_1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/any7_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/any7_2.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/any8_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/any8_1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/anyAttr-derive-errors1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/anyAttr-derive-errors1_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/anyAttr-derive1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/anyAttr-derive1_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/anyAttr-derive2_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/anyAttr-derive2_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/anyAttr-errors1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/anyAttr-processContents-err1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/anyAttr-processContents-err1_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/anyAttr-processContents1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/anyAttr-processContents1_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/anyAttr.importA.1_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/anyAttr.importB.1_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/anyAttr1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/anyAttr1_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/attr0_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/attr0_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/attruse_0_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/attruse_0_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/attruse_0_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/attruse_0_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug141312_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug141312_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug141333.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug141333.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug141333_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug141333_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug143951.imp (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug143951_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug143951_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug145246.xsd.imp (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug145246_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug145246_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug152470_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug152470_1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug167754_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug167754_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug303566_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug303566_1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug306806_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug306806_1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug309338_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug309338_1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug310264_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug310264_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug312957_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug312957_1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug313982_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug313982_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug321475_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug321475_1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug322411_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug322411_1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug323510_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug323510_1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug455953_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/bug455953_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/changelog093_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/changelog093_1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/choice_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/choice_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/choice_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/choice_1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/choice_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/choice_2.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/choice_3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/choice_4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/choice_5.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/choice_6.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/complex-type-extension_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/complex-type-extension_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/cos-ct-extends-1-3_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/cos-ct-extends-1-3_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/cos-st-restricts-1-2-err_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/cos-st-restricts-1-2-err_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/ct-sc-nobase_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/ct-sc-nobase_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/date_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/date_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/decimal-1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/decimal-1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/decimal-1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/decimal-1_1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/decimal-2_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/decimal-2_1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/decimal-3_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/decimal-3_1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/derivation-ok-extension-err_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/derivation-ok-extension-err_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/derivation-ok-extension_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/derivation-ok-extension_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/derivation-ok-restriction-2-1-1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/derivation-ok-restriction-2-1-1_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/derivation-ok-restriction-4-1-err_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/derivation-ok-restriction-4-1-err_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/derivation-restriction-anyAttr_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/derivation-restriction-anyAttr_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/derivation-restriction-anyType.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/derivation-restriction-anyType.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/deter0_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/deter0_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/dur_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/dur_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/elem0_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/elem0_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/element-err_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/element-err_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/element-minmax-err_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/element-minmax-err_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/empty-value_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/empty-value_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/empty-value_1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/empty_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/empty_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/empty_1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/extension0_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/extension0_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/extension1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/extension1_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/extension1_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/extension1_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/extension2_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/extension2_1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/facet-unionST-err1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/facet-unionST-err1_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/facet-whiteSpace_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/facet-whiteSpace_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/group0_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/group0_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/hexbinary_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/hexbinary_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/hexbinary_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/idc-keyref-err1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/idc-keyref-err1_1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/import-455953.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/import-bad-1_0.imp (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/import0_0.imp (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/import0_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/import0_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/import1_0.imp (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/import1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/import1_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/import1_0b.imp (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/import2_0.imp (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/import2_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/import2_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/include1_0.inc (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/include1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/include1_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/include2_0.inc (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/include2_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/include2_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/include3_0.inc (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/include3_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/include3_0.xsd (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/test/schemas/issue303_0.xml create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/test/schemas/issue303_0.xsd rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/issue40_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/issue40_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/item_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/item_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/item_1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/length1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/length1_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/length2_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/length2_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/length3_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/length3_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/list0_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/list0_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/list0_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/list0_1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/list0_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/mixed0_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/mixed0_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/mixed1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/mixed1_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/ns0_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/ns0_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/ns0_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/ns0_1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/ns0_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/ns0_3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/ns0_4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/ns1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/ns1_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/ns2_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/ns2_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/nvdcve_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/nvdcve_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/po0_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/po0_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/po1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/po1_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/poschargrp0_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/poschargrp0_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/regexp-char-ref_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/regexp-char-ref_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/regexp-char-ref_1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/restrict-CT-attr-ref_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/restrict-CT-attr-ref_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/restriction-attr1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/restriction-attr1_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/restriction-enum-1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/restriction-enum-1_1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/restriction0_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/restriction0_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/scc-no-xmlns_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/scc-no-xmlns_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/scc-no-xsi_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/scc-no-xsi_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/seq-dubl-elem1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/seq-dubl-elem1_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/seq0_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/seq0_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/src-attribute1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/src-attribute1_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/src-attribute2_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/src-attribute2_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/src-attribute3-1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/src-attribute3-1_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/src-attribute3-2-form_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/src-attribute3-2-form_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/src-attribute3-2-st_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/src-attribute3-2-st_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/src-attribute3-2-type_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/src-attribute3-2-type_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/src-attribute4_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/src-attribute4_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/src-element1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/src-element1_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/src-element2-1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/src-element2-1_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/src-element2-2_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/src-element2-2_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/src-element3_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/src-element3_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/subst-group-1_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/subst-group-1_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/union2_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/union2_1.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/union_0_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/union_0_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/vdv-complexTypes.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/vdv-first0_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/vdv-first0_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/vdv-first1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/vdv-first1_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/vdv-first2_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/vdv-first2_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/vdv-first3_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/vdv-first3_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/vdv-first4_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/vdv-first4_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/vdv-first4_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/vdv-first4_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/vdv-first5_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/vdv-first5_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/vdv-simpleTypes.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/xml.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/xsd-list-itemType_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/xsd-list-itemType_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/xsd-simpleType-varieties_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schemas/xsd-simpleType-varieties_0.xsd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon1.sct (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon10.sct (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon10_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon10_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon11.sct (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon11_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon11_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon11_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon11_3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon12.sct (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon12_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon12_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon12_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon13.sct (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon13_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon13_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon13_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon14.sct (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon14_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon15.sct (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon15_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon1_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon1_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon2.sct (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon2_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon2_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon2_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon3.sct (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon3_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon4.sct (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon4_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon4_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon5.sct (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon5_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon5_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon5_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon6.sct (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon6_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon6_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon6_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon7.sct (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon7_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon7_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon7_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon7_3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon7_4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon8.sct (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon8_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon8_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon8_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon9.sct (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon9_0.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon9_1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/schematron/zvon9_2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/scripts/base.script (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/scripts/base.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/scripts/base2.script (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/scripts/base2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/scripts/set1.script (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/scripts/set1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/scripts/set3.script (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/scripts/set3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/scripts/set4.script (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/scripts/set4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/slashdot.rdf (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/slashdot.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/slashdot16.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/svg1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/svg2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/svg3 (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/test/text-4-byte-UTF-16-BE-offset.xml create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/test/text-4-byte-UTF-16-BE.xml create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/test/text-4-byte-UTF-16-LE-offset.xml create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/test/text-4-byte-UTF-16-LE.xml rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/threads/a.example.org.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/threads/a/a.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/threads/abc.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/threads/abc.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/threads/acb.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/threads/acb.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/threads/b.example.org.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/threads/b/b.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/threads/bac.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/threads/bac.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/threads/bca.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/threads/bca.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/threads/c.example.org.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/threads/c/c.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/threads/cab.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/threads/cab.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/threads/cba.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/threads/cba.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/threads/complex.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/threads/example.org.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/threads/invalid.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/title.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/tstblanks.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/utf16bebom.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/utf16bom.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/utf16lebom.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/utf8bom.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/127772.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/694228.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/737840.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/766956.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/781333.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/REC-xml-19980210.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/UTF16Entity.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/cond_sect1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/cond_sect2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/dia.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/dtds/127772.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/dtds/694228.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/dtds/737840.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/dtds/766956.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x/test/valid/dtds/NewsMLv1.0.dtd => libxml2-v2.10.x/test/valid/dtds/NewsMLv1.2.dtd} (64%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/dtds/cond_sect1.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/dtds/cond_sect2.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/dtds/destfoo.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/dtds/external.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/dtds/external2.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/dtds/nitf-2-5.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/dtds/notes.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/dtds/objednavka.dtd (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/test/valid/dtds/pe-test.dtd rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/dtds/spec.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/dtds/utf16b.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/dtds/utf16l.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/dtds/xhtml-lat1.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/dtds/xhtml-special.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/dtds/xhtml-symbol.ent (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/dtds/xhtml.cat (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/dtds/xhtml1-frameset.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/dtds/xhtml1-strict.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/dtds/xhtml1-transitional.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/dtds/xhtml1.dcl (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/dtds/xmlspec.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/id1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/id2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/id3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/index.xml (97%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/mixed_ns.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/notes.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/ns.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/ns2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/objednavka.xml (100%) create mode 100644 trunk/libs/libxml2/libxml2-v2.10.x/test/valid/pe-test.xml rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/rss.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/t10.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/t11.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/t4.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/t4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/t4a.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/t4a.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/t6.dtd (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/t6.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/t8.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/t8a.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/t9.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/t9a.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/xhtml1.xhtml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/valid/xlink.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/wap.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/warning/ent8 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/warning/ent9 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/winblanks.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/wml.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/xhtml1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/xhtmlcomp (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/xml1 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/xml2 (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/xmlid/id_err1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/xmlid/id_err2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/xmlid/id_tst1.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/xmlid/id_tst2.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/xmlid/id_tst3.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/xmlid/id_tst4.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/xsdtest/xsdtest.xml (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/xsdtest/xsdtest.xsl (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/test/xsdtest/xsdtestsuite.xml (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/testAutomata.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/testModule.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/testOOM.c (97%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/testOOMlib.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/testOOMlib.h (87%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/testThreads.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/testapi.c (96%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/testchar.c (80%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/testdict.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/testdso.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/testlimits.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/testrecurse.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/threads.c (97%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/timsort.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/tree.c (97%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/trio.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/trio.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/triodef.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/trionan.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/trionan.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/triop.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/triostr.c (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/triostr.h (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/uri.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/valid.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/vms/build_libxml.com (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/vms/config.vms (72%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/vms/diffs.vms (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/vms/readme.vms (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/win32/Makefile.bcb (94%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/win32/Makefile.mingw (92%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/win32/Makefile.msvc (81%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/win32/Readme.txt (100%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/win32/configure.js (96%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/win32/defgen.xsl (89%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/win32/libxml2.def.src (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/win32/libxml2.rc (91%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/xinclude.c (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/xlink.c (93%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/xml2-config.in (97%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/xmlIO.c (97%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/xmlcatalog.c (94%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/xmllint.c (96%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/xmlmemory.c (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/xmlmodule.c (97%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/xmlreader.c (97%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/xmlregexp.c (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/xmlsave.c (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/xmlschemas.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/xmlschemastypes.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/xmlstring.c (95%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/xmlunicode.c (98%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/xmlwriter.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/xpath.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/xpointer.c (97%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/xstc/Makefile.am (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/xstc/fixup-tests.py (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/xstc/xstc-to-python.xsl (96%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/xstc/xstc.py (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/xzlib.c (99%) rename trunk/libs/libxml2/{libxml2-v2.9.x => libxml2-v2.10.x}/xzlib.h (100%) delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/DOCBparser.c delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/INSTALL.libxml2 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/MAINTAINERS delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/Makefile.am delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/Makefile.win delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/README delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/VxWorks/README delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/VxWorks/build.sh delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/acinclude.m4 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/bakefile/Bakefiles.bkgen delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/bakefile/Readme.txt delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/bakefile/libxml2.bkl delete mode 100755 trunk/libs/libxml2/libxml2-v2.9.x/check-xinclude-test-suite.py delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk0.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk1.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk10.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk11.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk12.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk13.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk14.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk15.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk16.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk17.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk18.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk19.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk2.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk20.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk21.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk22.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk23.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk24.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk25.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk26.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk27.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk28.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk29.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk3.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk4.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk5.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk6.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk7.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk8.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIchunk9.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIconstructors.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIfiles.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIfunctions.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/APIsymbols.html delete mode 100755 trunk/libs/libxml2/libxml2-v2.9.x/doc/ChangeLog.awk delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/ChangeLog.xsl delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/DOM.fig delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/DOM.gif delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/DOM.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/FAQ.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/Libxml2-Logo-180x168.gif delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/Libxml2-Logo-90x34.gif delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/Makefile.am delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/README.docs delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/XMLinfo.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/XSLT.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/api.xsl delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/architecture.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/bugs.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/catalog.fig delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/catalog.gif delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/catalog.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/contribs.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/general.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/index.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-DOCBparser.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-HTMLparser.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-HTMLtree.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-SAX.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-SAX2.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-c14n.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-catalog.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-chvalid.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-debugXML.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-dict.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-encoding.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-entities.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-globals.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-hash.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-list.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-nanoftp.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-nanohttp.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-parser.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-parserInternals.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-pattern.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-relaxng.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-schemasInternals.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-schematron.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-threads.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-tree.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-uri.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-valid.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-xinclude.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-xlink.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-xmlIO.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-xmlautomata.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-xmlexports.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-xmlmemory.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-xmlmodule.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-xmlreader.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-xmlregexp.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-xmlsave.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-xmlschemas.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-xmlschemastypes.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-xmlstring.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-xmlunicode.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-xmlversion.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-xmlwriter.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-xpath.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-xpathInternals.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2-xpointer.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/devhelp/libxml2.devhelp delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/docdescr.doc delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/docs.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/downloads.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/elfgcchack.xsl delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/encoding.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/entities.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/epatents.png delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/example.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/examples/examples.xsl delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/examples/index.html delete mode 100755 trunk/libs/libxml2/libxml2-v2.9.x/doc/examples/index.py delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/examples/io1.res delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/examples/reader1.res delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/examples/reader3.res delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/examples/reader4.res delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/examples/tree1.res delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/examples/tree2.res delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/examples/tst.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/examples/writer.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/examples/xpath1.res delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/examples/xpath2.res delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/favicon.ico delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/gnome2.png delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/guidelines.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/help.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/book1.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/home.png delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/index.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/index.sgml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/left.png delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-DOCBparser.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-HTMLparser.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-HTMLtree.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-SAX.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-SAX2.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-c14n.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-catalog.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-chvalid.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-debugXML.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-dict.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-encoding.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-entities.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-globals.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-hash.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-lib.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-list.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-nanoftp.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-nanohttp.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-parser.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-parserInternals.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-pattern.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-relaxng.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-schemasInternals.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-schematron.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-threads.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-tree.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-uri.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-valid.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-xinclude.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-xlink.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-xmlIO.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-xmlautomata.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-xmlerror.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-xmlexports.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-xmlmemory.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-xmlmodule.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-xmlreader.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-xmlregexp.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-xmlsave.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-xmlschemas.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-xmlschemastypes.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-xmlstring.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-xmlunicode.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-xmlversion.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-xmlwriter.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-xpath.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-xpathInternals.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml-xpointer.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/libxml.devhelp delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/right.png delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/html/up.png delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/index.html delete mode 100755 trunk/libs/libxml2/libxml2-v2.9.x/doc/index.py delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/interface.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/intro.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/library.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/libxml.fig delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/libxml.gif delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/libxml2-refs.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/libxml2.xsa delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/namespaces.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/newapi.xsl delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/news.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/news.xsl delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/python.html delete mode 100755 trunk/libs/libxml2/libxml2-v2.9.x/doc/queries.py delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/redhat.gif delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/search.php delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/searches.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/searches.xsl delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/searches/AllQueries-20040408.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/searches/Queries-20040408.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/site.xsl delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/smallfootonly.gif delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/structure.fig delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/structure.gif delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/threads.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/tree.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/tutorial/xmltutorial.pdf delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/upgrade.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/w3c.png delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/wiki.xsl delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/xml.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/xmldtd.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/xmlio.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/xmlmem.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/xmlreader.html delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/doc/xsa.xsl delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/elfgcchack.h delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/example/Makefile.am delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/include/libxml/DOCBparser.h delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/include/libxml/xmlwin32version.h delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/include/libxml/xmlwin32version.h.in delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/include/win32config.h delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/libxml-2.0-uninstalled.pc.in delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/libxml.3 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/libxml2.doap delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/macos/README delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/macos/libxml2.mcp.xml.sit.hqx delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/macos/src/XMLTestPrefix.h delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/macos/src/XMLTestPrefix2.h delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/macos/src/config-mac.h delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/macos/src/libxml2_GUSIConfig.cp delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/macos/src/macos_main.c delete mode 100755 trunk/libs/libxml2/libxml2-v2.9.x/regressions.py delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/regressions.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/HTML/53867.html.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/HTML/Down.html.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/HTML/attrents.html.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/HTML/autoclose.html.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/HTML/autoclose2.html.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/HTML/autoclose3.html.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/HTML/cf_128.html.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/HTML/chunked_attr.html.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/HTML/entities2.html.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/HTML/html5_enc.html.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/HTML/liclose.html.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/HTML/lt.html.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/HTML/noscript.html.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/HTML/pre.html.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/HTML/python.html.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/HTML/reg1.html.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/HTML/reg2.html.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/HTML/reg3.html.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/HTML/repeat.html.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/HTML/script.html.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/HTML/script2.html.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/HTML/test2.html.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/SVG/bike-errors.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/SVG/bike.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/SVG/flower2.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/SVG/parentns.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/SVG/richdesc.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/SVG/transform.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/SVG/viewport-transform.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/SVG/viewport.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/VC/NS1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/VC/NS1.rdr delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/XInclude/docids.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/XInclude/fallback.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/XInclude/fallback2.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/XInclude/fallback3.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/XInclude/fallback4.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/XInclude/fallback6.xml.rdr delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/XInclude/include.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/XInclude/nodes.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/XInclude/nodes2.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/XInclude/nodes3.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/XInclude/recursive.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/XInclude/tstencoding.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/XInclude/txtinclude.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/c14n/exc-without-comments/merlin-c14n-two-15 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/c14n/exc-without-comments/merlin-c14n-two-16 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/c14n/exc-without-comments/merlin-c14n-two-25 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/errors/754946.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/errors/754947.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/errors/758588.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/errors/759020.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/errors/759398.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/errors/759573-2.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/errors/759573.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/errors/759579.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/errors/attr1.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/errors/attr2.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/errors/attr4.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/errors/cdata.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/errors/charref1.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/errors/comment1.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/errors/content1.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/errors/extparsedent.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/errors/extparsedent.xml.str delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/errors/name.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/errors/name2.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/errors/rec_ext_ent.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/errors/rec_ext_ent.xml.str delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/errors10/781205.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/errors10/781361.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/example.dtd delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/namespaces/err_0.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/namespaces/err_10.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/namespaces/err_11.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/302836_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/302836_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/302836_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/307377_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/307377_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/307377_2 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/307377_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/307377_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/492317_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/492317_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/492317_2 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/492317_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/492317_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/558452_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/558452_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/558452_2 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/558452_3 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/558452_4 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/558452_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/558452_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/565219_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/565219_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/565219_2 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/565219_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/565219_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/595792-ext_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/595792-ext_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/595792_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/595792_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/595792_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/710744_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/710744_2 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/710744_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/710744_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/OpenDocumentSub_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/OpenDocumentSub_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/OpenDocumentSub_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/addressBook_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/addressBook_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/ambig_name-class2_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/ambig_name-class2_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/ambig_name-class_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/ambig_name-class_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/anyName0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/anyName0_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/anyName0_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/choice0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/choice0_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/choice0_2 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/choice0_3 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/choice0_4 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/choice0_5 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/choice0_6 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/choice0_7 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/choice0_8 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/choice0_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/choice0_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/compare0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/compare0_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/compare0_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/comps_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/comps_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/comps_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/demo2_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/demo2_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/demo3_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/demo3_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/demo_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/demo_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/docbook_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/docbook_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/docbook_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/empty0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/empty0_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/empty0_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/empty1_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/empty1_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/empty1_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/empty1_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/include0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/include0_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/include0_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/include1_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/include1_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/include1_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/inline2_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/inline2_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/inline3_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/inline3_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/inline_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/inline_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/interleave0_0_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/interleave0_0_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/interleave1_0_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/interleave1_0_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/libvirt_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/libvirt_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/libvirt_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/list_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/list_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/list_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/list_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/pattern1_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/pattern1_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/pattern2_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/pattern2_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/pattern3_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/pattern3_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/pattern3_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/proofsystem_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/proofsystem_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/rngbug-001_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/rngbug-001_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/spec1_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/spec1_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/spec1_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/spec_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/spec_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/spec_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/table_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/table_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_10_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_10_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_10_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_1_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_1_2 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_1_3 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_1_4 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_1_5 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_1_6 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_1_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_1_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_2_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_2_2 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_2_3 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_2_4 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_2_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_2_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_3_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_3_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_3_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_4_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_4_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_4_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_5_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_5_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_5_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_6_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_6_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_6_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_7_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_7_2 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_7_3 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_7_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_7_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_8_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_8_2 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_8_3 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_8_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_8_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_9_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_9_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor10_9_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor11_1_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor11_1_2 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor11_1_3 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor11_1_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor11_1_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor11_2_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor11_2_2 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor11_2_3 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor11_2_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor11_2_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor11_3_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor11_3_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor11_3_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor11_4_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor11_4_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor11_4_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor12_1_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor12_1_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor12_1_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor13_1_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor13_1_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor13_1_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor14_1_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor14_1_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor1_1_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor1_1_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor1_1_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor1_2_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor1_2_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor1_2_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor1_3_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor1_3_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor1_3_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor1_4_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor1_4_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor1_4_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor2_1_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor2_1_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor2_1_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor3_1_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor3_1_2 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor3_1_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor3_1_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor3_2_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor3_2_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor3_2_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor3_3_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor3_3_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor3_3_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor3_4_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor3_4_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor3_4_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor3_5_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor3_5_2 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor3_5_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor3_5_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor3_6_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor3_6_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor3_6_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor3_7_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor3_7_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor3_7_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor3_8_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor3_8_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor3_8_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor3_9_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor3_9_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor3_9_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor4_1_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor4_1_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor4_1_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor4_2_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor4_2_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor4_2_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor4_3_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor4_3_2 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor4_3_3 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor4_3_4 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor4_3_5 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor4_3_6 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor4_3_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor4_3_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor4_4_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor4_4_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor4_4_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor5_1_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor5_1_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor5_1_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor5_2_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor5_2_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor5_2_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor5_3_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor5_3_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor5_3_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor5_4_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor5_4_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor5_4_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor5_5_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor5_5_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor6_1_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor6_1_2 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor6_1_3 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor6_1_4 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor6_1_5 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor6_1_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor6_1_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor6_2_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor6_2_2 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor6_2_3 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor6_2_4 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor6_2_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor6_2_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor6_3_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor6_3_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor6_3_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor7_1_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor7_1_2 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor7_1_3 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor7_1_4 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor7_1_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor7_1_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor7_2_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor7_2_2 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor7_2_3 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor7_2_4 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor7_2_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor7_2_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor7_3_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor7_3_2 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor7_3_3 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor7_3_4 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor7_3_5 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor7_3_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor7_3_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor8_1_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor8_1_2 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor8_1_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor8_1_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor8_2_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor8_2_2 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor8_2_3 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor8_2_4 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor8_2_5 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor8_2_6 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor8_2_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor8_2_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor8_3_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor8_3_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor8_3_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_10_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_10_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_10_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_11_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_11_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_11_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_12_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_12_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_12_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_1_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_1_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_1_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_2_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_2_2 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_2_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_2_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_3_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_3_2 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_3_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_3_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_4_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_4_2 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_4_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_4_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_5_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_5_2 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_5_3 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_5_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_5_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_6.rng delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_6_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_6_2 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_6_3 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_6_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_6_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_7_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_7_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_7_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_8_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_8_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_8_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_9_1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_9_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutor9_9_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutorA_err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/relaxng/tutorA_valid delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/570702_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/579746_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/579746_0_1.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/579746_0_2.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/579746_0_4.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/579746_1_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/579746_1_1.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/579746_1_2.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/579746_1_4.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/582887_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/582906-1_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/582906-2_0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/all1_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/all_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/all_0_1.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/all_0_2.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/all_1_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/all_1_1.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/all_1_2.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/all_1_4.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/all_2_3.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/all_2_6.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/all_2_7.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/allsg_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/allsg_0_1.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/allsg_0_2.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/annot-err_0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/any1_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/any2_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/any4_0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/any5_0_3.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/any5_1_2.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/any5_1_5.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/any6_1_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/any6_2_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/any7_1_2.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/any7_2_2.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/any8_1_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/anyAttr-derive-errors1_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/anyAttr-derive1_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/anyAttr-derive2_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/anyAttr-processContents1_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/anyAttr1_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/attr0_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/attruse_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/bug141312_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/bug141333_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/bug143951_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/bug145246_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/bug152470_1_1.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/bug167754_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/bug306806_1_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/bug309338_1_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/bug310264_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/bug313982_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/bug321475_1_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/bug322411_1_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/bug455953_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/choice_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/choice_0_1.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/choice_1_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/choice_1_1.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/choice_1_4.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/choice_2_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/choice_2_1.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/choice_2_2.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/choice_2_3.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/choice_2_5.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/complex-type-extension_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/cos-ct-extends-1-3_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/ct-sc-nobase_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/date_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/derivation-ok-extension-err_0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/derivation-ok-restriction-2-1-1_0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/derivation-ok-restriction-4-1-err_0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/derivation-restriction-anyAttr_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/deter0_0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/dur_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/elem0_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/element-err_0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/element-minmax-err_0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/empty-value_1_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/empty-value_1_1.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/empty_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/empty_1_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/extension0_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/extension1_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/extension2_1_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/facet-whiteSpace_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/group0_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/hexbinary_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/import0_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/import1_0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/import2_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/include1_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/include2_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/include3_0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/issue40_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/item_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/item_1_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/length1_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/length2_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/length3_0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/list0_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/list0_0_2.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/list0_1_2.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/mixed0_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/mixed1_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/ns0_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/ns0_0_1.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/ns0_1_3.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/ns0_1_4.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/ns1_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/ns2_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/nvdcve_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/po0_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/po1_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/poschargrp0_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/regexp-char-ref_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/regexp-char-ref_1_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/restrict-CT-attr-ref_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/restriction-attr1_0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/restriction0_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/scc-no-xmlns_0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/scc-no-xsi_0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/seq-dubl-elem1_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/seq0_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/src-attribute1_0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/src-attribute2_0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/src-attribute3-1_0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/src-attribute3-2-form_0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/src-attribute3-2-st_0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/src-attribute3-2-type_0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/src-attribute4_0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/src-element1_0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/src-element2-1_0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/src-element2-2_0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/src-element3_0_0 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/subst-group-1_0_1.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/union_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/vdv-first0_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/vdv-first1_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/vdv-first2_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/vdv-first3_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/vdv-first4_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/vdv-first5_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/xsd-list-itemType_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/schemas/xsd-simpleType-varieties_0_0.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/scripts/base.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/scripts/base2.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/scripts/set1.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/scripts/set4.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/127772.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/127772.xml.err.rdr delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/694228.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/694228.xml.err.rdr delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/737840.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/737840.xml.err.rdr delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/766956.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/REC-xml-19980210.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/REC-xml-19980210.xml.err.rdr delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/UTF16Entity.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/UTF16Entity.xml.err.rdr delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/cond_sect1.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/cond_sect1.xml.err.rdr delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/cond_sect2.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/dia.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/dia.xml.err.rdr delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/id1.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/id1.xml.err.rdr delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/id2.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/id2.xml.err.rdr delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/id3.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/id3.xml.err.rdr delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/index.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/index.xml.err.rdr delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/mixed_ns.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/mixed_ns.xml.err.rdr delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/notes.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/notes.xml.err.rdr delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/ns.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/ns.xml.err.rdr delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/ns2.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/ns2.xml.err.rdr delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/objednavka.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/objednavka.xml.err.rdr delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/t10.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/t10.xml.err.rdr delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/t11.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/t11.xml.err.rdr delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/t4.dtd delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/t4.dtd.err.rdr delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/t4.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/t4.xml.err.rdr delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/t4a.dtd delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/t4a.dtd.err.rdr delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/t4a.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/t4a.xml.err.rdr delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/t6.dtd delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/t6.dtd.err.rdr delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/t6.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/t6.xml.err.rdr delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/t8.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/t8a.xml delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/t9.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/t9.xml.err.rdr delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/t9a.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/t9a.xml.err.rdr delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/xhtml1.xhtml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/valid/xhtml1.xhtml.err.rdr delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/result/xmlid/id_tst1.xml.err delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/testC14N.c delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/testHTML.c delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/testReader.c delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/testRegexp.c delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/testRelax.c delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/testSAX.c delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/testSchemas.c delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/testURI.c delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/testXPath.c delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/win32/VC10/README.vc10 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/win32/VC10/RuleSet1.ruleset delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/win32/VC10/libxml2-focus.vcxproj delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/win32/VC10/libxml2.sln delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/win32/VC10/libxml2.vcxproj delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/win32/VC10/libxml2.vcxproj.filters delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/win32/VC10/runsuite.vcxproj delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/win32/wince/libxml2.vcb delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/win32/wince/libxml2.vcl delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/win32/wince/libxml2.vco delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/win32/wince/libxml2.vcp delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/win32/wince/libxml2.vcw delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/win32/wince/wincecompat.c delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/win32/wince/wincecompat.h delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/xml2-config.1 delete mode 100644 trunk/libs/libxml2/libxml2-v2.9.x/xml2Conf.sh.in create mode 100644 trunk/tools/mksquash_lzma-3.2/squashfs3.2-r2/squashfs-tools/read_fs.c delete mode 100644 trunk/user/dnsmasq/dnsmasq-2.8x/contrib/Suse/README delete mode 100644 trunk/user/dnsmasq/dnsmasq-2.8x/contrib/Suse/README.susefirewall delete mode 100644 trunk/user/dnsmasq/dnsmasq-2.8x/contrib/Suse/dnsmasq-SuSE.patch delete mode 100644 trunk/user/dnsmasq/dnsmasq-2.8x/contrib/Suse/dnsmasq-suse.spec delete mode 100644 trunk/user/dnsmasq/dnsmasq-2.8x/contrib/Suse/rc.dnsmasq-suse create mode 100644 trunk/user/dnsmasq/dnsmasq-2.8x/src/nftset.c create mode 100644 trunk/user/nfsd/nfs-utils-2.x/NEWS create mode 100755 trunk/user/nfsd/nfs-utils-2.x/install-dep create mode 120000 trunk/user/nfsd/nfs-utils-2.x/support/include/version.h create mode 100644 trunk/user/nfsd/nfs-utils-2.x/systemd/50-nfs.conf create mode 100644 trunk/user/nfsd/nfs-utils-2.x/systemd/rpc_pipefs.target.in create mode 100644 trunk/user/nfsd/nfs-utils-2.x/systemd/var-lib-nfs-rpc_pipefs.mount.in create mode 100644 trunk/user/nfsd/nfs-utils-2.x/tools/nfsrahead/99-nfs.rules create mode 100644 trunk/user/nfsd/nfs-utils-2.x/tools/nfsrahead/99-nfs.rules.in create mode 100644 trunk/user/nfsd/nfs-utils-2.x/tools/nfsrahead/Makefile.am create mode 100644 trunk/user/nfsd/nfs-utils-2.x/tools/nfsrahead/main.c create mode 100644 trunk/user/nfsd/nfs-utils-2.x/tools/nfsrahead/nfsrahead.man create mode 100644 trunk/user/nfsd/nfs-utils-2.x/tools/rpcctl/Makefile.am create mode 100644 trunk/user/nfsd/nfs-utils-2.x/tools/rpcctl/rpcctl.man create mode 100755 trunk/user/nfsd/nfs-utils-2.x/tools/rpcctl/rpcctl.py diff --git a/scripts/install_Opt.sh b/scripts/install_Opt.sh index 0f0ec156..487b689d 100755 --- a/scripts/install_Opt.sh +++ b/scripts/install_Opt.sh @@ -14,7 +14,7 @@ echo "-------------COPY-FILES---------------" if [ -d "$ROOTDIR/trunk/user/" ] ; then - # cleaning before bump openvpn to 2.4.5, nfs-utils to 2.5.4, wpa_supplicant to 2.9, dnsmasq to 2.86, libxml2 to 2.9.12, libcurl to 7.79.1, dropbear to 2019.78. + # cleaning before bump openvpn to 2.4.5, nfs-utils to 2.6.2, wpa_supplicant to 2.9, dnsmasq to 2.87, libxml2 to 2.10.2, libcurl to 7.85.0, dropbear to 2019.78. rm -fr "$DESTDIR/trunk/user/openvpn/openvpn-2.4.x/" rm -fr "$DESTDIR/trunk/user/nfsd/nfs-utils-1.2.3/" rm -fr "$DESTDIR/trunk/user/wpa_supplicant/" diff --git a/toolchain-mipsel/build_toolchain_O3 b/toolchain-mipsel/build_toolchain_O3 index c281ba7f..4830bfb0 100755 --- a/toolchain-mipsel/build_toolchain_O3 +++ b/toolchain-mipsel/build_toolchain_O3 @@ -39,7 +39,7 @@ export CC=gcc ##################################TUNE FOR CURRENT VERSION HOST GCC BUILD############################### -HOSTCFLAGS="-O3 -Wno-pointer-sign -Wno-trigraphs" +HOSTCFLAGS="-O3 -Wno-pointer-sign -Wno-trigraphs -fgnu89-inline" HOSTGCCVER=`gcc --version | grep "gcc" | awk {' print $3 '} | cut -f -2 -d '.'` echo "Host GCC version=$HOSTGCCVER" if [ "$HOSTGCCVER" != "4.3" ] && [ "$HOSTGCCVER" != "4.4" ]; then @@ -48,9 +48,9 @@ if [ "$HOSTGCCVER" != "4.3" ] && [ "$HOSTGCCVER" != "4.4" ]; then HOSTCFLAGS="$HOSTCFLAGS -Wno-unused-but-set-variable -Wno-sizeof-pointer-memaccess" HOSTCFLAGS="$HOSTCFLAGS -fno-delete-null-pointer-checks" fi - if [ "$HOSTGCCVER" \> "5.0" ]; then - HOSTCFLAGS="$HOSTCFLAGS -fgnu89-inline" - fi + #if [ "$HOSTGCCVER" \> "5.0" ]; then + #HOSTCFLAGS="$HOSTCFLAGS -fgnu89-inline" + #fi fi export CFLAGS="$HOSTCFLAGS" diff --git a/tools/patch.py b/tools/patch.py index 2ec068d9..3311bcf3 100644 --- a/tools/patch.py +++ b/tools/patch.py @@ -20,7 +20,7 @@ def patch_decoder(fname): patched = 0 - prules = ((None, "/media/Storage/workspace/router/", "/home/anoliu/router/",),) + prules = ((None, "/home/anoliu/router/", "/home/ano/router/",),) cache = [] prev_emp = False diff --git a/trunk/configs/templates/newifid1_base.config b/trunk/configs/templates/newifid1_base.config index 377e2fb2..481342a0 100755 --- a/trunk/configs/templates/newifid1_base.config +++ b/trunk/configs/templates/newifid1_base.config @@ -7,7 +7,7 @@ CONFIG_FIRMWARE_PRODUCT_ID="NEWIFI-D1" ### Linux kernel and toolchain CONFIG_LINUXDIR=linux-3.4.x -CONFIG_TOOLCHAIN_DIR=/home/anoliu/router/rt-n56u/toolchain-mipsel +CONFIG_TOOLCHAIN_DIR=/home/ano/router/rt-n56u/toolchain-mipsel ############################################################ ### Linux kernel configuration diff --git a/trunk/configs/templates/newifid1_full.config b/trunk/configs/templates/newifid1_full.config index b53e1575..8fe62f48 100755 --- a/trunk/configs/templates/newifid1_full.config +++ b/trunk/configs/templates/newifid1_full.config @@ -7,7 +7,7 @@ CONFIG_FIRMWARE_PRODUCT_ID="NEWIFI-D1" ### Linux kernel and toolchain CONFIG_LINUXDIR=linux-3.4.x -CONFIG_TOOLCHAIN_DIR=/home/anoliu/router/rt-n56u/toolchain-mipsel +CONFIG_TOOLCHAIN_DIR=/home/ano/router/rt-n56u/toolchain-mipsel ############################################################ ### Linux kernel configuration diff --git a/trunk/configs/templates/newifid1_mini.config b/trunk/configs/templates/newifid1_mini.config index 0eca9d82..7ae5685e 100755 --- a/trunk/configs/templates/newifid1_mini.config +++ b/trunk/configs/templates/newifid1_mini.config @@ -7,7 +7,7 @@ CONFIG_FIRMWARE_PRODUCT_ID="NEWIFI-D1" ### Linux kernel and toolchain CONFIG_LINUXDIR=linux-3.4.x -CONFIG_TOOLCHAIN_DIR=/home/anoliu/router/rt-n56u/toolchain-mipsel +CONFIG_TOOLCHAIN_DIR=/home/ano/router/rt-n56u/toolchain-mipsel ############################################################ ### Linux kernel configuration diff --git a/trunk/configs/templates/newifimini_base.config b/trunk/configs/templates/newifimini_base.config index af297e33..8447084e 100755 --- a/trunk/configs/templates/newifimini_base.config +++ b/trunk/configs/templates/newifimini_base.config @@ -7,7 +7,7 @@ CONFIG_FIRMWARE_PRODUCT_ID="NEWIFI-MINI" ### Linux kernel and toolchain CONFIG_LINUXDIR=linux-3.4.x -CONFIG_TOOLCHAIN_DIR=/home/anoliu/router/rt-n56u/toolchain-mipsel +CONFIG_TOOLCHAIN_DIR=/home/ano/router/rt-n56u/toolchain-mipsel ############################################################ ### Linux kernel configuration diff --git a/trunk/configs/templates/newifimini_mini.config b/trunk/configs/templates/newifimini_mini.config index 7ec9446e..2073061e 100755 --- a/trunk/configs/templates/newifimini_mini.config +++ b/trunk/configs/templates/newifimini_mini.config @@ -7,7 +7,7 @@ CONFIG_FIRMWARE_PRODUCT_ID="NEWIFI-MINI" ### Linux kernel and toolchain CONFIG_LINUXDIR=linux-3.4.x -CONFIG_TOOLCHAIN_DIR=/home/anoliu/router/rt-n56u/toolchain-mipsel +CONFIG_TOOLCHAIN_DIR=/home/ano/router/rt-n56u/toolchain-mipsel ############################################################ ### Linux kernel configuration diff --git a/trunk/configs/templates/newifiy1s_base.config b/trunk/configs/templates/newifiy1s_base.config index 41cd8474..1ea84080 100755 --- a/trunk/configs/templates/newifiy1s_base.config +++ b/trunk/configs/templates/newifiy1s_base.config @@ -7,7 +7,7 @@ CONFIG_FIRMWARE_PRODUCT_ID="NEWIFI-Y1S" ### Linux kernel and toolchain CONFIG_LINUXDIR=linux-3.4.x -CONFIG_TOOLCHAIN_DIR=/home/anoliu/router/rt-n56u/toolchain-mipsel +CONFIG_TOOLCHAIN_DIR=/home/ano/router/rt-n56u/toolchain-mipsel ############################################################ ### Linux kernel configuration diff --git a/trunk/configs/templates/newifiy1s_mini.config b/trunk/configs/templates/newifiy1s_mini.config index de2e0eff..647a812f 100755 --- a/trunk/configs/templates/newifiy1s_mini.config +++ b/trunk/configs/templates/newifiy1s_mini.config @@ -7,7 +7,7 @@ CONFIG_FIRMWARE_PRODUCT_ID="NEWIFI-Y1S" ### Linux kernel and toolchain CONFIG_LINUXDIR=linux-3.4.x -CONFIG_TOOLCHAIN_DIR=/home/anoliu/router/rt-n56u/toolchain-mipsel +CONFIG_TOOLCHAIN_DIR=/home/ano/router/rt-n56u/toolchain-mipsel ############################################################ ### Linux kernel configuration diff --git a/trunk/configs/templates/psg1218_base.config b/trunk/configs/templates/psg1218_base.config index 26950574..230fd4c2 100755 --- a/trunk/configs/templates/psg1218_base.config +++ b/trunk/configs/templates/psg1218_base.config @@ -7,7 +7,7 @@ CONFIG_FIRMWARE_PRODUCT_ID="PSG1218" ### Linux kernel and toolchain CONFIG_LINUXDIR=linux-3.4.x -CONFIG_TOOLCHAIN_DIR=/home/anoliu/router/rt-n56u/toolchain-mipsel +CONFIG_TOOLCHAIN_DIR=/home/ano/router/rt-n56u/toolchain-mipsel ############################################################ ### Linux kernel configuration diff --git a/trunk/configs/templates/psg1218_mini.config b/trunk/configs/templates/psg1218_mini.config index 8bf180ac..6fb55e68 100755 --- a/trunk/configs/templates/psg1218_mini.config +++ b/trunk/configs/templates/psg1218_mini.config @@ -7,7 +7,7 @@ CONFIG_FIRMWARE_PRODUCT_ID="PSG1218" ### Linux kernel and toolchain CONFIG_LINUXDIR=linux-3.4.x -CONFIG_TOOLCHAIN_DIR=/home/anoliu/router/rt-n56u/toolchain-mipsel +CONFIG_TOOLCHAIN_DIR=/home/ano/router/rt-n56u/toolchain-mipsel ############################################################ ### Linux kernel configuration diff --git a/trunk/configs/templates/psg1218_net.config b/trunk/configs/templates/psg1218_net.config index e34af217..d4d83fd3 100755 --- a/trunk/configs/templates/psg1218_net.config +++ b/trunk/configs/templates/psg1218_net.config @@ -7,7 +7,7 @@ CONFIG_FIRMWARE_PRODUCT_ID="PSG1218" ### Linux kernel and toolchain CONFIG_LINUXDIR=linux-3.4.x -CONFIG_TOOLCHAIN_DIR=/home/anoliu/router/rt-n56u/toolchain-mipsel +CONFIG_TOOLCHAIN_DIR=/home/ano/router/rt-n56u/toolchain-mipsel ############################################################ ### Linux kernel configuration diff --git a/trunk/configs/templates/psg1218_srouter.config b/trunk/configs/templates/psg1218_srouter.config index 57f8b133..efd6bdd1 100755 --- a/trunk/configs/templates/psg1218_srouter.config +++ b/trunk/configs/templates/psg1218_srouter.config @@ -7,7 +7,7 @@ CONFIG_FIRMWARE_PRODUCT_ID="PSG1218" ### Linux kernel and toolchain CONFIG_LINUXDIR=linux-3.4.x -CONFIG_TOOLCHAIN_DIR=/home/anoliu/router/rt-n56u/toolchain-mipsel +CONFIG_TOOLCHAIN_DIR=/home/ano/router/rt-n56u/toolchain-mipsel ############################################################ ### Linux kernel configuration diff --git a/trunk/configs/templates/ykl1_full.config b/trunk/configs/templates/ykl1_full.config index d49321b5..31270302 100755 --- a/trunk/configs/templates/ykl1_full.config +++ b/trunk/configs/templates/ykl1_full.config @@ -7,7 +7,7 @@ CONFIG_FIRMWARE_PRODUCT_ID="YK-L1" ### Linux kernel and toolchain CONFIG_LINUXDIR=linux-3.4.x -CONFIG_TOOLCHAIN_DIR=/home/anoliu/router/rt-n56u/toolchain-mipsel +CONFIG_TOOLCHAIN_DIR=/home/ano/router/rt-n56u/toolchain-mipsel ############################################################ ### Linux kernel configuration diff --git a/trunk/libs/libcurl/curl-7.x/CHANGES b/trunk/libs/libcurl/curl-7.x/CHANGES new file mode 100644 index 00000000..e45ee08a --- /dev/null +++ b/trunk/libs/libcurl/curl-7.x/CHANGES @@ -0,0 +1,7784 @@ + _ _ ____ _ + ___| | | | _ \| | + / __| | | | |_) | | + | (__| |_| | _ <| |___ + \___|\___/|_| \_\_____| + + Changelog + +Version 7.85.0 (31 Aug 2022) + +Daniel Stenberg (31 Aug 2022) +- RELEASE-NOTES: synced + + curl 7.85.0 release + +- THANKS: add contributors from the 7.85.0 release + +- getparam: correctly clean args + + Follow-up to bf7e887b2442783ab52 + + The previous fix for #9128 was incomplete and caused #9397. + + Fixes #9397 + Closes #9399 + +- zuul: remove the clang-tidy job + + Turns out we don't see the warnings, but the warnings right now are + plain ridiculous and unhelpful so we can just as well just kill this + job. + + Closes #9390 + +- cmake: set feature PSL if present + + ... make test 1014 pass when libpsl is used. + + Closes #9391 + +- lib530: simplify realloc failure exit path + + To make code analyzers happier + + Closes #9392 + +- [Orgad Shaneh brought this change] + + tests: add tests for netrc login/password combinations + + Covers the following PRs: + + - #9066 + - #9247 + - #9248 + + Closes #9256 + +- [Orgad Shaneh brought this change] + + url: really use the user provided in the url when netrc entry exists + + If the user is specified as part of the URL, and the same user exists + in .netrc, Authorization header was not sent at all. + + The user and password fields were assigned in conn->user and password + but the user was not assigned to data->state.aptr, which is the field + that is used in output_auth_headers and friends. + + Fix by assigning the user also to aptr. + + Amends commit d1237ac906ae7e3cd7a22c3a2d3a135a97edfbf5. + + Fixes #9243 + +- [Orgad Shaneh brought this change] + + netrc: Use the password from lines without login + + If netrc entry has password with empty login, use it for any username. + + Example: + .netrc: + machine example.com password 123456 + + curl -vn http://user@example.com/ + + Fix it by initializing state_our_login to TRUE, and reset it only when + finding an entry with the same host and different login. + + Closes #9248 + +- [Jay Satiro brought this change] + + url: treat missing usernames in netrc as empty + + - If, after parsing netrc, there is a password with no username then + set a blank username. + + This used to be the case prior to 7d600ad (precedes 7.82). Note + parseurlandfillconn already does the same thing for URLs. + + Reported-by: Raivis + Testing-by: Domen Kožar + + Fixes https://github.com/curl/curl/issues/8653 + Closes #9334 + Closes #9066 + +- test8: verify that "ctrl-byte cookies" are ignored + +- cookie: reject cookies with "control bytes" + + Rejects 0x01 - 0x1f (except 0x09) plus 0x7f + + Reported-by: Axel Chong + + Bug: https://curl.se/docs/CVE-2022-35252.html + + CVE-2022-35252 + + Closes #9381 + +- libssh: ignore deprecation warnings + + libssh 0.10.0 marks all SCP functions as "deprecated" which causes + compiler warnings and errors in our CI jobs and elsewhere. Ignore + deprecation warnings if 0.10.0 or later is found in the build. + + If they actually remove the functions at a later point, then someone can + deal with that pain and functionality break then. + + Fixes #9382 + Closes #9383 + +- Revert "schannel: when importing PFX, disable key persistence" + + This reverts commit 70d010d285315e5f1cad6bdb4953e167b069b692. + + Due to further reports in #9300 that indicate this commit might + introduce problems. + +- multi: use larger dns hash table for multi interface + + Have curl_multi_init() use a much larger DNS hash table than used for + the easy interface to scale and perform better when used with _many_ + host names. + + curl_share_init() sets an in-between size. + + Inspired-by: Ivan Tsybulin + See #9340 + Closes #9376 + +Marc Hoersken (28 Aug 2022) +- CI/runtests.pl: add param for dedicated curl to talk to APIs + + This should make it possible to also report test failures + if our freshly build curl binary is not fully functional. + + Reviewed-by: Daniel Stenberg + Closes #9360 + +Daniel Stenberg (27 Aug 2022) +- [Jacob Tolar brought this change] + + openssl: add cert path in error message + + Closes #9349 + +- [Jacob Tolar brought this change] + + cert.d: clarify that escape character works for file paths + + Closes #9349 + +- gha: move over ngtcp2-gnutls CI job from zuul + + Closes #9331 + +Marc Hoersken (26 Aug 2022) +- cmake: add detection of threadsafe feature + + Avoids failing test 1014 by replicating configure checks + for HAVE_ATOMIC and _WIN32_WINNT with custom CMake tests. + + Reviewed-by: Marcel Raad + + Follow up to #8680 + Closes #9312 + +Daniel Stenberg (26 Aug 2022) +- RELEASE-NOTES: synced + +Marc Hoersken (26 Aug 2022) +- CI/azure: align torture shallowness with GHA + + There 25 is used with FTP tests skipped, and 20 for FTP tests. + This should make torture tests stay within the 60min timeout. + + Reviewed-by: Daniel Stenberg + Closes #9371 + +- multi_wait: fix and improve Curl_poll error handling on Windows + + First check for errors and return CURLM_UNRECOVERABLE_POLL + before moving forward and waiting on socket readiness events. + + Reviewed-by: Jay Satiro + Reviewed-by: Marcel Raad + + Reported-by: Daniel Stenberg + Ref: #9361 + + Follow up to #8961 + Closes #9372 + +- multi_wait: fix skipping to populate revents for extra_fds + + On Windows revents was not populated for extra_fds if + multi_wait had to wait due to the Curl_poll pre-check + not signalling any readiness. This commit fixes that. + + Reviewed-by: Marcel Raad + Reviewed-by: Jay Satiro + + Closes #9361 + +- CI/appveyor: disable TLS in msys2-native autotools builds + + Schannel cannot be used from msys2-native Linux-emulated builds. + + Reviewed-by: Marcel Raad + Reviewed-by: Daniel Stenberg + + Follow up to #9367 + Closes #9370 + +Jay Satiro (25 Aug 2022) +- tests: fix http2 tests to use CRLF headers + + Prior to this change some tests that rely on nghttpx proxy did not use + CRLF headers everywhere. A recent change in nghttp2, which updated its + version of llhttp (HTTP parser), requires curl's HTTP/1.1 test server to + use CRLF headers. + + Ref: https://github.com/nghttp2/nghttp2/commit/9d389e8 + + Fixes https://github.com/curl/curl/issues/9364 + Closes https://github.com/curl/curl/pull/9365 + +Daniel Stenberg (25 Aug 2022) +- [rcombs brought this change] + + multi: use a pipe instead of a socketpair on apple platforms + + Sockets may be shut down by the kernel when the app is moved to the + background, but pipes are not. + + Removed from KNOWN_BUGS + + Fixes #6132 + Closes #9368 + +- [Somnath Kundu brought this change] + + libssh2: provide symlink name in SFTP dir listing + + When reading the symbolic link name for a file, we need to add the file + name to base path name. + + Closes #9369 + +- configure: if asked to use TLS, fail if no TLS lib was detected + + Previously the configure script would just warn about this fact and + continue with TLS disabled build which is not always helpful. TLS should + be explicitly disabled if that is what the user wants. + + Closes #9367 + +- [Dustin Howett brought this change] + + schannel: when importing PFX, disable key persistence + + By default, the PFXImportCertStore API persists the key in the user's + key store (as though the certificate was being imported for permanent, + ongoing use.) + + The documentation specifies that keys that are not to be persisted + should be imported with the flag `PKCS12_NO_PERSIST_KEY`. + NOTE: this flag is only supported on versions of Windows newer than XP + and Server 2003. + + Fixes #9300 + Closes #9363 + +- unit1303: four tests should have TRUE for 'connecting' + + To match the comments. + + Reported-by: Wu Zheng + + See #9355 + Closes #9356 + +- CURLOPT_BUFFERSIZE.3: add upload buffersize to see also + + Closes #9354 + +- [Fabian Fischer brought this change] + + HTTP3.md: add missing autoreconf command for building with wolfssl + + Closes #9353 + +- RELEASE-NOTES: synced + +- multi: have curl_multi_remove_handle close CONNECT_ONLY transfer + + Ẃhen it has been used in the multi interface, it is otherwise left in + the connection cache, can't be reused and nothing will close them since + the easy handle loses the association with the multi handle and thus the + connection cache - until the multi handle is closed or it gets pruned + because the cache is full. + + Reported-by: Dominik Thalhammer + Fixes #9335 + Closes #9342 + +- docs/cmdline-opts: remove \& escapes from all .d files + + gen.pl escapes them itself now + +- docs/cmdline-opts/gen.pl: encode leading single and double quotes + + As "(aq" and "(dq" to prevent them from implying a meaning in the nroff + output. This removes the need for using \& escapes in the .d files' + description parts. + + Closes #9352 + +Marc Hoersken (23 Aug 2022) +- tests/server/sockfilt.c: avoid race condition without a mutex + + Avoid loosing any triggered handles by first aborting and joining + the waiting threads before evaluating the individual signal state. + + This removes the race condition and therefore need for a mutex. + + Closes #9023 + +Daniel Stenberg (22 Aug 2022) +- [Emil Engler brought this change] + + url: output the maximum when rejecting a url + + This commit changes the failf message to output the maximum length, when + curl refuses to process a URL because it is too long. + + See: #9317 + Closes: #9327 + +- [Chris Paulson-Ellis brought this change] + + configure: fix broken m4 syntax in TLS options + + Commit b589696f added lines to some shell within AC_ARG_WITH macros, but + inadvertently failed to move the final closing ). + + Quote the script section using braces. + + So, if these problems have been around for a while, how did I find them? + Only because I did a configure including these options: + + $ ./configure --with-openssl --without-rustls + SSL: enabled (OpenSSL) + + Closes #9344 + +- tests/data/CMakeLists: remove making the 'show' makefile target + + It is not used by runtests since 3c0f462 + + Closes #9333 + +- tests/data/Makefile: remove 'filecheck' target + + No practical use anymore since 3c0f4622cdfd6 + + Closes #9332 + +- libssh2: make atime/mtime date overflow return error + + Closes #9328 + +- libssh: make atime/mtime date overflow return error + + Closes #9328 + +- examples/curlx.c: remove + + This example is a bit convoluted to use as an example, combined with the + special license for it makes it unsuitable. + + Closes #9330 + +- [Tobias Nygren brought this change] + + curl.h: include on SunOS + + It is needed for fd_set to be visible to downstream consumers that use + . Header is known to exist at least as far back as Solaris + 2.6. + + Closes #9329 + +- DEPRECATE.md: push the NSS deprecation date forward one year to 2023 + + URL: https://curl.se/mail/lib-2022-08/0016.html + +- libssh2: setting atime or mtime >32bit on 4-bytes-long systems + + Since the libssh2 API uses 'long' to store the timestamp, it cannot + transfer >32bit times on Windows and 32bit architecture builds. + + Avoid nasty surprises by instead not setting such time. + + Spotted by Coverity + + Closes #9325 + +- libssh: setting atime or mtime > 32bit is now just skipped + + The libssh API used caps the time to an unsigned 32bit variable. Avoid + nasty surprises by instead not setting such time. + + Spotted by Coverity. + + Closes #9324 + +Jay Satiro (16 Aug 2022) +- KNOWN_BUGS: Windows Unicode builds use homedir in current locale + + Bug: https://github.com/curl/curl/pull/7252 + Reported-by: dEajL3kA@users.noreply.github.com + + Ref: https://github.com/curl/curl/pull/7281 + + Closes https://github.com/curl/curl/pull/9305 + +Daniel Stenberg (16 Aug 2022) +- test399: switch it to use a config file instead + + ... as using a 65535 bytes host name in a URL does not fit on the + command line on some systems - like Windows. + + Reported-by: Marcel Raad + Fixes #9321 + Closes #9322 + +- RELEASE-NOTES: synced + +- asyn-ares: make a single alloc out of hostname + async data + + This saves one alloc per name resolve and simplifies the exit path. + + Closes #9310 + +- Curl_close: call Curl_resolver_cancel to avoid memory-leak + + There might be a pending (c-ares) resolve that isn't free'd up yet. + + Closes #9310 + +- asyn-thread: fix socket leak on OOM + + Closes #9310 + +- GHA: mv CI torture test from Zuul + + Closes #9310 + +- ngtcp2-wolfssl.yml: add GHA to build ngtcp2 + wolfSSL + + Closes #9318 + +- test399: verify check of too long host name + +- url: reject URLs with hostnames longer than 65535 bytes + + It *probably* causes other problems too since DNS can't resolve such + long names, but the SNI field in TLS is limited to 16 bits length. + + Closes #9317 + +- curl_multi_perform.3: minor language fix + + Closes #9316 + +- ngtcp2: fix picky compiler warnings with wolfSSL for QUIC + + Follow-up to 8a13be227eede2 + + Closes #9315 + +- ngtcp2: remove leftover variable + + Mistake leftover from my edit before push. + + Follow-up from 8a13be227eede2601c2b3b + Reported-by: Viktor Szakats + Bug: https://github.com/curl/curl/pull/9290#issuecomment-1214569167 + +Viktor Szakats (15 Aug 2022) +- Makefile.m32: allow -nghttp3/-ngtcp2 without -ssl [ci skip] + + Before this patch `-nghttp3`/`-ngtcp2` had an effect only when `-ssl` + was also enabled. `-ssl` meaning OpenSSL (and its forks). After + 8a13be227eede2601c2b3b1c63e08b3dc9b35dd5 nghttp3/ngtcp2 can also be + used together with wolfSSL. This patch adds the ability to enable + `-nghttp3`/`-ngtcp2` independently from `-ssl` (OpenSSL), allowing to + use it with wolfSSL or other, future TLS backends. + + Before this patch, it was fine to enable `-nghttp3`/`-ngtcp2` + unconditionally. After this patch, this is no longer the case, and now + it's the user's responsibility to enable `-nghttp3`/`-ngtcp2` only + together with a compatible TLS backend. + + When using a TLS backend other than OpenSSL, the TLS-specific ngtcp2 + library must be configured manually, e.g.: + `export CURL_LDFLAG_EXTRAS=-lngtcp2_crypto_wolfssl` + + (or via `NGTCP2_LIBS`) + + Closes #9314 + +Daniel Stenberg (15 Aug 2022) +- [Stefan Eissing brought this change] + + quic: add support via wolfSSL + + - based on ngtcp2 PR https://github.com/ngtcp2/ngtcp2/pull/505 + - configure adapted to build against ngtcp2 wolfssl crypto lib + - quic code added for creation of WOLFSSL* instances + + Closes #9290 + +Marcel Raad (14 Aug 2022) +- [David Carlier brought this change] + + memdebug: add annotation attributes + + memory debug tracking annotates whether the returned pointer does not + `alias`, hints where the size required is, for Windows to be better + debugged via Visual Studio. + + Closes https://github.com/curl/curl/pull/9306 + +Daniel Stenberg (14 Aug 2022) +- GHA: move libressl CI from zuul to GitHub + + Closes #9309 + +- KNOWN_BUGS: FTPS directory listing hangs on Windows with Schannel + + Closes #9161 + +- KNOWN_BUGS: CURLOPT_CERTINFO results in CURLE_OUT_OF_MEMORY with Schannel + + Closes #8741 + +- KNOWN_BUGS: libssh blocking and infinite loop problem + + Closes #8632 + +- RELEASE-NOTES: synced + +- msh3: fix the QUIC disconnect function + + And free request related memory better in 'done'. Fixes a memory-leak. + + Reported-by: Gisle Vanem + Fixes #8915 + Closes #9304 + +- connect: close the happy eyeballs loser connection when using QUIC + + Reviewed-by: Nick Banks + + Closes #9303 + +- [Emil Engler brought this change] + + refactor: split resolve_server() into functions + + This commit splits the branch-heavy resolve_server() function into + various sub-functions, in order to reduce the amount of nested + if/else-statements. + + Beside this, it also removes many else-sequences, by returning in the + previous if-statement. + + Closes #9283 + +- schannel: re-indent to use curl style better + + Only white space changes + + Closes #9301 + +- [Emanuele Torre brought this change] + + docs/cmdline-opts: fix example and categories for --form-escape + + The example was missing a "--form" argument + I also replaced "--form" with "-F" to shorten the line a bit since it + was already very long. + + And I also moved --form-escape from the "post" category to the "upload" + category (this is what I originally wanted to fix, before also noticing + the mistake in the example). + + Closes #9298 + +- [Nick Banks brought this change] + + HTTP3.md: update to msh3 v0.4.0 + + Closes #9297 + +- hostip: resolve *.localhost to 127.0.0.1/::1 + + Following the footsteps of other clients like Firefox/Chrome. RFC 6761 + says clients SHOULD do this. + + Add test 389 to verify. + + Reported-by: TheKnarf on github + Fixes #9192 + Closes #9296 + +Jay Satiro (11 Aug 2022) +- KNOWN_BUGS: long paths are not fully supported on Windows + + Bug: https://github.com/curl/curl/issues/8361 + Reported-by: Gisle Vanem + + Closes https://github.com/curl/curl/pull/9288 + +Daniel Stenberg (11 Aug 2022) +- config: remove the check for and use of SIZEOF_SHORT + + shorts are 2 bytes on all platforms curl runs and have ever run on. + + Closes #9291 + +- configure: introduce CURL_SIZEOF + + This is a rewrite of the previously used GPLv3+exception licensed + file. With this change, there is no more reference to GPL so we can + remove that from LICENSES/. + + Ref: #9220 + Closes #9291 + +- [Sean McArthur brought this change] + + hyper: customize test1274 to how hyper unfolds headers + + Closes #9217 + +- [Orgad Shaneh brought this change] + + curl-config: quote directories with potential space + + On Windows (at least with CMake), the default prefix is + C:/Program Files (x86)/CURL. + + Closes #9253 + +- [Oliver Roberts brought this change] + + amigaos: fix threaded resolver on AmigaOS 4.x + + Replace ip4 resolution function on AmigaOS 4.x, as it requires runtime + feature detection and extra code to make it thread safe. + + Closes #9265 + +- [Emil Engler brought this change] + + imap: use ISALNUM() for alphanumeric checks + + This commit replaces a self-made character check for alphanumeric + characters within imap_is_bchar() with the ISALNUM() macro, as it is + reduces the size of the code and makes the performance better, due to + ASCII arithmetic. + + Closes #9289 + +- RELEASE-NOTES: synced + +- [Cering on github brought this change] + + connect: add quic connection information + + Fixes #9286 + Closes #9287 + +- [Philip H brought this change] + + cirrus/freebsd-ci: bootstrap the pip installer + + Signed-off-by: Philip H <47042125+pheiduck@users.noreply.github.com> + + Closes #9213 + +- urldata: move smaller fields down in connectdata struct + + By (almost) sorting the struct fields in connectdata in a decending size + order, having the single char ones last, we reduce the number of holes + in the struct and thus the amount of storage needed. + + Closes #9280 + +- ldap: adapt to conn->port now being an 'int' + + Remove typecasts. Fix printf() formats. + + Follow-up from 764c6bd3bf. + Pointed out by Coverity CID 1507858. + + Closes #9281 + +- KNOWN_BUGS: Negotiate authentication against Hadoop HDFS + + Closes #8264 + +- [Oliver Roberts brought this change] + + file: add handling of native AmigaOS paths + + On AmigaOS 4.x, handle native absolute paths, whilst blocking relative + paths. Also allow unix style paths if feature enabled at link time. + + Inspiration-from: Michael Trebilcock + + Closes #9259 + +- KNOWN_BUGS: cmake build is not thread-safe + + The cmake build does not check for and verify presence of a working + Atomic type, which then makes curl_global_init() to not build + thread-safe on non-Windows platforms. + + Closes https://github.com/curl/curl/issues/8973 + Closes https://github.com/curl/curl/pull/8982 + +- [Oliver Roberts brought this change] + + configure: fixup bsdsocket detection code for AmigaOS 4.x + + The code that detects bsdsocket.library for AmigaOS did not work + for AmigaOS 4.x. This has been fixed and also cleaned up a little + to reduce duplication. Wasn't technically necessary before, but is + required when building with AmiSSL instead of OpenSSL. + + Closes #9268 + +- [Oliver Roberts brought this change] + + tool: reintroduce set file comment code for AmigaOS + + Amiga specific code which put the URL in the file comment was perhaps + accidentally removed in b88940850002a3f1c25bc6488b95ad30eb80d696 having + originally been added in 5c215bdbdfde8b2350cdcbac82aae0c914da5314. + Reworked to fit the code changes and added it back in. + + Reported-by: Michael Trebilcock + Originally-added-by: Chris Young + + Closes #9258 + +- urldata: make 'negnpn' use less storage + + The connectdata struct field 'negnpn' never holds a value larger than + 30, so an unsigned char saves 3 bytes struct space. + + Closes #9279 + +- urldata: make three *_proto struct fields smaller + + Use 'unsigned char' for storage instead of the enum, for three GSSAPI + related fields in the connectdata struct. + + Closes #9278 + +- connect: set socktype/protocol correctly + + So that an address used from the DNS cache that was previously used for + QUIC can be reused for TCP and vice versa. + + To make this possible, set conn->transport to "unix" for unix domain + connections ... and store the transport struct field in an unsigned char + to use less space. + + Reported-by: ウさん + Fixes #9274 + Closes #9276 + +- [Oliver Roberts brought this change] + + amissl: allow AmiSSL to be used with AmigaOS 4.x builds + + Enable AmiSSL to be used instead of static OpenSSL link libraries. + for AmigaOS 4.x, as it already is in the AmigaOS 3.x build. + + Closes #9269 + +- [opensignature on github brought this change] + + openssl: add details to "unable to set client certificate" error + + from: "curl: (58) unable to set client certificate" + + to: curl: (58) unable to set client certificate [error:0A00018F:SSL + routines::ee key too small] + + Closes #9228 + +- [Oliver Roberts brought this change] + + amissl: make AmiSSL v5 a minimum requirement + + AmiSSL v5 is the latest version, featuring a port of OpenSSL 3.0. + Support for previous OpenSSL 1.1.x versions has been dropped, so + makes sense to enforce v5 as the minimum requirement. This also + allows all the AmiSSL stub workarounds to be removed as they are + now provided in a link library in the AmiSSL SDK. + + Closes #9267 + +- [Oliver Roberts brought this change] + + configure: -pthread not available on AmigaOS 4.x + + The most recent GCC builds for AmigaOS 4.x do not allow -pthread and + exit with an error. Instead, need to explictly specify -lpthread. + + Closes #9266 + +- digest: pass over leading spaces in qop values + + When parsing the "qop=" parameter of the digest authentication, and the + value is provided within quotes, the list of values can have leading + white space which the parser previously did not handle correctly. + + Add test case 388 to verify. + + Reported-by: vlubart on github + Fixes #9264 + Closes #9270 + +- [Evgeny Grin (Karlson2k) brought this change] + + digest: reject broken header with session protocol but without qop + + Closes #9077 + +- CURLINFO_SPEED_UPLOAD/DOWNLOAD.3: fix examples + + Reported-by: jvvprasad78 on github + Assisted-by: Jay Satiro + Fixes #9239 + Closes #9241 + +- [Fabian Keil brought this change] + + test44[2-4]: add '--resolve' to the keywords + + ... so the tests can be automatically skipped when + using an external proxy like Privoxy. + + Closes #9250 + +- RELEASE-NOTES: synced + +- CURLOPT_CONNECT_ONLY.3: clarify multi API use + + Reported-by: Maxim Ivanov + Fixes #9244 + Closes #9262 + +- [Andrew Lambert brought this change] + + curl_easy_header: Add CURLH_PSEUDO to sanity check + + Fixes #9235 + Closes #9236 + +- [Emil Engler brought this change] + + docs: add dns category to --resolve + + This commit adds the dns category to the --resolve command line option, + because it can be interpreted as both: a low-level connection option and + an option related to the resolving of a hostname. + + It is also not common for dns options to belong to the connection + category and vice versa. --ipv4 and --ipv6 are both good examples. + + Closes #9229 + +Jay Satiro (2 Aug 2022) +- [Wyatt O'Day brought this change] + + schannel: Add TLS 1.3 support + + - Support TLS 1.3 as the default max TLS version for Windows Server 2022 + and Windows 11. + + - Support specifying TLS 1.3 ciphers via existing option + CURLOPT_TLS13_CIPHERS (tool: --tls13-ciphers). + + Closes https://github.com/curl/curl/pull/8419 + +Daniel Stenberg (2 Aug 2022) +- [Emil Engler brought this change] + + cmdline-opts/gen.pl: improve performance + + On some systems, the gen.pl script takes nearly two minutes for the + generation of the main-page, which is a completely unacceptable time. + + The slow performance has two causes: + 1. Use of a regex locale operator + 2. Useless invokations of loops + + The commit addresses the first issue by replacing the "\W" wiht + [^a-zA-Z0-9_], which is, according to regex101.com, functionally + equivalent to the previous operation, except that it is obviously + limited to ASCII only, which is fine, as the curl project is + English-only anyway. + + The second issue is being addressed by only running the loop if the line + contains a "--" in it. The loop may be completeley removed in the + future. + + Co-authored-by: Emanuele Torre + + See #8299 + Fixes #9230 + Closes #9232 + +- docs/cmdline: mark fail and fail-with-body as mutually exclusive + + Reported-by: Andreas Sommer + Fixes #9221 + Closes #9222 + +- [Nao Yonashiro brought this change] + + quiche: fix build failure + + Reviewed-by: Alessandro Ghedini + Closes #9223 + +Viktor Szakats (2 Aug 2022) +- configure.ac: drop references to deleted functions + + follow-up from 4d73854462f30948acab12984b611e9e33ee41e6 + + Reported-by: Oliver Roberts + Fixes #9238 + Closes #9240 + +Daniel Stenberg (28 Jul 2022) +- [Sean McArthur brought this change] + + hyper: enable obs-folded multiline headers + + Closes #9216 + +- connect: revert the use of IP*_RECVERR + + The options were added in #6341 and d13179d, but cause problems: Lots of + POLLIN event occurs but recvfrom read nothing. + + Reported-by: Tatsuhiro Tsujikawa + Fixes #9209 + Closes #9215 + +- [Marco Kamner brought this change] + + docs: remove him/her/he/she from documentation + + Closes #9208 + +- RELEASE-NOTES: synced + +- tool_getparam: make --doh-url "" switch it off + + A possible future addition could be to parse the URL first too to verify + that it is valid before trying to use it. + + Assisted-by: Jay Satiro + Closes #9207 + +- mailmap: add rzrymiak on github + +Jay Satiro (26 Jul 2022) +- ngtcp2: Fix build error due to change in nghttp3 prototypes + + ngtcp2/nghttp3@4a066b2 changed nghttp3_conn_block_stream and + nghttp3_conn_shutdown_stream_write return from int to void. + + Reported-by: jurisuk@users.noreply.github.com + + Fixes https://github.com/curl/curl/issues/9204 + Closes https://github.com/curl/curl/pull/9200 + +Daniel Stenberg (26 Jul 2022) +- [rzrymiak on github brought this change] + + BUGS.md: improve language + + Closes #9205 + +- [Philip H brought this change] + + cirrus.yml: replace py38-pip with py39-pip + + Reported-by: Jay Satiro + Fixes #9201 + Closes #9202 + +- tool_getparam: fix cleanarg() for unicode builds + + Use the correct type, and make cleanarg an empty macro if the cleaning + ability is absent. + + Fixes #9195 + Closes #9196 + + Reviewed-by: Jay Satiro + Reviewed-by: Marcel Raad + +Marc Hoersken (25 Jul 2022) +- test3026: add support for Windows using native Win32 threads + + Reviewed-by: Viktor Szakats + Reviewed-by: Jay Satiro + Reviewed-by: Daniel Stenberg + + Follow up to 7ade9c50b35d95d47a43880c3097bebab7a7e690 + Closes #9012 + +Jay Satiro (25 Jul 2022) +- [Evgeny Grin (Karlson2k) brought this change] + + digest: fix memory leak, fix not quoted 'opaque' + + Fix leak regression introduced by 3a6fe0c. + + Closes https://github.com/curl/curl/pull/9199 + +Daniel Stenberg (23 Jul 2022) +- tests: several enumerated type cleanups + + To please icc + + Closes #9179 + +- tool_paramhlp: fix "enumerated type mixed with another type" + + Warning by icc + + Closes #9179 + +- tool_writeout: fix enumerated type mixed with another type + + Closes #9179 + +- tool_cfgable: make 'synthetic_error' a plain bool + + The specific reason was not used. + + Closes #9179 + +- tool_paramhlp: make check_protocol return ParameterError + + "enumerated type mixed with another type" + + Closes #9179 + +- tool_formparse: fix variable may be used before its value is set + + Warning by icc + + Closes #9179 + +- sendf: skip storing HTTP headers if HTTP disabled + + Closes #9179 + +- url: enumerated type mixed with another type + + Follow-up to 1c58e7ae99ce2030213f28b + + Closes #9179 + +- urldata: change second proxytype field to unsigned char to match + + To avoid "enumerated type mixed with another type" + + Closes #9179 + +- http: typecast the httpreq assignment to avoid icc compiler warning + + error #188: enumerated type mixed with another type + + Closes #9179 + +- urldata: make state.httpreq an unsigned char + + To match set.method used for the same purpose. + + Closes #9179 + +- splay: avoid using -1 in unsigned variable + + To fix icc compiler warning integer conversion resulted in a change of sign + + Closes #9179 + +- sendf: store the header type in an usigned char to avoid icc warnings + + Closes #9179 + +- multi: fix the return code from Curl_pgrsDone() + + It does not return a CURLcode. Detected by the icc compiler warning + "enumerated type mixed with another type" + + Closes #9179 + +- sendf: make Curl_debug a void function + + As virtually no called checked the return code, and those that did + wrongly treated it as a CURLcode. Detected by the icc compiler warning: + enumerated type mixed with another type + + Closes #9179 + +- http_chunks: remove an assign + typecast + + As it caused icc to complain: "pointer cast involving 64-bit pointed-to + type" + + Closes #9179 + +- vtls: make Curl_ssl_backend() return the enum type curl_sslbackend + + To fix the icc warning enumerated type mixed with another type + + Closes #9179 + +- curl-compilers.m4: make icc use -diag* options and disable two warnings + + -wd and -we are deprecated and are now -diag-disable and -diag-error + + Disable warning 1024 and 2259 + + Closes #9179 + +- [Matthew Thompson brought this change] + + GHA: add two Intel compiler CI jobs + + Closes #9179 + +- [Daniel Katz brought this change] + + curl-functions.m4: check whether atomics can link rather than just compile + + Some build toolchains support C11 atomics (i.e., _Atomic types), but + will not link the associated atomics runtime unless a flag is passed. In + such an environment, linking an application with libcurl.a can fail due + to undefined symbols for atomic load/store functions. + + I encountered this behavior when upgrading curl to 7.84.0 and attempting + to build with Solaris Studio 12.6. Solaris provides the flag + -xatomic=[gcc | studio], allowing users to link to one of two atomics + runtime implementations. However, if the user does not provide this + flag, then neither runtime is linked. This led to builds failing in CI. + + Closes #9190 + +- [Rosen Penev brought this change] + + curl-wolfssl.m4: add options header when building test code + + Needed for certain configurations of wolfSSL. Otherwise, missing header + error may occur. + + Tested with OpenWrt. + + Closes #9187 + +- ftp: use a correct expire ID for timer expiry + + This was an accurate error pointed out by the icc warning: enumerated + type mixed with another type + + Ref: #9179 + Closes #9184 + +- sendf: fix paused header writes since after the header API + + Regression since d1e4a67 + + Reported-by: Sergey Ogryzkov + Fixes #9180 + Closes #9182 + +- mprintf: fix *dyn_vprintf() when out-of-memory + + Follow-up to 0e48ac1f99a. Torture-testing 1455 would lead to a memory + leak otherwise. + + Closes #9185 + +- curl-confopts: remove leftover AC_REQUIREs + + configure.ac:3488: warning: CURL_CHECK_FUNC_IOCTL is m4_require'd but not m4_defun'd + configure.ac:3488: warning: CURL_CHECK_FUNC_SETSOCKOPT is m4_require'd but not m4_defun'd + + follow-up from 4d73854462f30 + + Closes #9183 + +- file: fix icc enumerated type mixed with another type warning + + Ref: #9179 + Closes #9181 + +Viktor Szakats (19 Jul 2022) +- tidy-up: delete unused build configuration macros + + Most of them feature guards: + + - `CURL_INCLUDES_SYS_UIO` [1] + - `HAVE_ALLOCA_H` [2] + - `HAVE_CRYPTO_CLEANUP_ALL_EX_DATA` (unused since de71e68000c8624ea13f90b136f8734dd0fb1bdc) + - `HAVE_DLFCN_H` + - `HAVE_DLOPEN` + - `HAVE_DOPRNT` + - `HAVE_FCNTL` + - `HAVE_GETHOSTBYNAME` [3] + - `HAVE_GETOPT_H` + - `HAVE_GETPASS` + - `HAVE_GETPROTOBYNAME` + - `HAVE_GETSERVBYNAME` + - `HAVE_IDN_FREE*` + - `HAVE_INET_ADDR` + - `HAVE_IOCTL` + - `HAVE_KRB4` + - `HAVE_KRB_GET_OUR_IP_FOR_REALM` + - `HAVE_KRB_H` + - `HAVE_LDAPSSL_H` + - `HAVE_LDAP_INIT_FD` + - `HAVE_LIBDL` + - `HAVE_LIBNSL` + - `HAVE_LIBRESOLV*` + - `HAVE_LIBUCB` + - `HAVE_LL` + - `HAVE_LOCALTIME_R` + - `HAVE_MALLOC_H` + - `HAVE_MEMCPY` + - `HAVE_MEMORY_H` + - `HAVE_NETINET_IF_ETHER_H` + - `HAVE_NI_WITHSCOPEID` + - `HAVE_OPENSSL_CRYPTO_H` + - `HAVE_OPENSSL_ERR_H` + - `HAVE_OPENSSL_PEM_H` + - `HAVE_OPENSSL_PKCS12_H` + - `HAVE_OPENSSL_RAND_H` + - `HAVE_OPENSSL_RSA_H` + - `HAVE_OPENSSL_SSL_H` + - `HAVE_OPENSSL_X509_H` + - `HAVE_PEM_H` + - `HAVE_POLL` + - `HAVE_RAND_SCREEN` + - `HAVE_RAND_STATUS` + - `HAVE_RECVFROM` + - `HAVE_SETSOCKOPT` + - `HAVE_SETVBUF` + - `HAVE_SIZEOF_LONG_DOUBLE` + - `HAVE_SOCKIO_H` + - `HAVE_SOCK_OPTS` + - `HAVE_STDIO_H` + - `HAVE_STRCASESTR` + - `HAVE_STRFTIME` + - `HAVE_STRLCAT` + - `HAVE_STRNCMPI` + - `HAVE_STRNICMP` + - `HAVE_STRSTR` + - `HAVE_STRUCT_IN6_ADDR` + - `HAVE_TLD_H` + - `HAVE_TLD_STRERROR` + - `HAVE_UNAME` + - `HAVE_USLEEP` + - `HAVE_WINBER_H` + - `HAVE_WRITEV` + - `HAVE_X509_H` + - `LT_OBJDIR` + - `NEED_BASENAME_PROTO` + - `NOT_NEED_LIBNSL` + - `OPENSSL_NO_KRB5` + - `RECVFROM_TYPE*` + - `SIZEOF_LONG_DOUBLE` + - `STRERROR_R_TYPE_ARG3` + - `USE_YASSLEMUL` + - `_USRDLL` (from CMake) [4] + + [1] Related parts in `m4/curl-functions.m4` and `configure.ac` might + also be deleted. + + [2] Related comment can possibly be deleted in + `packages/vms/generate_config_vms_h_curl.com`. + + [3] There are more instances of this in autotools, but I did not dare to + touch those. Looked like it's used to detect socket support. + + [4] This is necessary for MFC (Microsoft Foundation Class) DLLs to + force linking MFC components statically to the DLL. `libcurl.dll` + does not use MFC, so we can delete this define. + Ref: https://docs.microsoft.com/cpp/build/regular-dlls-statically-linked-to-mfc + + Script that can help finding unused settings like above: + ```shell + + autoheader configure.ac # generate lib/curl_config.h.in + + { + grep -o -E 'set\([A-Z][A-Z0-9_]{3,}' CMake/Platforms/WindowsCache.cmake | sed -E 's|set\(||g' + grep -o -E -h '#define +[A-Z][A-Z0-9_]{3,}' lib/config-*.h | sed -E 's|#define +||g' + grep -o -E '#cmakedefine +[A-Z][A-Z0-9_]{3,}' lib/curl_config.h.cmake | sed -E 's|#cmakedefine +||g' + grep -o -E '#undef +[A-Z][A-Z0-9_]{3,}' lib/curl_config.h.in | sed -E 's|#undef +||g' + } | sort -u | grep -v -F 'HEADER_CURL_' | while read -r def; do + c="$(git grep -w -F "${def}" | grep -v -E -c '(/libcurl\.tmpl|^lib/config-|^lib/curl_config\.h\.cmake|^CMakeLists\.txt|^CMake/Platforms/WindowsCache\.cmake|^packages/vms/config_h\.com|^m4/curl-functions\.m4|^acinclude\.m4|^configure\.ac)')" + if [ "${c}" = '0' ]; then + echo "${def}" + fi + done + ``` + + Reviewed-by: Daniel Stenberg + Closes #9044 + +Daniel Stenberg (19 Jul 2022) +- RELEASE-NOTES: synced + +- cookie: treat a blank domain in Set-Cookie: as non-existing + + This matches what RFC 6265 section 5.2.3 says. + + Extended test 31 to verify. + + Fixes #9164 + Reported-by: Gwen Shapira + Closes #9177 + +- [Patrick Monnerat brought this change] + + base64: base64url encoding has no padding + + See RFC4648 section 5 and RFC7540 section 3.2.1. + + Suppress generation of '=' padding of base64url encoding. This is + accomplished by considering the string beginning at offset 64 in the + character table as the padding: this is "=" for base64, "" for base64url. + + Also use strchr() to replace character search loops where possible. + + Suppress erroneous comments about empty encoding results. + + Adjust unit test 1302 to unpadded base64url encoding and add tests for + empty results. + + Closes #9139 + +- easyoptions: fix icc warning + + easyoptions.c(360): error #188: enumerated type mixed with another type + + Ref: #9156 + Reported-by: Matthew Thompson + Closes #9176 + +- [lwthiker brought this change] + + h2h3: fix overriding the 'TE: Trailers' header + + A 'TE: Trailers' header is explicitly replaced by 'te: trailers' + (lowercase) in Curl_pseudo_headers() when building the list of HTTP/2 or + HTTP/3 headers. However, this is then replaced again by the original + value due to a bug, resulting in the uppercased version being sent. Some + HTTP/2 servers reject the whole HTTP/2 stream when this is the case. + + Closes #9170 + +- lib3026: reduce the number of threads to 100 + + Down from 1000, to make it run and work in more systems. + + Fixes #9172 + Reported-by: Érico Nogueira Rolim + Closes #9173 + +- doh: move doh related struct definitions to doh.h + + and make 'dnstype' in 'struct dnsprobe' use the DNStype to fix the icc compiler warning: + + doh.c(924): error #188: enumerated type mixed with another type + + Reported-by: Matthew Thompson + Ref #9156 + Closes #9174 + +Viktor Szakats (17 Jul 2022) +- Makefile.m32: stop trying to build libcares.a [ci skip] + + Before this patch, `lib/Makefile.m32` had a rule to build `libcares.a` in + `-cares`-enabled builds, via c-ares's own `Makefile.m32`. Committed in + 2007 [1]. The commit message doesn't specifically address this particular + change. This logic comes from the times when c-ares was part of the curl + source tree, hence the special treatment. + + This feature creates problems when building c-ares first, using CMake + and pointing `LIBCARES_PATH` to its install prefix, where `Makefile.m32` + is missing in such case. A sub-build for c-ares is undesired also when + c-ares had already been build via its own `Makefile.m32`. + + To avoid the sub-build, this patch deletes its Makefile rule. After this + patch `libcares.a` needs to be manually built before using it in + `Makefile.m32`. Aligning it with the rest of dependencies. + + [1] 46c92c0b806da041d7a5c6fb64dbcdc474d99b31 + + Reviewed-by: Daniel Stenberg + Closes #9169 + +Daniel Stenberg (17 Jul 2022) +- curl: writeout: fix repeated header outputs + + The function stored a terminating zero into the buffer for convenience, + but when on repeated calls that would cause problems. Starting now, the + passed in buffer is not modified. + + Reported-by: highmtworks on github + Fixes #9150 + Closes #9152 + +- curl_multi_timeout.3: clarify usage + + Fixes #9155 + Closes #9157 + Reported-by: jvvprasad78 on github + +- mprintf: make dprintf_formatf never return negative + + This function no longer returns a negative value if the formatting + string is bad since the return value would sometimes be propagated as a + return code from the mprintf* functions and they are documented to + return the length of the output. Which cannot be negative. + + Fixes #9149 + Closes #9151 + Reported-by: yiyuaner on github + +Viktor Szakats (17 Jul 2022) +- trace: 0x7F character is non-printable + + `0x7F` is `DEL`, a non-printable symbol, so print it as + `UNPRINTABLE_CHAR`. + + Reported-by: MasterInQuestion on github + Fixes #9162 + Closes #9166 + +- doh: use https protocol by default + + The only allowed protocol is https, so it makes sense to use that + by default if not passed explicitly by the user. + + Reported-by: MasterInQuestion on github + Reviewed-by: Jay Satiro + Fixes #9163 + Closes #9165 + +- openssl: fix BoringSSL symbol conflicts with LDAP and Schannel + + Same issue as here [1], but this time when building curl with BoringSSL + for Windows with LDAP(S) or Schannel support enabled. + + Apply the same fix [2] for these source files as well. + + This can also be fixed by moving `#include "urldata.h"` _before_ + including `winldap.h` and `schnlsp.h` respectively. This seems like + a cleaner fix, though I'm not sure why it works and if it has any + downside. + + [1] https://github.com/curl/curl/issues/5669 + [2] https://github.com/curl/curl/commit/fbe07c6829ba8c5793c84c2856526e19e9029ab9 + + Co-authored-by: Jay Satiro + Closes #9110 + +Daniel Stenberg (13 Jul 2022) +- asyn-thread: make getaddrinfo_complete return CURLcode + + ... as the only caller that cares about what it returns assumes that + anyway. This caused icc to warn: + + asyn-thread.c(505): error #188: enumerated type mixed with another type + result = getaddrinfo_complete(data); + + Repoorted-by: Matthew Thompson + Bug: https://github.com/curl/curl/issues/9081#issuecomment-1182143076 + Closes #9146 + +- easy_lock: fix build with icc + + The Intel compiler tries to look like GCC *and* clang *and* it lies in + its __has_builtin() function (returns true when it should return false), + so override it. + + Reported-by: Matthew Thompson + Fixes #9081 + Closes #9144 + +- configure: fix --disable-headers-api + + Reported-by: Michał Antoniak + Fixes #9134 + Closes #9143 + +- test3026: require 'threadsafe' + + Reported-by: Sukanya Hanumanthu + Fixes #9141 + Closes #9142 + +- [Even Rouault brought this change] + + CMake: link curl to its dependencies with PRIVATE + + The current PUBLIC visibility causes issues for downstream users. + Cf https://github.com/OSGeo/PROJ/pull/3172#issuecomment-1157942986 + + Reviewed-by: Jakub Zakrzewski + Closes #9125 + +- [Even Rouault brought this change] + + CMake: remove APPEND in export(TARGETS) + + When running cmake several times, new content was appended to already + existing generated files, which is not appropriate + + Reviewed-by: Jakub Zakrzewski + Closes #9124 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: implement cb_h3_stop_sending and cb_h3_reset_stream callbacks + + Closes #9135 + +- RELEASE-NOTES: synced + +Viktor Szakats (11 Jul 2022) +- build: improve OS string in CMake and `config-win32.h` + + This patch makes CMake fill the "OS string" with the value of + `CMAKE_C_COMPILER_TARGET`, if passed. This typically contains a triplet, + the same we can pass to `./configure` via `--host=`. + + For non-CMake, non-autotools, Windows builds, this patch adds the ability + to override the default `OS` value in `lib/config-win32.h`. + + With these its possible to get the same OS string across the three build + systems. + + This patch supersedes the earlier, partial, CMake-only solution: + 435f395f3f8c11eebfcc243ca55ebcc11a19b8b8, thus retiring the + `CURL_OS_SUFFIX` CMake option. + + Reviewed-by: Jay Satiro + Closes #9117 + +- Makefile.m32: add `CURL_RC` and `CURL_STRIP` variables [ci skip] + + They allow to override the hardcoded values for the `windres` and `strip` + tools, complementing the existing set of `CURL_{CC,AR,RANLIB}` variables. + + `CURL_RC` comes handy when using LLVM tools with `CROSSPREFIX=llvm-` and + `CURL_CC=clang` set on current latest debian:unstable or earlier, where + `llvm-windres` is missing, and a `CURL_RC=-windres` fixes it. + Hopefully this will be fixed in the llvm package. FWIW `llvm-windres` + does exist in Homebrew llvm, MSYS2 llvm and llvm-mingw. + + Reviewed-by: Daniel Stenberg + Closes #9132 + +Daniel Stenberg (10 Jul 2022) +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: fix stall or busy loop on STOP_SENDING with upload data + + Fixes #9122 + Closes #9123 + +- [Xiaoke Wang brought this change] + + tool_operate: better cleanup of easy handle in exit path + + Closes #9114 + +- [Xiaoke Wang brought this change] + + getinfo: return better error on NULL as first argument + + Closes #9114 + +- tool_getparam: repair cleanarg + + Regression since 9e5669f. + + Make sure the "cleaning" of command line arguments is done on the + original argv[] pointers. As a bonus, it also exits better on out of + memory error. + + Reported-by: Litter White + Fixes #9128 + Closes #9130 + +Jay Satiro (10 Jul 2022) +- docs: explain curl_easy_escape/unescape curl handle is ignored + + 26101421 (precedes 7.82.0) removed character conversion support used by + very old legacy operating systems and since then the curl handle passed + to curl_easy_escape/unescape is always ignored. + + Bug: https://github.com/curl/curl/discussions/9115 + Reported-by: Ted Lyngmo + + Closes https://github.com/curl/curl/pull/9121 + +Viktor Szakats (8 Jul 2022) +- openssl: add `CURL_BORINGSSL_VERSION` to identify BoringSSL + + BoringSSL doesn't keep a version number, and doesn't self-identify itself + via any other revision number via its own headers. We can identify + BoringSSL revisions by their commit hash. This hash is typically known by + the builder. This patch adds a way to pass this hash to libcurl, so that + it can display in the curl version string: + + For example: + + `CFLAGS=-DCURL_BORINGSSL_VERSION="c239ffd0"` + + ``` + curl 7.84.0 (x86_64-w64-mingw32) libcurl/7.84.0 BoringSSL/c239ffd0 (Schannel) zlib/1.2.12 [...] + Release-Date: 2022-06-27 + Protocols: dict file ftp ftps gopher gophers http https imap imaps ldap ldaps mqtt pop3 [...] + Features: alt-svc AsynchDNS brotli gsasl HSTS HTTP2 HTTP3 HTTPS-proxy IDN IPv6 Kerberos [...] + ``` + + The setting is optional, and if not passed, BoringSSL will appear without + a version number, like before this patch. + + Closes #9113 + +Jay Satiro (8 Jul 2022) +- escape: remove outdated comment + + Bug: https://github.com/curl/curl/discussions/9115 + Reported-by: Ted Lyngmo + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: Fix missing initialization of nghttp3_nv.flags + + Closes https://github.com/curl/curl/pull/9118 + +Daniel Stenberg (6 Jul 2022) +- [Brad Forschinger brought this change] + + netrc.d: remove spurious quote + + Closes #9111 + +Viktor Szakats (6 Jul 2022) +- Makefile.m32: add `NGTCP2_LIBS` option [ci skip] + + Makefile.m32's ngtcp2 has its two libs hardwired for OpenSSL. + Add `NGTCP2_LIBS` envvar to override them with a custom list, + making it possible to use BoringSSL, or any other backend. + + Closes #9109 + +Jay Satiro (6 Jul 2022) +- [Evgeny Grin (Karlson2k) brought this change] + + digest: fix missing increment of 'nc' value for auth-int + + - Increment nc regardless of qop type. + + Prior to this change nc was only incremented for qop type auth even + though libcurl sends nc with any qop. + + Closes https://github.com/curl/curl/pull/9090 + +Daniel Stenberg (5 Jul 2022) +- RELEASE-NOTES: synced + + Bumped to 7.85.0 + +- urldata: reduce size of four ftp related members + + ftp_filemethod, ftpsslauth and ftp_ccc are now uchars + + accepttimeout is now unsigned int - almost 50 days ought to be enough + for this value. + + Closes #9106 + +- urldata: reduce three type-members from int to uchar + + - timecondition + - proxytype + - method + + ... previously used their enum type in the struct, which made them + unnecesarily large. + + Closes #9105 + +- CURLOPT_SERVER_RESPONSE_TIMEOUT: the new name + + Starting now, CURLOPT_FTP_RESPONSE_TIMEOUT is the alias instead of the + other way around. + + Since 7.20.0, CURLOPT_SERVER_RESPONSE_TIMEOUT has existed as an alias + but since the option is for more protocols than FTP the more "correct" + version of the option is the "server" one so now we switch. + + Closes #9104 + +- urldata: make 'ftp_create_missing_dirs' a uchar + + It only ever holds the values 0-2. + + Closes #9103 + +- [Don J Olmstead brought this change] + + cmake: support ngtcp2 boringssl backend + + Update the ngtcp2 find module to detect the boringssl backend. Determine + if the underlying OpenSSL implementation is BoringSSL and if so use that + as the ngtcp2 backend. + + Reviewed-by: Jakub Zakrzewski + Closes #9065 + +- urldata: change 4 timeouts to unsigned int from long + + They're not used for that long times anyway, 32 bit milliseconds is long + enough. + + Closes #9101 + +- urldata: make 'use_netrc' a uchar + + Closes #9102 + +- urldata: make 'buffer_size' an unsigned int + + It is already capped at READBUFFER_MAX which fits easily in 32 bits. + + Closes #9098 + +- urldata: remove the unused 'rtspversion' struct member + + Closes #9100 + +- urldata: make 'use_port' an usigned short + + ... instead of a long. It is already enforced to not attempt to set any + value outside of 16 bits unsigned. + + Closes #9099 + +- urldata: store dns cache timeout in an int + + 68 years ought to be enough for most. + + Closes #9097 + +- curl: proto2num: make sure obuf is inited + + Detected by Coverity. CID 1507052. + + Closes #9096 + +- cookie: use %zu to infof() for size_t values + + Detected by Coverity. CID 1507051 + Closes #9095 + +Viktor Szakats (4 Jul 2022) +- makefile.m32: add support for custom ARCH [ci skip] + + When building curl for target platform other than x64 and x86, it is now + possible to pass `ARCH=custom`, that will omit all hardcoded logic for + setting up CFLAGS/LDFLAGS/RCFLAGS for these platforms, and let these be + customized via `CURL_CFLAG_EXTRAS`, `CURL_LDFLAG_EXTRAS`, and a newly + added one for the resource compiler: `CURL_RCFLAG_EXTRAS`. + + This makes it possible to use `makefile.m32` to build for ARM64 for + example. + + Reviewed-by: Daniel Stenberg + Closes #9092 + +- cmake: do not force Windows target versions + + The goal of this patch is to avoid CMake forcing specific Windows + versions and rely on toolchain defaults or manual selection instead. + This gives back control to the user. This also brings CMake closer to + how autotools and `Makefile.m32` behaves in this regard. + + - CMake had a setting `ENABLE_INET_PTON` defaulting to `ON`, which did + nothing else than fixing the Windows build target to Vista. This also + happened when the toolchain did not have Vista support (e.g. original + MinGW), breaking such builds. + + In other environments it did not make a user-facing difference, + because libcurl has its own pton() implementation, so it works well + with or without Vista's inet_pton(). + + This patch drops this setting. inet_pton() is now used whenever + building for Vista or newer, either when requested manually or by + default with modern toolchains (e.g. mingw-w64). Older envs will fall + back to curl's pton(). + + Ref: https://github.com/curl/curl/pull/9027#issuecomment-1164157604 + Ref: https://github.com/curl/curl/pull/8997#issuecomment-1164344155 + + - When the user did no select a Windows target version manually, stop + explicitly targeting Windows XP, and instead use the toolchain default. + + This may pose an issue with old toolchains defaulting to pre-XP + targets. In such case you must manually target Windows XP via: + `-DCURL_TARGET_WINDOWS_VERSION=0x0501` + or + `-DCMAKE_C_FLAGS=-D_WIN32_WINNT=0x0501` + + Reviewed-by: Jay Satiro + Reviewed-by: Marcel Raad + Closes #9046 + +- windows: improve random source + + - Use the Windows API to seed the fallback random generator. + + This ensures to always have a random seed, even when libcurl is built + with a vtls backend lacking a random generator API, such as rustls + (experimental), GSKit and certain mbedTLS builds, or, when libcurl is + built without a TLS backend. We reuse the Windows-specific random + function from the Schannel backend. + + - Implement support for `BCryptGenRandom()` [1] on Windows, as a + replacement for the deprecated `CryptGenRandom()` [2] function. + + It is used as the secure random generator for Schannel, and also to + provide entropy for libcurl's fallback random generator. The new + function is supported on Vista and newer via its `bcrypt.dll`. It is + used automatically when building for supported versions. It also works + in UWP apps (the old function did not). + + - Clear entropy buffer before calling the Windows random generator. + + This avoids using arbitrary application memory as entropy (with + `CryptGenRandom()`) and makes sure to return in a predictable state + when an API call fails. + + [1] https://docs.microsoft.com/windows/win32/api/bcrypt/nf-bcrypt-bcryptgenrandom + [2] https://docs.microsoft.com/windows/win32/api/wincrypt/nf-wincrypt-cryptgenrandom + + Closes #9027 + +Daniel Stenberg (4 Jul 2022) +- setopt: add CURLOPT_PROTOCOLS_STR and CURLOPT_REDIR_PROTOCOLS_STR + + ... as replacements for deprecated CURLOPT_PROTOCOLS and + CURLOPT_REDIR_PROTOCOLS as these new ones do not risk running into the + 32 bit limit the old ones are facing. + + CURLINFO_PROTCOOL is now deprecated. + + The curl tool is updated to use the new options. + + Added test 1597 to verify the libcurl protocol parser. + + Closes #8992 + +- digest: simplify a switch() to a simple if + +- digest: provide a special bit for "sess" algos + + Also shortened the names and moved them to the .c file since they are + private for this source file only. Also made them #defines instead of + enum. + + Closes #9079 + +Jay Satiro (4 Jul 2022) +- [Thomas Weißschuh brought this change] + + select: do not return fatal error on EINTR from poll() + + The same was done for select() in 5912da25 but poll() was missed. + + Bug: https://bugs.archlinux.org/task/75201 + Reported-by: Alexandre Bury (gyscos at archlinux) + + Ref: https://github.com/curl/curl/issues/8921 + Ref: https://github.com/curl/curl/pull/8961 + Ref: https://github.com/curl/curl/commit/5912da25#r77584294 + + Closes https://github.com/curl/curl/pull/9091 + +- [Kai Pastor brought this change] + + cmake: fix build for mingw cross compile + + - Change normaliz lib name to all lowercase. + + This is from a standing patch in vcpkg: + Mingw has libnormaliz.a. For case-sensitive file systems (e.g. cross + builds from Linux), the spelling must match exactly. + + Closes https://github.com/curl/curl/pull/9084 + +- easy_lock: fix build for mingw + + - Define SRWLOCK symbols missing in some mingw environments. + + Closes https://github.com/curl/curl/pull/8997 + +Daniel Stenberg (2 Jul 2022) +- tool_progress: avoid division by zero in parallel progress meter + + Reported-by: Brian Carpenter + Fixes #9082 + Closes #9083 + +- http_aws_sigv4.c: remove two unusued includes + + Closes #9080 + +- .mailmap: additional edit + + Follow-up to 861e2a8aca6c7 so that Evgeny appears with the same in git + logs even when using old email. + +- RELEASE-NOTES: synced + + bumped to 7.84.1 + +- [Evgeny Grin (Karlson2k) brought this change] + + .mailmap: updated + +- [Evgeny Grin (Karlson2k) brought this change] + + THANKS: merged two entries for Evgeny Grin + + Also updated THANKS-filter file + + Closes #9076 + +- [Jilayne Lovejoy brought this change] + + lib/curl_path.c: add ISC to license expression + + THe text of the ISC license is in this file, so the SPDX license + expression should be updated + + Closes #9073 + +- [Sean McArthur brought this change] + + hyper: use wakers for curl pause/resume + + Closes #9070 + +Viktor Szakats (30 Jun 2022) +- Makefile.m32: do not set the libcurl.rc debug flag [ci skip] + + Delete `-DDEBUGBUILD=0` windres option. This was likely meant to + disable VS_FF_DEBUG in FILEFLAGS, but any assigned value enabled + it instead. Delete this unnecessary option and thus sync up with + how CMake compiles libcurl.rc by default. + + Reviewed-by: Jay Satiro + Closes #9069 + +Daniel Stenberg (29 Jun 2022) +- curl.h: CURLE_CONV_FAILED is obsoleted + + The last use was removed in 7.82.0. Updated some docs too to reflect the + current error code situation. + + Closes #9067 + +- curl: output warning when a cookie is dropped due to size + + Dropped from the request, that is. + + Closes #9064 + +- curl_mime_data.3: polish the wording + + Closes #9063 + +- configure: check for the stdatomic.h header in configure + + ... and only set HAVE_ATOMIC if that header exists since we use + typedefes set in it. + + Reported-by: Ryan Schmidt + Fixes #9059 + Closes #9060 + +- easy_lock: fix the #ifdef conditional for ia32_pause + + To work better with new and old clang compilers. + + Reported-by: Ryan Schmidt + Assisted-by: Joshua Root + + Fixes #9058 + Closes #9062 + +- easy_lock: switch to using atomic_int instead of bool + + To work with more compilers without requiring separate libs to + link. Like with gcc-12 for RISC-V on Linux. + + Reported-by: Adam Sampson + Fixes #9055 + Closes #9061 + +- [vvb2060 brought this change] + + ngtcp2: fix incompatible function pointer types + + Closes #9056 + +- [vvb2060 brought this change] + + easy_lock.h: use __asm__ instead of asm to fix build + + Closes #9056 + +- [Samuel Henrique brought this change] + + libcurl-security.3: fix typo on macro "SH_" + + During the packaging of the latest curl release for Debian, Lintian + warned me about a typo which causes the section name "Secrets in memory" + to not be rendered in the manpage due to "SH_" not being recognized as a + header. + + Closes #9057 + +- easy_lock.h: include sched.h if available to fix build + + Patched-by: Harry Sintonen + + Closes #9054 + +Version 7.84.0 (27 Jun 2022) + +Daniel Stenberg (27 Jun 2022) +- RELEASE-NOTES: synced + + Version 7.84.0 release + +- THANKS: contributors from 7.84.0 release notes + +- hsts: use Curl_fopen() + +- altsvc: use Curl_fopen() + +- fopen: add Curl_fopen() for better overwriting of files + + Bug: https://curl.se/docs/CVE-2022-32207.html + CVE-2022-32207 + Reported-by: Harry Sintonen + Closes #9050 + +- test444: test many received Set-Cookie: + + The amount of sent cookies in the test is limited to 80 because hyper + has its own strict limits in how many headers it allows to be received + which triggers at some point beyond this number. + +- test442/443: test cookie caps + + 442 - verify that only 150 cookies are sent + 443 - verify that the cookie: header remains less than 8K in size + +- cookie: apply limits + + - Send no more than 150 cookies per request + - Cap the max length used for a cookie: header to 8K + - Cap the max number of received Set-Cookie: headers to 50 + + Bug: https://curl.se/docs/CVE-2022-32205.html + CVE-2022-32205 + Reported-by: Harry Sintonen + Closes #9048 + +- test387: verify rejection of compression chain attack + +- content_encoding: return error on too many compression steps + + The max allowed steps is arbitrarily set to 5. + + Bug: https://curl.se/docs/CVE-2022-32206.html + CVE-2022-32206 + Reported-by: Harry Sintonen + Closes #9049 + +- krb5: return error properly on decode errors + + Bug: https://curl.se/docs/CVE-2022-32208.html + CVE-2022-32208 + Reported-by: Harry Sintonen + Closes #9051 + +- easy_lock.h: remove use of the deprecated ATOMIC_VAR_INIT macro + + clang 14 warns about its use. It is being deprecated by the working + group for the programming language C: "The macro ATOMIC_VAR_INIT is + basically useless for the purpose for which it was designed" + + Ref: https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2886.htm + + Reported-by: Tatsuhiro Tsujikawa + Fixes #9041 + Closes #9042 + +- [Stefan Eissing brought this change] + + ngtcp2: avoid supplying 0 length `msg_control` to sendmsg() + + Testing on macOS 12.4, sendmsg() fails with EINVAL when a msg_control + buffer is provided in sengmsg(), even though msg_controllen was set to + 0. + + Initialize msg.msg_controllen just as needed and also perform the size + assertion only when needed. + + Closes #9039 + +- [Tom Eccles brought this change] + + ftp: restore protocol state after http proxy CONNECT + + connect_init() (lib/http_proxy.c) swaps out the protocol state while + working on the proxy connection, this is then restored by + Curl_connect_done() after the connection completes. + + ftp_do_more() extracted the protocol state pointer to a local variable + at the start of the function then calls Curl_proxy_connect(). If the proxy + connection completes, Curl_proxy_connect() will call Curl_connect_done() + (via Curl_proxyCONNECT()), which restores data->req.p to point to the ftp + protocol state instead of the http proxy protocol state, but the local + variable in ftp_do_more still pointed to the old value. + + Ultimately this meant that the state worked on by ftp_do_more() was the + http proxy state not the ftp state initialised by ftp_connect(), but + subsequent calls to any ftp_ function would use the original state. + + For my use-case, the visible consequence was that ftp->downloadsize was + never set and so downloaded data was never returned to the application. + + This commit updates the ftp protocol state pointer in ftp_do_more() after + Curl_proxy_connect() returns, ensuring that the correct state pointer is + used. + + Fixes #8737 + Closes #9043 + +Jay Satiro (23 Jun 2022) +- THANKS: add contributor missing from aea8ac1 + + aea8ac1 fixed #8980 which was reported by Sgharat on github, but that + info was not included in the commit message. + +- curl_setup: include _mingw.h + + Prior to this change _mingw.h needed to be included in each unit before + evaluating __MINGW{32,64}_xxx_VERSION macros since it defines them. It + is included only in some mingw headers (eg stdio.h) and not others + (eg windows.h) so it's better to explicitly include it once. + + Closes https://github.com/curl/curl/pull/9036 + +Viktor Szakats (22 Jun 2022) +- rand: stop detecting /dev/urandom in cross-builds + + - Prevent CMake to auto-detect /dev/urandom when cross-building. + Before this patch, it would detect it in a cross-build scenario on *nix + hosts with this device present. This was a problem for example with + Windows builds, but it could affect any target system with this device + missing. This also syncs detection behaviour with autotools, which also + skips it for cross-builds. + - Also, make sure to never use the file RANDOM_FILE as entropy for libcurl's + fallback random number generator on Windows. Windows does not have the + concept of reading a random stream from a filename, nor any guaranteed + non-world-writable path on disk. With this, a manual misconfiguration or + an overeager auto-detection can no longer result in a user-controllable + seed source. + + Reviewed-by: Daniel Stenberg + Closes #9038 + +Daniel Stenberg (22 Jun 2022) +- [Emanuele Torre brought this change] + + ci: avoid `cmake -Hpath` + + This is an undocumented option similar to the `-Spath' option introduced + in cmake 3.13. + Replace all instances of `-Hpath' with `-Spath' in macos workflow. + Replace `-H. -Bpath' with `mkdir path; cd ./path; cmake ..' in zuul + scripts since it runs an older version of cmake. + + Fixes #9008 + Closes #9014 + +- INTERNALS: bring back the "Library symbols" section + + Most contents was moved, but this text should remain here. + + Follow-up to: d324ac8 + Reported-by: Viktor Szakats + Bug: https://github.com/curl/curl/pull/9027#discussion_r903382326 + Closes #9037 + +Viktor Szakats (22 Jun 2022) +- Makefile.m32: stop forcing XP target with ipv6 enabled [ci skip] + + Since this [1] commit in 2011, `_WIN32_WINNT` was set fixed to Windows + XP when the `-ipv6` option is selected. Maybe this was added to support + pre-XP Windows versions (?). These days libcurl builds fine for both XP + and post-XP versions with IPv6 support enabled. The relevance of pre-XP + version is also low by now. Other build methods also do not impose such + limitation for a similar configuration. So, drop this hard-wired + `_WIN32_WINNT` limit from `Makefile.m32`, thus building for the default + Windows version set by the compiler. This is Vista for recent MinGW + versions. + + Old behaviour can be restored by setting this envvar: + export CURL_CFLAG_EXTRAS=-D_WIN32_WINNT=0x0501 + + [1] 98a61d8e2e8982786aaf3916cbbcac96838316e7 + + Closes #9035 + +Daniel Stenberg (21 Jun 2022) +- CONTRIBUTE: mention how we maintain REUSE compliance + + for copyright and license information of all files stored in git + + Closes #9032 + +- CURLOPT_ALTSVC.3: document the file format + + Closes #9033 + +Jay Satiro (21 Jun 2022) +- runtests: add "threadsafe" to detected features + + Follow-up to recent commits which added thread-safety support. + + Bug: https://github.com/curl/curl/pull/9012#discussion_r902018782 + Reported-by: Marc Hörsken + + Closes https://github.com/curl/curl/pull/9030 + +Daniel Stenberg (20 Jun 2022) +- easy: remove dead code + + Follow-up from 5912da253b64d + + Detected by Coverity (CID 1506519) + + Closes #9029 + +- [Glenn Strauss brought this change] + + transfer: upload performance; avoid tiny send + + Append to the upload buffer when only small amount remains in buffer + rather than performing a separate tiny send to empty buffer. + + Avoid degenerative upload behavior which might cause curl to send mostly + 1-byte DATA frames after exhausing the h2 send window size + + Related discussion: https://github.com/nghttp2/nghttp2/issues/1722 + + Signed-off-by: Glenn Strauss + Closes #8965 + +- [Steve Holme brought this change] + + projects: fix third-party SSL library build paths for Visual Studio + + The paths used by the build batch files were inconsistent with those in + the Visual Studio project files. + + Closes #8991 + +- [Pierrick Charron brought this change] + + urlapi: make curl_url_set(url, CURLUPART_URL, NULL, 0) clear all parts + + As per the documentation : + + > Setting a part to a NULL pointer will effectively remove that + > part's contents from the CURLU handle. + + But currently clearing CURLUPART_URL does nothing and returns + CURLUE_OK. This change will clear all parts of the URL at once. + + Closes #9028 + +- [Philip H brought this change] + + CI: bump FreeBSD 13.0 to 13.1 + + Signed-off-by: Philip H <47042125+pheiduck@users.noreply.github.com> + Closes #8815 + +- RELEASE-NOTES: synced + + and updated release date in RELEASE-PROCEDURE.md + +- [divinity76 brought this change] + + CURLOPT_HTTPHEADER.3: improve comment in example + + Closes #9025 + +Marc Hoersken (16 Jun 2022) +- CI/azure: reduce flakiness by retrying install/prepare steps + + Closes #9010 + +- CI/cirrus: align Windows timeout with Azure CI at 120 minutes + + Closes #9009 + +Jay Satiro (16 Jun 2022) +- vtls: make curl_global_sslset thread-safe + + .. and update some docs to explain curl_global_* is now thread-safe. + + Follow-up to 23af112 which made curl_global_init/cleanup thread-safe. + + Closes https://github.com/curl/curl/pull/9016 + +- curl_easy_pause.3: remove explanation of progress function + + - Remove misleading text that says progress function "gets called at + least once per second, even if the connection is paused." + + The progress function behavior is more nuanced and the user is better + served reading the progress function doc rather than attempt to explain + it in the curl_easy_pause doc. + + The progress function can only be called at least once per second if an + appropriate multi transfer function is called (eg curl_multi_perform) in + that time. For a paused transfer there may not be such a call. Rather + than explain this in detail in the curl_easy_pause doc, rely on the user + reading the CURLOPT_PROGRESSFUNCTION doc. + + Ref: https://github.com/curl/curl/issues/8983 + + Closes https://github.com/curl/curl/pull/9015 + +Daniel Stenberg (15 Jun 2022) +- libssh: skip the fake-close when libssh does the right thing + + Starting in libssh 0.10.0 ssh_disconnect() will no longer close our + socket. Instead it will be kept alive as we want it, and it is our + responsibility to close it later. + + Ref: #8718 + Ref: https://gitlab.com/libssh/libssh-mirror/-/merge_requests/240 + Closes #9021 + +- configure: warn about rustls being experimental + + Right now a dozen test cases are disabled because they don't work with + rustls. + + Closes #9019 + +- runtests: skip starting the ssh server if user name is lacking + + Because the ssh server startup script *requires* a user name there's no + point in invoking it if no name was found. + + Reported-by: Ricardo M. Correia + Ref: #9007 + Closes #9013 + +- copyright.pl: parse and use .reuse/dep5 for skips + + Also scan skipped files to be able to find superfluous ignores, shown with -v. + + Closes #9006 + +- reuse/dep5: adjusted to parse better + + ... adjusted a few files to contain copyright and license info. + + Closes #9006 + +- buildconf.bat: update copyright year range + + Closes #9006 + +- README.md: use the common "Copyright" style formatting + + Closes #9006 + +- reuse: move license info from .mailmap.license to .reuse/dep5 + + Closes #9006 + +- README.md: add a REUSE badge + + Closes #9004 + +- .reuse/dep5: remove recursive docs ignore, only skip markdown files + + ... and some additional non-markdown individual files in docs/ + + Closes #9005 + +- docs/cmdline-opts: add copyright and license identifier to each file + + gen.pl now insists on C: and SPDX-License-Identifier: fields to be + present in all files. + + Closes #9002 + +- copyright: info for/ignore .github/ISSUE_TEMPLATE/bug_report.md + + Follow-up from 448f7ef9ab2afb7. The adding of the copyright text in that + file broke site functionality. + + Closes #9001 + +- bug_report.md: revert the REUSE template to see if it works again + +Viktor Szakats (13 Jun 2022) +- version: rename threadsafe-init to threadsafe + + Referring to Daniel's article [1], making the init function thread-safe + was the last bit to make libcurl thread-safe as a whole. So the name of + the feature may as well be the more concise 'threadsafe', also telling + the story that libcurl is now fully thread-safe, not just its init + function. Chances are high that libcurl wants to remain so in the + future, so there is little likelihood of ever needing any other distinct + `threadsafe-` feature flags. + + For consistency we also shorten `CURL_VERSION_THREADSAFE_INIT` to + `CURL_VERSION_THREADSAFE`, update its description and reference libcurl's + thread safety documentation. + + [1]: https://daniel.haxx.se/blog/2022/06/08/making-libcurl-init-more-thread-safe/ + + Reviewed-by: Daniel Stenberg + Reviewed-by: Jay Satiro + Closes #8989 + +Daniel Stenberg (13 Jun 2022) +- test3026: disable on win32 + + ... as it's not likely to have working pthreads + + Closes #8996 + +- GHA: shorten the reuse CI job name + + "REUSE compliance / check" should be good enough + + Closes #9000 + +- misc: add missing SPDX-License-Identifier info + + For some reason the REUSE CI job did not find these. + + Closes #8999 + +- copyright: verify SPDX-License-Identifier presence as well + +- easy_lock: add SPDX license identifier + + Closes #8998 + +- mailmap: Max Mehl + +- [Max Mehl brought this change] + + git: ignore large commit making the curl REUSE compliant + +- [Max Mehl brought this change] + + copyright: make repository REUSE compliant + + Add licensing and copyright information for all files in this repository. This + either happens in the file itself as a comment header or in the file + `.reuse/dep5`. + + This commit also adds a Github workflow to check pull requests and adapts + copyright.pl to the changes. + + Closes #8869 + +- curl_url_set.3: clarify by default using known schemes only + + Closes #8994 + +- scripts/copyright.pl: ignore leading spaces + +Viktor Szakats (10 Jun 2022) +- ngtcp2: fix typo in preprocessor condition + + Ref: 927ede7edcb7b05b8e8bbf9ced6aed523ae594a7 + + Bug: https://github.com/curl/curl/pull/8981#discussion_r894312185 + Reported-by: Emil Engler + Closes #8987 + +Daniel Stenberg (10 Jun 2022) +- RELEASE-NOTES: synced + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: build without sendmsg + + Closes #8981 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: use handshake helper funcs to simplify TLS handshake integration + + Closes #8968 + +- test390: verify --parallel + + Closes #8985 + +- test1543: verify CURLINFO_EFFECTIVE_URL with CURLOPT_CURLU set + + Triggered by a bug report from Adam Light: + https://curl.se/mail/lib-2022-06/0013.html - which ended up being mostly + a misunderstanding of how CURLINFO_EFFECTIVE_URL works. + + Closes #8971 + +- url: URL encode the path when extracted, if spaces were set + +- urlapi: support CURLU_URLENCODE for curl_url_get() + +- server/sws: support spaces in the HTTP request path + +- tests/getpart: fix getpartattr to work with "data" and "data2" + +- select: return error from "lethal" poll/select errors + + Adds two new error codes: CURLE_UNRECOVERABLE_POLL and + CURLM_UNRECOVERABLE_POLL one each for the easy and the multi interfaces. + + Reported-by: Harry Sintonen + Fixes #8921 + Closes #8961 + +- test3026: add missing control file + + Follow-up from 2ed101256414ea5 + + Makes the test run, makes 'make dist' work + + This single test takes 24-25 seconds on my machine (with valgrind). For + this reason I tag it with a "slow" keyword. + + Closes #8976 + +- runtests: fix skipping tests not done event-based + + ... and call timestampskippedevents() to avoid the flood of + uninitialized variable warnings. + + Closes #8977 + +- transfer: maintain --path-as-is after redirects + + Reported-by: Marcus T + Fixes #8974 + Closes #8975 + +- test391: verify --path-as-is with redirect + +Jay Satiro (8 Jun 2022) +- curl_global_init.3: Separate the Windows loader lock warning + + This is a slight correction of the parent commit which implied the + loader lock warning only applied if not thread-safe. In fact the loader + lock warning applies either way. + + Ref: https://github.com/curl/curl/pull/8972#discussion_r891987030 + +Daniel Stenberg (8 Jun 2022) +- curl_global_init.3: this is now (usually) thread-safe + + Follow-up to 23af112f5556 + + Closes #8972 + +Jay Satiro (8 Jun 2022) +- [Haxatron brought this change] + + libcurl-security.3: Document CRLF header injection + + - Document that user input to header options is not sanitized, which + could result in CRLF used to modify the request in a way other than + what was intended. + + Ref: https://hackerone.com/reports/1589877 + Ref: https://medium.com/@tomnomnom/crlf-injection-into-phps-curl-options-e2e0d7cfe545 + + Closes https://github.com/curl/curl/pull/8964 + +- CURLOPT_RANGE.3: remove ranged upload advice + + The e-mail link in the advice contains instructions that are prone to + error. We need an example that works and can demonstrate how to properly + perform a ranged upload, and then we can refer to that example instead. + + Bug: https://github.com/curl/curl/issues/8969 + Reported-by: Simon Berger + + Closes https://github.com/curl/curl/pull/8970 + +Daniel Stenberg (7 Jun 2022) +- [Thomas Guillem brought this change] + + curl_version_info: add CURL_VERSION_THREADSAFE_INIT + + This flag can be used to make sure that curl_global_init() is + thread-safe. + + This can be useful for libraries that can't control what other + dependencies are doing with Curl. + + Closes #8680 + +- [Thomas Guillem brought this change] + + lib: make curl_global_init() threadsafe when possible + + Use a posix pthread or a Windows SRWLOCK to lock curl_global_init*() and + curl_global_cleanup(). + + Closes #8680 + +- RELEASE-NOTES: synced + +- [Fabian Keil brought this change] + + test414: add the '--resolve' keyword + + ... so the test can be automatically skipped when + using an external proxy like Privoxy. + + Closes #8959 + +- [Fabian Keil brought this change] + + test{440,441,493,977}: add "HTTP proxy" keywords + + ... so the tests can be automatically skipped when + using an external proxy like Privoxy. + + Closes #8959 + +- [Fabian Keil brought this change] + + runtests.pl: add the --repeat parameter to the --help output + + Closes #8959 + +- [Fabian Keil brought this change] + + test 2081: add a valid reply for the second request + + ... so the test works when using a HTTP proxy like + Privoxy that sends an error message if the server + doesn't send data. + + Closes #8959 + +- [Fabian Keil brought this change] + + test 675: add missing CR so the test passes when run through Privoxy + + Closes #8959 + +- ftp: when failing to do a secure GSSAPI login, fail hard + + ... instead of switching to cleartext. For the sake of security. + + Reported-by: Harry Sintonen + Bug: https://hackerone.com/reports/1590102 + Closes #8963 + +- http2: reject overly many push-promise headers + + Getting more than a thousand of them is rather a sign of some kind of + attack. + + Reported-by: Harry Sintonen + Bug: https://hackerone.com/reports/1589847 + Closes #8962 + +- [Fabian Keil brought this change] + + misc: spelling improvements + + Closes #8956 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: fix assertion failure on EMSGSIZE + + Closes #8958 + +- easy/transfer: fix cookie-disabled build + + Follow-up from 45de940cebf6a + Reported-by: Marcel Raad + Fixes #8953 + Closes #8954 + +- examples/crawler.c: use the curl license + + With permission from Jeroen Ooms + + URL: https://github.com/curl/curl/pull/8869#issuecomment-1144742731 + Closes #8950 + +- speed-limit/time.d: mention these affect transfers in either direction + + Reported-by: Ladar Levison + Fixes #8948 + Closes #8951 + +- scripts/copyright.pl: fix the exclusion to not ignore man pages + + Ref: #8869 + Closes #8952 + +- examples: remove fopen.c and rtsp.c + + To simplify the license situation, as they were the only files in the + source tree using these specific BSD-3 clause licenses. + + For an fopen style API, we recommend instead going + https://github.com/curl/fcurl + + Ref: #8869 + Closes #8949 + +- [Wolf Vollprecht brought this change] + + netrc: check %USERPROFILE% as well on Windows + + Closes #8855 + +- CURLOPT_SSH_HOSTKEYDATA/FUNCTION.3: minor polish + +- [michael musset brought this change] + + libssh2: add CURLOPT_SSH_HOSTKEYFUNCTION + + The callback set by CURLOPT_SSH_HOSTKEYFUNCTION is called to check + wether or not the connection should continue. + + The host key is passed in argument with a custom handle for the + application. + + It overrides CURLOPT_SSH_KNOWNHOSTS + + Closes #7959 + +- docs/CONTRIBUTE.md: document the 'needs-votes' concept + + A pull request sent to the project might get labeled `needs-votes` by a + project maintainer. This label means that in addition to meeting all + other checks and qualifications this pull request must also receive + proven support/thumbs-ups from more community members to be considered + for merging. + + Closes #8910 + +- [Evgeny Grin (Karlson2k) brought this change] + + digest: tolerate missing "realm" + + Server headers may not define "realm", avoid NULL pointer dereference + in such cases. + + Closes #8912 + +- [Evgeny Grin (Karlson2k) brought this change] + + digest: added detection of more syntax error in server headers + + Invalid headers should not be processed otherwise they may create + a security risk. + + Closes #8912 + +- [Evgeny Grin (Karlson2k) brought this change] + + digest: unquote realm and nonce before processing + + RFC 7616 (and 2617) requires values to be "unquoted" before used for + digest calculations. The only place where unquoting can be done + correctly is header parsing function (realm="DOMAIN\\host" and + realm=DOMAN\\host are different realms). + + This commit adds unquoting (de-escaping) of all values during header + parsing and quoting of the values during header forming. This approach + should be most straightforward and easy to read/maintain as all values + are processed in the same way as required by RFC. + + Closes #8912 + +- headers: handle unfold of space-cleansed headers + + Detected by OSS-fuzz + + Bug: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=47767 + + Updated test 1274 + + Closes #8947 + +- lib: make more protocol specific struct fields #ifdefed + + ... so that they don't take up space if the protocols are disabled in + the build. + + Closes #8944 + +- DISABLED: disable 1021 for hyper again + + due to flakiness in the CI builds + +- urldata: store tcp_keepidle and tcp_keepintvl as ints + + They can't be set larger than INT_MAX in the setsocket API calls. + + Also document the max values in their respective man pages. + + Closes #8940 + +- urldata: reduce size of a few struct fields + + When the values are never larger than 32 bit, ints are better than longs. + + Closes #8940 + +- urldata: remove three unused booleans from struct UserDefined + + - is_fwrite_set + - free_referer + - strip_path_slash + + Closes #8940 + +- remote-name.d: mention --output-dir + + plus add two see-alsos + + Closes #8945 + +Jay Satiro (1 Jun 2022) +- configure: skip libidn2 detection when winidn is used + + Prior to this change --with-winidn could be overridden by libidn2 + detection. + + Closes https://github.com/curl/curl/pull/8934 + +Daniel Stenberg (31 May 2022) +- CURLOPT_FILETIME.3: fix the protocols this works with + +- test681: verify --no-remote-name + + Follow-up to 83ee5c428d960 (from #8931) + + Closes #8942 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: enable Linux GSO + + Enable Linux GSO in ngtcp2 QUIC. In order to recover from the + EAGAIN/EWOULDBLOCK by sendmsg with multiple packets in one GSO write, + packet buffer is now held by struct quicsocket. GSO write might fail in + runtime depending on NIC. Disable GSO if sendmsg returns EIO. + + Closes #8909 + +- CURLOPT_PORT.3: We discourage using this option + + Closes #8941 + +- RELEASE-NOTES: synced + +- headers_push: error out if a folded header has no previous header + + As that would indicate an illegal header. The fuzzer reached the assert + in unfold_value() proving that this case can happen. + + Follow-up to c9b60f005358a364 + + Closes #8939 + +- [Boris Verkhovskiy brought this change] + + curl: re-enable --no-remote-name + + Closes #8931 + +- test680: require 'http' since it uses such a URL + + Follow-up to d1b376c03524 + +- CURLOPT_NETRC.3: document the .netrc file format + +- test680: verify rejection of malformatted .netrc quoted password + +- test679: verify netrc quoted string + +- netrc: support quoted strings + + The .netrc parser now accepts strings within double-quotes in order to + deal with for example passwords containing white space - which + previously was not possible. + + A password that starts with a double-quote also ends with one, and + double-quotes themselves are escaped with backslashes, like \". It also + supports \n, \r and \t for newline, carriage return and tabs + respectively. + + If the password does not start with a double quote, it will end at first + white space and no escaping is performed. + + WARNING: this change is not entirely backwards compatible. If anyone + previously used a double-quote as the first letter of their password, + the parser will now get it differently compared to before. This is + highly unfortunate but hard to avoid. + + Reported-by: ImpatientHippo on GitHub + Fixes #8908 + Closes #8937 + +- curl_getdate.3: document that some illegal dates pass through + + Closes #8938 + +- CI: remove configure --enable-headers-api flags + +- headers api: remove EXPERIMENTAL tag + + Closes #8900 + +Daniel Gustafsson (30 May 2022) +- cookies: fix documentation comment + + Commit 4073cd83b2 added the noexpire parameter to Curl_cookie_add but + missed updating the documentation comment at the head of the file. + +Daniel Stenberg (30 May 2022) +- [Marc Hoersken brought this change] + + tests/data/test1940: use binary mode for expected stdout + + The generated stdout data is written in binary mode with [LF] + line endings, therefore we also need to do a binary comparison. + + Assisted-by: Jay Satiro + Assisted-by: Daniel Stenberg + + Follow up to c9b60f005358a364cbcddbebd8d12593acffdd84 + Fixes #8920 + Closes #8936 + +- CURLINFO_CAINFO/PATH.3: clarify the multiple TLS situation + + Spell out the multi-TLS situation. + + Reported-by: Dan Fandrich + Fixes #8926 + Closes #8932 + +Jay Satiro (28 May 2022) +- [JustAnotherArchivist brought this change] + + tool_getparam: fix --parallel-max maximum value constraint + + - Clamp --parallel-max to MAX_PARALLEL (300) instead of resetting to + default value. + + Previously, --parallel-max 300 would use 300 concurrent transfers, but + --parallel-max 301 would unexpectedly use only 50. This change clamps + higher values to the maximum (ie --parallel-max 301 would use 300). + + Closes https://github.com/curl/curl/pull/8930 + +Daniel Stenberg (27 May 2022) +- curl.1: add a few see also --tls-max + + Closes #8929 + +Viktor Szakats (26 May 2022) +- cmake: do not add libcurl.rc to the static libcurl library + + Fixes: https://github.com/curl/curl/pull/8918#issuecomment-1138263855 + + Reviewed-By: Karlson2k@users.noreply.github.com + Closes #8923 + +- cmake: support adding a suffix to the OS value + + CMake automatically uses the `CMAKE_SYSTEM_NAME` value to fill the OS + string appearing in the --version output after the curl version number, + for example: + + 'curl 7.83.1 (Windows)' + + This patchs adds the ability to pass a suffix that is appended to this + value. It's useful to add CPU info or other platform details, + for example: + + 'curl 7.83.1 (Windows-x64)' + + Closes #8919 + +- cmake: enable curl.rc for all Windows targets + + Before this patch, it was only enabled for MSVC. This syncs this + configuration with libcurl.rc, which was already included with + every Windows compiler. + + Closes #8918 + +- cmake: fix detecting libidn2 + + Without this patch, libidn2 detection doesn't even seem to be + attempted. With this patch, cmake can be configured to pick it + up and enable it. Necessary configuration remains manual and + differs from most other dependencies. + + If you are aware of a better fix, we're glad hearing about it + in a new Issue. + + Closes #8917 + +- version: allow stricmp() for sorting the feature list + + In CMakeLists.txt there is an attempt to detect `stricmp()`, and in + certain cases, this attempt is the only successful one to detect a + case-insensitive comparison function. `HAVE_STRICMP` is defined as + a result, but this macro wasn't used anywhere in the source. This + patch makes use of it as an alternative when alpha-sorting the + `--version` feature list. + + Reviewed-by: Daniel Stenberg + Closes #8916 + +Daniel Stenberg (25 May 2022) +- DISABLED: add six tests that fail with hyper + + 1117 1274 1940 1941 1942 1943 + +- c-hyper: mark status line as status for Curl_client_write() + + To make sure the headers API can filter it out as not a regular header. + + Reported-by: Gisle Vanem + Fixes #8894 + Closes #8914 + +Marc Hoersken (25 May 2022) +- tests/data/test1501: kill ftp server after slow LIST response + + This test is contributing to flakiness on the Windows CI runs. + Killing the ftp server after the test run like other slowness + tests already do may help resolve or reduce the flakiness. + + Closes #8907 + +Daniel Stenberg (25 May 2022) +- headers: fix the unfold realloc to use proper new size + + Previously it didn't take the old name length into acount + + Follow-up to: c9b60f005358a364 + Closes #8913 + +Marc Hoersken (25 May 2022) +- GHA: align all install, configure and build steps again + + First step towards more unified build steps on GitHub Actions. + + Closes #8873 + +- CI/azure: remove obsolete strategy for single builds + + This shortens these CI job names on GitHub even more. + Follow up to #8906 which also increased their timeout. + + Closes #8911 + +- CI/azure: shorten names of Windows CI jobs + + Suggested-by: Daniel Stenberg + Closes #8906 + +Daniel Stenberg (24 May 2022) +- http: restore header folding behavior + + Folded header lines will now get passed through like before. The headers + API is adapted and will provide the content unfolded. + + Added test 1274 and extended test 1940 to verify. + + Reported-by: Petr Pisar + Fixes #8844 + Closes #8899 + +Viktor Szakats (24 May 2022) +- Makefile.m32: delete obsolete options, improve -On [ci skip] + + - `-D_AMD64_` has not been necessary for mingw-w64 builds for a long time now. + - `-fno-strict-aliasing` is mentioned for Intel C compiler in autotools, and + I used this with VxWorks in another project, but otherwise this isn't + necessary anymore as a default. If a target still needs it, it can be + added with `CURL_CFLAG_EXTRAS=-fno-strict-aliasing` + - bump up default optimization level to `-O3` (from `-O2`), and also rearrange + option order so the default can now be overridden via + `CURL_CFLAG_EXTRAS`. + - delete `-g` (generate debug info) from `CFLAGS` and `-s` from `LDFLAGS` + (strip debug info). They were working against each other. Now, if someone + needs debug info, it can be enabled via `CURL_CFLAG_EXTRAS=-g` + + Closes #8904 + +Daniel Gustafsson (24 May 2022) +- ntlm: fix one more hostname test fallout + + This fixup was missed in commit 5a41abef6dca19. + + Closes: #8901 + Reviewed-by: Daniel Stenberg + +- doh: remove UNITTEST macro definition + + The UNITTEST macro is defined by curl_setup.h so there is no use in + carry a local copy of the logic. + + Closes: #8902 + Reviewed-by: Daniel Stenberg + +Daniel Stenberg (24 May 2022) +- cookie: fix false positive "potentially uninitialized local variable" + + Reviewed-by: Daniel Gustafsson + Closes #8903 + +- curl: add --rate to set max request rate per time unit + + --rate "12/m" - for 12 per minute or + --rate "5/h" - for 5 per hour + + Removed from TODO + + Closes #8671 + +- [Jay Satiro brought this change] + + max-time.d: clarify max-time sets max transfer time + + Prior to this change the doc said --max-time set the maximum time of the + 'whole operation' which is not accurate. The option maps to + CURLOPT_TIMEOUT_MS which sets maximum transfer time. + + For example, the maximum time on a transfer is reset if the transfer is + retried (--retry). + + Reported-by: Nuru@users.noreply.github.com + + Fixes https://github.com/curl/curl/issues/8877 + Closes #8879 + +- GHA/hyper: enable debug in the build + +- hyper: use 'alt-used' + + Makes test 412+413 work + + Closes #8898 + +- RELEASE-NOTES: synced + +- CURLINFO_CAPATH/CAINFO: get the default CA paths from libcurl + + Closes #8888 + +- links: update dead links + + The wiki pages are gone, remove and link to more long-living docs. + + Closes #8897 + +- ntlm: (void) typecast msnprintf() where we ignore return code + + Follow-up to 5a41abef6, to please Coverity + +Daniel Gustafsson (22 May 2022) +- ntlm: copy NTLM_HOSTNAME to host buffer + + Commit 709ae2454f43 added a fake hostname to avoid leaking the local + hostname, but omitted copying it to the host buffer. Fix by copying + and adjust the test fallout. + + Closes: #8895 + Fixes: #8893 + Reported-by: Patrick Monnerat + Reviewed-by: Daniel Stenberg + +- configure: use the SED value to invoke sed + + Rather than assuming sed in PATH, use the resolved $SED variable + like in all other invocations of sed in configure. + + Closes: #8891 + Reviewed-by: Daniel Stenberg + Reviewed-by: Marcel Raad + +Daniel Stenberg (20 May 2022) +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: Allow curl to send larger UDP datagrams + + Allow curl to send larger UDP datagram if Path MTU Discovery finds the + availability of larger path MTU. To make it work and not to send + fragmented packet, we need to set DF bit. That makes send(2) fail with + EMSGSIZE if UDP datagram is too large. In that case, just let it be + lost. This patch enables DF bit for Linux only. + + Closes #8883 + +- libcurl-security.3: add "Secrets in memory" + + Closes #8881 + +- tests: update NTLM tests to use new host name + + Also drop the debug requirement, remove the setenv sections, remove + prechecks and add NTLM to the top keywords. + + Closes #8889 + +- ntlm: provide a fixed fake host name + + The NTLM protocol includes providing the local host name, but apparently + other implementations already provide a fixed fake name instead to avoid + leaking the real local name. + + The exact name used is 'WORKSTATION', because Firefox uses that. + + The change is written to allow someone to "back-pedal" fairly easy in + case of need. + + Reported-by: Carlo Alberto + Fixes #8859 + Closes #8889 + +Daniel Gustafsson (20 May 2022) +- KNOWN_BUGS: fix typo in problem description + + s/TSL/TLS/ + +- FEATURES: remove yassl as TLS library for NTLM + + yassl was added in commit 9d904ee41b880b but is no longer available + and is thus not a library to use for NTLM. This aligns the FEATURES + doc with the FAQ. + + Closes: #8886 + Reviewed-by: Daniel Stenberg + +- FEATURES: reorder footnotes + + The empty left-behind footnote confused the website rendering into + creating a nested emoty list, making the resulting page look quite + odd. Remove and re-order the remaining ones to avoid a gap in the + sequence. + + Closes: #8886 + Reviewed-by: Daniel Stenberg + +- FAQ: remove opinionated sentence on NTLM + + curl is a tool that support many different things, and it doesn't + really seem like our job to tell other what to use (as they might + not have much say in the matter even). Also tidy up wording. + + Closes: #8886 + Reviewed-by: Daniel Stenberg + +Viktor Szakats (20 May 2022) +- log2changes: do not indent empty lines [ci skip] + + This will omit two spaces of indentation from lines with no content, + thus avoiding 'spaces @ EOL'. + + Reviewed-by: Daniel Stenberg + Closes #8887 + +Daniel Stenberg (19 May 2022) +- wolfssl: correct the failf() message when a handle can't be made + + Closes #8885 + +Viktor Szakats (19 May 2022) +- Makefile.m32: delete two obsolete OpenSSL options [ci skip] + + - -DOPENSSL_NO_KRB5: No longer used by OpenSSL 1.1.x, 3.x, or + LibreSSL 3.5.x, yet it collides with the latter, which defines + it unconditionally, resulting in this warning: + ../../libressl/include/openssl/opensslfeatures.h:14:9: warning: 'OPENSSL_NO_KRB5' macro redefined [-Wmacro-redefined] + It was originally added to curl in 2004. + + - -DHAVE_OPENSSL_PKCS12_H: No longer used by OpenSSL 1.1.x, 3.x, or + LibreSSL back to at least 2.5.5. Originally added in the same + commit as the above, in 2004. + + Closes #8884 + +Daniel Stenberg (19 May 2022) +- RELEASE-NOTES: synced + + bump to 7.84.0 + +- [Christian Weisgerber via curl-library brought this change] + + Makefile.am: fix portability issues + + Commit a04f0b961333e1a19848d073d8c7db9c20b2a371 made me notice that + there is a portability issue in curl's top-level Makefile.am. + + $< can only be used in rules that deal with .SUFFIXES. Its use + for general prerequisites is a GNU make extension. + + $< could be replaced by $?, but I think in an autotools context, + something like this is better: + + Bug: https://curl.se/mail/lib-2022-05/0024.html + Closes #8861 + +- [Balakrishnan Balasubramanian brought this change] + + socks: support unix sockets for socks proxy + + Usage: + curl -x "socks5h://localhost/run/tor/socks" "https://example.com" + + Updated runtests.pl to run a socksd server listening on unix socket + + Added tests test1467 test1468 + + Added documentation for proxy command line option and socks proxy + options + + Closes #8668 + +- [Vincent Torri brought this change] + + cmake: add libpsl support + + Fixes #8865 + Closes #8867 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: extend QUIC transport parameters buffer + + Extend QUIC transport parameters buffer because 64 bytes are too + short for the ever increasing parameters. + + Closes #8872 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: handle error from ngtcp2_conn_submit_crypto_data + + Closes #8871 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: send appropriate connection close error code + + Closes #8870 + +- test1561: adjusted for the cookie fix + +- test414: verify secure cookie domain overlay + +- [Harry Sintonen brought this change] + + cookie: address secure domain overlay + + Bug: https://hackerone.com/reports/1560324 + Co-authored-by: Daniel Stenberg + Closes #8840 + +- [Frank Gevaerts brought this change] + + strcase: some optimisations + + Lookup tables for toupper() and tolower() make Curl_strcasecompare() + about 1.5 times faster. Reorganising Curl_strcasecompare() to fully exit + early then also allows simplifying the check at the end, for another + 15%. In total, the changes make Curl_strcasecompare() around 1.6 to 1.7 + times faster. + + Note that these optimisation assume ASCII. The original + Curl_raw_toupper() and raw_tolower() look like they already made that + assumption. + + Closes #8875 + +- BUG-BOUNTY.md: mention the audit exception + + Dedicated - paid for - security audits that are performed in + collaboration with curl developers are not eligible for bounties. + + (plus I changed the sub-titles to use ## instead of # in the markdown) + + Closes #8880 + +- lib/vssh/wolfssh.h: removed + + Unused header file + + Reported-by: Illarion Taev + Fixes #8863 + Closes #8866 + +- [Elms brought this change] + + wolfSSL: explicitly use compatibility layer + + This change removes adding an include `$prefix/wolfssl` or similar to + allow for openssl include aliasing. Include paths of `wolfssl/openssl/` + are used to explicitly use wolfSSL includes. This fixes cmake builds as + well as avoiding potentially using openSSL headers since include path + order is not guaranteed. + + Closes #8864 + +- curl: deprecate --random-file and --egd-file + + As libcurl no longer has any functionality for them, the tool now does + nothing with them. + + Closes #8670 + +- opts: deprecate RANDOM_FILE and EGDSOCKET + + These two options were only ever used for the OpenSSL backend for + versions before 1.1.0. They were never used for other backends and they + are not used with recent OpenSSL versions. They were never used much by + applications. + + The defines RANDOM_FILE and EGD_SOCKET can still be set at build-time + for ancient EOL OpenSSL versions. + + Closes #8670 + +- [Harry Sintonen brought this change] + + bindlocal: don't use a random port if port number would wrap + + Earlier if CURLOPT_LOCALPORT + CURLOPT_LOCALPORTRANGE would go past port + 65535 the code would fall back to random port rather than giving up. + + Closes #8862 + +Daniel Gustafsson (16 May 2022) +- transfer: Fix potential NULL pointer dereference + + Commit 0ef54abf5208 accidentally used the conn variable before the + assertion for it being NULL. Fix by moving the assignment which use + conn to after the assertion. + + Closes: #8857 + Reviewed-by: Daniel Stenberg + +- docs: clarify data replacement policy for MIME API + + The API documentation for the MIME functions specify that the parts + can be set twice, with the last call winning. While true, the user + can set the parts n times for n > 2, reword to specify multiple API + calls instead. + + Closes: #8860 + Reviewed-by: Daniel Stenberg + +Daniel Stenberg (16 May 2022) +- [vvb2060 on github brought this change] + + ngtcp2: support boringssl crypto backend + + Closes #8789 + +- [Tatsuhiro Tsujikawa brought this change] + + quic: add Curl_quic_idle + + Add Curl_quic_idle which is called when no HTTP level read or write is + performed. It is a good place to handle timer expiry for QUIC transport + (.e.g, retransmission). + + Closes #8698 + +- [Gregor Jasny brought this change] + + mprintf: ignore clang non-literal format string + + Closes #8740 + +- [Nick Zitzmann brought this change] + + sectransp: check for a function defined when __BLOCKS__ is undefined + + SecTrustEvaluateAsync() is defined in the macOS 10.7 SDK, but it + requires Grand Central Dispatch to be supported by the compiler, and + some third-party macOS compilers do not support Grand Central Dispatch. + SecTrustCopyPublicKey() is not present in macOS 10.6, so this shouldn't + adversely affect anything. + + Fixes #8846 + Reported-by: Egor Pugin + Closes #8854 + +Daniel Gustafsson (16 May 2022) +- test412/413: Use version macro for User-Agent + + Commit 46d45ea3a incorrectly hardcoded the User-Agent in the test + output file which breaks when curlver is updated. Shift to using + the %VERSION macro instead. + + Closes: #8856 + +- macos9: remove partial support + + The support for compiling on Mac OS 9 hasn't been modified since 2001 + and has no active maintainer or packager, so it's time to remove it as + it's incredibly unlikely to work. If a maintainer re-emerges it can be + resurrected from Git history. + + Closes: #8836 + Reviewed-by: Daniel Stenberg + +Daniel Stenberg (16 May 2022) +- test1635: verify --fail-with-body with --retry + + Almost a dupe of 1634 + + Closes #8847 + +- tool_operate: make sure --fail-with-body works with --retry + + ... in the same way --fail already does. + + Reported-by: Jakub Bochenski + Fixes #8845 + Closes #8847 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: Correct use of ngtcp2 and nghttp3 signed integer types + + Closes #8851 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: Fix alert_read_func return value + + Closes #8852 + +- [Harry Sintonen brought this change] + + Curl_parsenetrc: don't access local pwbuf outside of scope + + Accessing local variables outside of the scope is forbidden and + depending on the compiler can result in the value being + overwritten. Fixed by moving the pwbuf to be in scope. + + Closes #8850 + +- RELEASE-NOTES: synced + + and bump curlver to 7.83.2 for now (but likely to become 7.84.0 soon) + +- [Frazer Smith brought this change] + + ci: update github actions + + - bump actions/checkout from 2 to 3 + - bump actions/upload-artifact from 1 to 3 + - bump github/codeql-actions from 1 to 2 + - use version tag for actions/checkout + + Closes #8843 + +- test1919: verify CURLOPT_XOAUTH2_BEARER leak fix + +- url: free old conn better on reuse + + Make use of conn_free() better and avoid duplicate code. + + Reported-by: Andrea Pappacoda + Fixes #8841 + Closes #8842 + +Jay Satiro (14 May 2022) +- FAQ: Clarify Windows double quote usage + + - Windows command prompt doesn't use literal quoting via single quotes. + + - Windows command prompt inner double quotes are escaped with a + backslash. + + - Windows powershell does use single quotes but curl is not a powershell + script so the arguments may not be passed on correctly. + + - Windows powershell inner double quotes seems can be passed to curl if + the outer quotes are double quotes and an escape of backslash-backtick + is used. + + Command prompt example: + + ~~~ + getargs -v -d "\"a\"" + + argv[0]: getargs + argv[1]: -v + argv[2]: -d + argv[3]: "a" + ~~~ + + Ref: https://github.com/curl/curl/issues/8818 + Ref: https://gist.github.com/jay/19aba48653bd591cf4b90eb9249a302c + + Reported-by: KotlinIsland@users.noreply.github.com + + Closes https://github.com/curl/curl/pull/8823 + +Daniel Stenberg (12 May 2022) +- github/workflows/nss: apt update first + + Fix "libnss3-dev_3.49.1-1ubuntu1.6_amd64.deb 404 Not Found" + + Closes #8837 + +- page-footer: mention exit code zero too + + Success (zero) is also an "exit code" worth mentioning. + + Closes #8833 + +Daniel Gustafsson (12 May 2022) +- gssapi: initialize gss_buffer_desc strings + + Explicitly initialize gss_buffer_desc strings such that a call to + freeing resources will succeed even if no data has been allocated + to it. + + Reported-by: Jay Satiro + +- gssapi: improve handling of errors from gss_display_status + + In case gss_display_status() returns an error, avoid trying to add + it to the buffer as the message may well be a NULL pointer. + + Originally this fix comes from a discussion in issue #8816. + + Closes: #8832 + Reviewed-by: Jay Satiro + +Jay Satiro (12 May 2022) +- [steini2000 brought this change] + + http2: always debug print stream id in decimal with %u + + Prior to this change the stream id shown could be hex or decimal which + was inconsistent and confusing. + + Closes https://github.com/curl/curl/pull/8808 + +Kamil Dudka (11 May 2022) +- url: remove redundant #ifdefs in allocate_conn() + + No change in behavior intended by this commit. + +Daniel Stenberg (11 May 2022) +- [Fabian Keil brought this change] + + tests 266, 116 and 1540: add a small write delay + + This makes it more likely that the trailer is received + seperately from the last-chunk. + + curl doesn't seem to care about this but it makes the tests + more useful when testing external proxies like Privoxy. + +- [Fabian Keil brought this change] + + tests 1117,1238,1523: adjust writedelay servercmds + + ... so the delays are the same now that the unit + is in milliseconds. + +- [Fabian Keil brought this change] + + tests/server/sws.c: change the HTTP writedelay unit to milliseconds + + This allows to use write delays for large responses without + resulting in the test taking an unreasonable amount of time. + + In many cases delaying writes by a whole second or more isn't + necessary for the desired effect. + + Closes #8827 + +Daniel Gustafsson (11 May 2022) +- aws-sigv4: fix potentional NULL pointer arithmetic + + We need to check if the strchr() call returns NULL (due to missing + char) before we use the returned value in arithmetic. There is no + live bug here, but fixing it before it can become for hygiene. + + Closes: #8814 + Reviewed-by: Daniel Stenberg + +Daniel Stenberg (11 May 2022) +- quiche: support ca-fallback + + Follow-up to b01f3e679f4c1ea3 which added this for ngtcp2/openssl + + Removed from KNOWN_BUGS + + Fixes #8696 + Closes #8830 + +Daniel Gustafsson (11 May 2022) +- x509asn1: mark msnprintf return as unchecked + + We have lots of unchecked msnprintf calls, and this particular msnprintf + call isn't more interesting than the others, but this one yields a Coverity + warning so let's implicitly silence it. Going over the other invocations + is probably a worthwhile project, but for now let's keep the static + analyzers happy. + + Closes: #8831 + Reviewed-by: Daniel Stenberg + +Version 7.83.1 (11 May 2022) + +Daniel Stenberg (11 May 2022) +- RELEASE-NOTES: synced + + curl 7.83.1 release + +- THANKS: added contributors from 7.83.1 + +- zuul: fix the ngtcp2-gnutls build + + Add packages and tweak the configure options. + + Use the GnuTLS 3.7.4 branch (not main). + + Closes #8829 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: add ca-fallback support for OpenSSL backend + + Closes #8828 + +- url: check SSH config match on connection reuse + + CVE-2022-27782 + + Reported-by: Harry Sintonen + Bug: https://curl.se/docs/CVE-2022-27782.html + Closes #8825 + +- tls: check more TLS details for connection reuse + + CVE-2022-27782 + + Reported-by: Harry Sintonen + Bug: https://curl.se/docs/CVE-2022-27782.html + Closes #8825 + +- cookies: make bad_domain() not consider a trailing dot fine + + The check for a dot in the domain must not consider a single trailing + dot to be fine, as then TLD + trailing dot is fine and curl will accept + setting cookies for it. + + CVE-2022-27779 + + Reported-by: Axel Chong + Bug: https://curl.se/docs/CVE-2022-27779.html + Closes #8820 + +- test977: reproduce ability to set cookie on TLD + + When PSL is not enabled + +- scripts/contributors.sh: correct the copyright range + +- docs/RELEASE-PROCEDURE.md: refreshed and adjsuted the release dates + +- test379: verify --remove-on-error with --no-clobber + +- post_per_transfer: remove the updated file name + + When --remove-on-error is used with --no-clobber, it might have an + updated file name to remove. + + Bug: https://curl.se/docs/CVE-2022-27778.html + + CVE-2022-27778 + + Reported-by: Harry Sintonen + + Closes #8824 + +- hsts: ignore trailing dots when comparing hosts names + + CVE-2022-30115 + + Reported-by: Axel Chong + Bug: https://curl.se/docs/CVE-2022-30115.html + Closes #8821 + +- test440/441: verify HSTS with trailing dots + +- libtest/lib1560: verify the host name percent decode fix + +- urlapi: reject percent-decoding host name into separator bytes + + CVE-2022-27780 + + Reported-by: Axel Chong + Bug: https://curl.se/docs/CVE-2022-27780.html + Closes #8826 + +- nss: return error if seemingly stuck in a cert loop + + CVE-2022-27781 + + Reported-by: Florian Kohnhäuser + Bug: https://curl.se/docs/CVE-2022-27781.html + Closes #8822 + +- test412/413: verify alt-svc with trailing dots + +- altsvc: fix host name matching for trailing dots + + Closes #8819 + +- [Garrett Squire brought this change] + + hyper: fix test 357 + + This change fixes the hyper API such that PUT requests that receive a + 417 response can retry without the Expect header. + + Closes #8811 + +- [Harry Sintonen brought this change] + + sectransp: bail out if SSLSetPeerDomainName fails + + Before the code would just warn about SSLSetPeerDomainName() errors. + + Closes #8798 + +- http_proxy/hyper: handle closed connections + + Enable test 1021 for hyper builds. + + Patched-by: Prithvi MK + Fixes #8700 + Closes #8806 + +- KNOWN_BUGS: timeout when reusing a http3 connection + + Closes #8764 + +- KNOWN_BUGS: configure --with-ca-fallback is not supported by h3 + + Closes #8696 + +- [Ryan Schmidt brought this change] + + Makefile: fix "make ca-firefox" + + Closes #8804 + +Daniel Gustafsson (5 May 2022) +- tests: fix markdown formatting in README + + The asterisk in the abbreviation *NIX (for UNIX/Linux) needs to be + escaped to not mean start of italic formatting. This is consistent + with docs/RELEASE-PROCEDURE.md. + + Closes: #8802 + Reviewed-by: Daniel Stenberg + +Daniel Stenberg (5 May 2022) +- TODO: expand on "Expose tried IP addresses that failed" + + Ref: #8794 + +Daniel Gustafsson (5 May 2022) +- [Fabian Keil brought this change] + + tests/server: declare variable 'reqlogfile' static + + Silences the warning: + + CC socksd-socksd.o + socksd.c:143:13: warning: no previous extern declaration for + non-static variable 'reqlogfile' [-Wmissing-variable-declarations] + const char *reqlogfile = DEFAULT_REQFILE; + ^ + socksd.c:143:7: note: declare 'static' if the variable is not + intended to be used outside of this translation unit + const char *reqlogfile = DEFAULT_REQFILE; + ^ + 1 warning generated. + + ... when compiling with clang 13. + + Closes: #8799 + Reviewed-by: Daniel Gustafsson + +- HTTP-COOKIES: add missing CURLOPT_COOKIESESSION + + Commit 980a47b42 added support for ignoring session cookies, but it + was never added to the documentation. + + Closes: #8795 + Reviewed-by: Daniel Stenberg + +Daniel Stenberg (5 May 2022) +- docs/THANKS: remove name duplicate + +- [Philip H brought this change] + + .mailmap: update + + Closes #8800 + +Jay Satiro (5 May 2022) +- mbedtls: fix some error messages + + Prior to this change some of the error messages misidentified the + function that failed. + +Daniel Stenberg (5 May 2022) +- RELEASE-NOTES: synced + +- [Sergey Markelov brought this change] + + x509asn1: make do_pubkey handle EC public keys + + Closes #8757 + +- [Harry Sintonen brought this change] + + mbedtls: bail out if rng init fails + + There was a failf() call but no actual error return. + + Closes #8796 + +- [Sergey Markelov brought this change] + + urlapi: address (harmless) UndefinedBehavior sanitizer warning + + `while(i--)` causes runtime error: unsigned integer overflow: 0 - 1 + cannot be represented in type 'size_t' (aka 'unsigned long') + + Closes #8797 + +- [Fabian Keil brought this change] + + test{898,974,976}: add 'HTTP proxy' keywords + + ... so the tests can be automatically skipped when + testing external HTTP proxies like Privoxy. + + Closes #8791 + +- [Harry Sintonen brought this change] + + gskit_connect_step1: fixed bogus setsockopt calls + + setsockopt takes a reference to value, not value. With the current + code this just leads to -1 return value with errno EFAULT. + + Closes #8793 + +- CURLOPT_SSH_AUTH_TYPES.3: fix the default + + The default is all possible methods. + + Closes #8792 + +- CURLOPT_DOH_URL.3: mention the known bug + + It is mostly duplicating info from KNOWN_BUGS but make it easier to find + for users of this option. + + Closes #8790 + +- CURLOPT_HSTS*FUNCTION.3: document the involved structs as well + + Reviewed-By: Daniel Gustafsson + Closes #8788 + +- docs/SECURITY-PROCESS.md: "Visible command line arguments" + +- SECURITY-PROCESS: mention "URL inconsistencies" + + ... as common problems that are *not* vulns. + +Daniel Gustafsson (2 May 2022) +- contributors: strip off final comma + + The final row of contributors should not end with a comma as it's the + end of the list. + + Closes: #8785 + Reviewed-by: Daniel Stenberg + +Daniel Stenberg (2 May 2022) +- [Philip H brought this change] + + misc: use "autoreconf -fi" instead buildconf + + Signed-off-by: Philip H <47042125+pheiduck@users.noreply.github.com> + Closes #8777 + +Daniel Gustafsson (2 May 2022) +- [Philip H brought this change] + + cirrus: Use pip for Python packages on FreeBSD + + Using pip instead of easy_install is more in line with how other + CI images are being maintained. + + Closes: #8783 + Reviewed-by: Daniel Gustafsson + +- [Philip H brought this change] + + cirrus: Update to FreeBSD 12.3 + + Closes: #8783 + Reviewed-by: Daniel Gustafsson + +- tool_getparam: simplify conditional statement + + param_place cannot be NULL here since we immediately efter this block + perform arithmetic on it (and use it in order to get here) so there is + little reason to check. + + Closes: #8786 + Reviewed-by: Daniel Stenberg + +- RELEASE-NOTES: synced + +- gskit: remove unused function set_callback + + This function has been unused since the initial commit of the GSKit + backend in 0eba02fd4. The motivation for the code was getting the + whole certificate chain: the only place where the latter is available + is as a callback parameter. Unfortunately it is not possible to pass + a user pointer to this callback, which precludes the possibility to + associate the cert chain with a data/conn structure. + + For further information, search for pgsk_cert_validation_callback on: + https://www.ibm.com/docs/api/v1/content/ssw_ibm_i_71/apis/gsk_attribute_set_callback.htm + + As the upstream library never added a parameter like that to the API, + we give up the wait and remove the dead code. + + Closes: #8782 + Reviewed-by: Patrick Monnerat + +- curl: free resource in error path + + If the new filename cannot be generated due to memory pressure, free + the allocated aname on the way out to avoid a small leak. + + Closes: #8770 + Reviewed-by: Daniel Stenberg + +- curl: guard against size_t wraparound in no-clobber code + + When generating the new filename, make sure we aren't overflowing the + size_t limit when calculating the new length. This is mostly academic + but good code hygeine nonetheless. + + Closes: #8771 + Reviewed-by: Daniel Stenberg + +Daniel Stenberg (30 Apr 2022) +- gha: build msh3 + + Closes #8779 + +- scripts/cijobs.pl: try "current branch" first then "master" + +- [Yusuke Nakamura brought this change] + + msh3: get msh3 version from MsH3Version + + Closes #8762 + +- [Yusuke Nakamura brought this change] + + msh3: psss remote_port to MsH3ConnectionOpen + + MsH3 supported additional "Port" parameter to connect not hosted on + 443 port QUIC website. + + * https://github.com/nibanks/msh3/releases/tag/v0.3.0 + * https://github.com/nibanks/msh3/pull/37 + + Closes #8762 + +- [Christian Weisgerber brought this change] + + openssl: define HAVE_SSL_CTX_SET_EC_CURVES for libressl + + SSL_CTX_set1_curves_list() has been available since LibreSSL 2.5.3, + released five years ago. + + Bug: https://curl.se/mail/lib-2022-04/0059.html + Closes #8773 + +- http: move Curl_allow_auth_to_host() + + It was mistakenly put within the CURL_DISABLE_HTTP_AUTH #ifdef + + Reported-by: Michael Olbrich + Fixes #8772 + Closes #8775 + +Daniel Gustafsson (29 Apr 2022) +- msh3: print boolean value as text representation + + Print the boolean value as its string representation instead of with + %hhu which isn't a format we typically use. + + Closes: #8763 + Reviewed-by: Nick Banks + +Daniel Stenberg (29 Apr 2022) +- data/test376: set a proper name + +- GHA/mbedtls: enabled nghttp2 in the build + + Closes #8767 + +- mbedtls: fix compile when h2-enabled + + Fixes #8766 + Reported-by: LigH-de on github + Closes #8768 + +- RELEASE-NOTES: synced + + bumped curlver to 7.83.1-dev + +- SECURITY-PROCESS: extended + + Also clarify BUG-BOUNTY.md with IBB details. + + Closes #8754 + +- [Adam Rosenfield brought this change] + + conn: fix typo 'connnection' -> 'connection' in two function names + + Closes #8759 + +Version 7.83.0 (27 Apr 2022) + +Daniel Stenberg (27 Apr 2022) +- RELEASE-NOTES: synced + + The 7.83.0 release + +- docs/THANKS: contributors from 7.83.0 + +- test 898/974/976: require proxy to run + + Fixes #8755 + Reported-by: Marc Hörsken + Closes #8756 + +- gnutls: don't leak the SRP credentials in redirects + + Follow-up to 620ea21410030 and 139a54ed0a172a + + Reported-by: Harry Sintonen + Closes #8752 + +- CURLOPT*TLSAUTH: they only work with OpenSSL or GnuTLS + + Closes #8753 + +- openssl: don't leak the SRP credentials in redirects either + + Follow-up to 620ea21410030 + + Reported-by: Harry Sintonen + Closes #8751 + +- [Liam Warfield brought this change] + + hyper: fix tests 580 and 581 for hyper + + Hyper now has the ability to preserve header order. This commit adds a + few lines setting the connection options for this feature. + + Related to issue #8617 + Closes #8707 + +- conncache: remove name arg from Curl_conncache_find_bundle + + To simplify, and also since the returned name is not the full actual + name used for the check. The port number and zone id is also involved, + so just showing the name is misleading. + + Closes #8750 + +- tests: verify the fix for CVE-2022-27774 + + - Test 973 redirects from HTTP to FTP, clear auth + - Test 974 redirects from HTTP to HTTP different port, clear auth + - Test 975 redirects from HTTP to FTP, permitted to keep auth + - Test 976 redirects from HTTP to HTTP different port, permitted to keep + auth + +- transfer: redirects to other protocols or ports clear auth + + ... unless explicitly permitted. + + Bug: https://curl.se/docs/CVE-2022-27774.html + Reported-by: Harry Sintonen + Closes #8748 + +- connect: store "conn_remote_port" in the info struct + + To make it available after the connection ended. + +- cookie.d: clarify when cookies are always sent + +- test898: verify the fix for CVE-2022-27776 + + Do not pass on Authorization headers on redirects to another port + +- http: avoid auth/cookie on redirects same host diff port + + CVE-2022-27776 + + Reported-by: Harry Sintonen + Bug: https://curl.se/docs/CVE-2022-27776.html + Closes #8749 + +- libssh2: make the md5 comparison fail if wrong length + + Making it just skip the check unless exactly 32 is too brittle. Even if + the docs says it needs to be exactly 32, it is be safer to make the + comparison fail here instead. + + Reported-by: Harry Sintonen + Bug: https://hackerone.com/reports/1549461 + Closes #8745 + +- conncache: include the zone id in the "bundle" hashkey + + Make connections to two separate IPv6 zone ids create separate + connections. + + Reported-by: Harry Sintonen + Bug: https://curl.se/docs/CVE-2022-27775.html + Closes #8747 + +- [Patrick Monnerat brought this change] + + url: check sasl additional parameters for connection reuse. + + Also move static function safecmp() as non-static Curl_safecmp() since + its purpose is needed at several places. + + Bug: https://curl.se/docs/CVE-2022-22576.html + + CVE-2022-22576 + + Closes #8746 + +- libssh2: compare sha256 strings case sensitively + + Reported-by: Harry Sintonen + Bug: https://hackerone.com/reports/1549435 + Closes #8744 + +- tool_getparam: error out on missing -K file + + Add test 411 to verify. + + Reported-by: Median Median Stride + Bug: https://hackerone.com/reports/1542881 + Closes #8731 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: deal with sub-millisecond timeout + + Closes #8738 + +- misc: update copyright year ranges + +- c_escape: escape '?' in generated --libcurl code + + In order to avoid the risk of it being used in an accidental trigraph in + the generated code. + + Reported-by: Harry Sintonen + Bug: https://hackerone.com/reports/1548535 + Closes #8742 + +- [Philip H brought this change] + + mlc: curl.zuul.vexxhost.dev is reachable again + + remove it from ignorelist for linkcheck + + Closes #8736 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: avoid busy loop in low CWND situation + + Closes #8739 + +- TODO: telnet - exit immediately upon connection if stdin is /dev/null + + Suggested-by: Robin A. Meade + URL: https://curl.se/mail/archive-2022-04/0027.html + +- [Kushal Das brought this change] + + docs: updates spellings with full words + + Closes #8730 + +- tests/FILEFORMAT.md: spellfix + +Daniel Gustafsson (21 Apr 2022) +- misc: fix typos + + Fix a few random typos is comments and workflow names. + +- macos: fix .plist installation into framework + + The copy command introduced in e498a9b1f had leftover '>' from the + previous sed command it replaced, which broke its syntax. Fix by + removing. + + Reported-by: Emanuele Torre + +Daniel Stenberg (21 Apr 2022) +- [Christopher Degawa brought this change] + + Makefile: fix ca-bundle due to mk-ca-bundle.pl being moved + + The script was moved in 8e22fc68e7dda43e9f but the lines that called it + was not changed to reflect it's new position + + Signed-off-by: Christopher Degawa + + Closes #8728 + +Daniel Gustafsson (20 Apr 2022) +- macos: set .plist version in autoconf + + Set the libcurl version in libcurl.plist like how libcurl.vers is + created. + + Closes: #8692 + Reviewed-by: Daniel Stenberg + Reviewed-by: Nick Zitzmann + +- cookies: Improve errorhandling for reading cookiefile + + The existing programming had some issues with errorhandling for reading + the cookie file. If the file failed to open, we would silently ignore it + and continue as if there was no file (or stdin) passed. In this case, we + would also call fclose() on the NULL FILE pointer, which is undefined + behavior. Fix by ensuring that the FILE pointer is set before calling + fclose on it, and issue a warning in case the file cannot be opened. + Erroring out on nonexisting file would break backwards compatibility of + very old behavior so we can't really go there. + + Closes: #8699 + Reviewed-by: Daniel Stenberg + Reviewed-by: Jay Satiro + +Daniel Stenberg (20 Apr 2022) +- libcurl-tutorial.3: spellfix and minor polish + +- CURLINFO_PRIMARY_PORT.3: spellfix + + Reported-by: Patrick Monnerat + +- [Jay Dommaschk brought this change] + + libssh: fix double close + + libssh closes the socket in ssh_diconnect() so make sure that libcurl + does not also close it. + + Fixes #8708 + Closes #8718 + +Jay Satiro (20 Apr 2022) +- [Gisle Vanem brought this change] + + unit1620: call global_init before calling Curl_open + + Curl_open calls the resolver init and on Windows if the resolver backend + is c-ares then the Windows sockets library (winsock) must already have + been initialized (via global init). + + Ref: https://github.com/curl/curl/pull/8540#issuecomment-1059771800 + + Closes https://github.com/curl/curl/pull/8719 + +Daniel Stenberg (19 Apr 2022) +- CURLINFO_PRIMARY_PORT.3: clarify which port this is + + As it was not entirely clear previously. + + Closes #8725 + +- CURLOPT_UNRESTRICTED_AUTH.3: extended explanation + + Include details about Authentication headers. + + Reported-by: Brad Spencer + Fixes #8724 + Closes #8726 + +- .github/workflows/macos.yml: add a libssh job with c-ares + + ... to enable the memdebug system + + Closes #8720 + +- RELEASE-NOTES: synced + +Jay Satiro (17 Apr 2022) +- [Gisle Vanem brought this change] + + docs/HTTP3.md: fix typo + + also fix msh3 section formatting + + Ref: https://github.com/curl/curl/commit/37492ebb#r70980087 + +Marc Hoersken (17 Apr 2022) +- timediff.[ch]: add curlx helper functions for timeval conversions + + Also move timediff_t definitions from timeval.h to timediff.h and + then make timeval.h include the new standalone-capable timediff.h. + + Reviewed-by: Jay Satiro + Reviewed-by: Daniel Stenberg + + Supersedes #5888 + Closes #8595 + +Daniel Stenberg (17 Apr 2022) +- [Balakrishnan Balasubramanian brought this change] + + tests: refactor server/socksd.c to support --unix-socket + + Closes #8687 + +- [Emanuele Torre brought this change] + + tool_paramhlp: use feof(3) to identify EOF correctly when using fread(3) + + This loop was using the number of bytes read from the file as condition + to keep reading. + + From Linux's fread(3) man page: + > On success, fread() and fwrite() return the number of items read or + > written. This number equals the number of bytes transferred only when + > size is 1. If an error occurs, or the end of the file is reached, the + > return value is a short item count (or zero). + > + > The file position indicator for the stream is advanced by the number + > of bytes successfully read or written. + > + > fread() does not distinguish between end-of-file and error, and + > callers must use feof(3) and ferror(3) to determine which occurred. + + This means that nread!=0 doesn't make much sense as an end condition for + the loop: nread==0 doesn't necessarily mean that EOF has been reached or + an error has occured (but that is usually the case) and nread!=0 doesn't + necessarily mean that EOF has not been reached or that no read errors + have occured. feof(3) and ferror(3) should be uses when using fread(3). + + Currently curl has to performs an extra fread(3) call to get a return + value equal to 0 to stop looping. + + This usually "works" (even though nread==0 shouldn't be interpreted as + EOF) if stdin is a pipe because EOF usually marks the "real" end of the + stream, so the extra fread(3) call will return immediately and the extra + read syscall won't be noticeable: + + bash-5.1$ strace -e read curl -s -F file=@- 0x0.st <<< a 2>&1 | + > tail -n 5 + read(0, "a\n", 4096) = 2 + read(0, "", 4096) = 0 + read(0, "", 4096) = 0 + http://0x0.st/oRs.txt + +++ exited with 0 +++ + bash-5.1$ + + But this doesn't work if curl is reading from stdin, stdin is a + terminal, and the EOF is being emulated using a shell with ^D. Two + consecutive ^D will be required in this case to actually make curl stop + reading: + + bash-5.1$ curl -F file=@- 0x0.st + a + ^D^D + http://0x0.st/oRs.txt + bash-5.1$ + + A possible workaround to this issue is to use a program that handles EOF + correctly to indirectly send data to curl's stdin: + + bash-5.1$ cat - | curl -F file=@- 0x0.st + a + ^D + http://0x0.st/oRs.txt + bash-5.1$ + + This patch makes curl handle EOF properly when using fread(3) in + file2memory() so that the workaround is not necessary. + + Since curl was previously ignoring read errors caused by this fread(3), + ferror(3) is also used in the condition of the loop: read errors and EOF + will have the same meaning; this is done to somewhat preserve the old + behaviour instead of making the command fail when a read error occurs. + + Closes #8701 + +- gen.pl: change wording for mutexed options + + Instead of saying "This option overrides NNN", now say "This option is + mutually exclusive to NNN" in the generated man page ouput, as the + option does not in all cases actually override the others but they are + always mutually exclusive. + + Ref: #8704 + Closes #8716 + +- curl: error out if -T and -d are used for the same URL + + As one implies PUT and the other POST, both cannot be used + simultaneously. + + Add test 378 to verify. + + Reported-by: Boris Verkhovskiy + Fixes #8704 + Closes #8715 + +- lib: remove exclamation marks + + ... from infof() and failf() calls. Make them less attention seeking. + + Closes #8713 + +- fail.d: tweak the description + + Reviewed-by: Daniel Gustafsson + Suggested-by: Robert Charles Muir + Ref: https://twitter.com/rcmuir/status/1514915401574010887 + + Closes #8714 + +Daniel Gustafsson (15 Apr 2022) +- docs: Fix missing semicolon in example code + + Multiple share examples were missing a semicolon on the line defining + the CURLSHcode variable. + + Closes: #8697 + Reported-by: Michael Kaufmann + Reviewed-by: Daniel Stenberg + +- infof: consistent capitalization of warning messages + + Ensure that all infof calls with a warning message are capitalized + in the same way. At some point we should probably set up a style- + guide for infof but until then let's aim for a little consistenncy + where we can. + + Closes: #8711 + Reviewed-by: Daniel Stenberg + +- RELEASE-NOTES: synced + +- [Matteo Baccan brought this change] + + perl: removed a double semicolon at end of line + + Remove double semicolons at end of line in Perl code. + + Closes: #8709 + Reviewed-by: Daniel Gustafsson + +- curl_easy_header: fix typos in documentation + + Closes: #8694 + Reviewed-by: Daniel Stenberg + +Marcel Raad (11 Apr 2022) +- appveyor: add Cygwin build + + Closes https://github.com/curl/curl/pull/8693 + +- appveyor: only add MSYS2 to PATH where required + + Closes https://github.com/curl/curl/pull/8693 + +Daniel Stenberg (10 Apr 2022) +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: fix memory leak + + Closes #8691 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: remove remote_addr which is not used in a meaningful way + + Closes #8689 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: enlarge H3_SEND_SIZE + + Make h3_SEND_SIZE larger because current value (20KiB) is too small + for the high latency environment. + + Closes #8690 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: fix HTTP/3 upload stall and avoid busy loop + + This commit fixes HTTP/3 upload stall if upload data is larger than + H3_SEND_SIZE. Only check writability of socket if a stream is + writable to avoid busy loop when QUIC flow control window is filled + up, or upload buffer is full. + + Closes #8688 + +- [Nick Banks brought this change] + + msh3: add support for QUIC and HTTP/3 using msh3 + + Considered experimental, as the other HTTP/3 backends. + + Closes #8517 + +- TODO: "SFTP with SCP://" + +- GHA: move bearssl jobs over from zuul + + Closes #8684 + +- data/DISABLED: disable test 313 on bearssl builds + + Closes #8684 + +- runtests: add 'bearssl' as testable feature + + Closes #8684 + +- GHA: add openssl3 jobs moved over from zuul + + Closes #8683 + +- schannel: remove dead code that will never run + + As the condition can't ever evaluate true + + Reported-by: Andrey Alifanov + Ref: #8675 + Closes #8677 + +- connecache: remove duplicate connc->closure_handle check + + The superfluous extra check could cause analyzer false positives + and doesn't serve any purpose. + + Closes #8676 + +- [Michał Antoniak brought this change] + + mbedtls: remove server_fd from backend + + Closes #8682 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: use token when detecting :status header field + + Closes #8679 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: make curl 1ms faster + + Pass 0 for an already expired timer. + + Closes #8678 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: fix QUIC_IDLE_TIMEOUT + + QUIC_IDLE_TIMEOUT should be of type ngtcp2_duration which is + nanoseconds resolution. + + Closes #8678 + +- English: use American spelling consistently + + Authorization, Initialization, Organization etc. + + Closes #8673 + +Daniel Gustafsson (5 Apr 2022) +- [Sascha Zengler brought this change] + + BUGS: Fix incorrect punctuation + + Closes #8672 + Reviewed-by: Daniel Gustafsson + +Daniel Stenberg (4 Apr 2022) +- tool_listhelp.c: uppercase URL + +- RELEASE-NOTES: synced + +- http: streamclose "already downloaded" + + Instead of connclose()ing, since when HTTP/2 is used it doesn't need to + close the connection as stopping the current transfer is enough. + + Reported-by: Evangelos Foutras + Closes #8665 + +Jay Satiro (1 Apr 2022) +- ftp: fix error message for partial file upload + + - Show the count of bytes written on partial file upload. + + Prior to this change the error message mistakenly showed the count of + bytes read, not written. + + Bug: https://github.com/curl/curl/discussions/8637 + Reported-by: Taras Kushnir + + Closes https://github.com/curl/curl/pull/8649 + +Daniel Stenberg (1 Apr 2022) +- http: correct the header error message to say colon + + Not semicolon + + Reported-by: Gisle Vanem + Ref: #8666 + Closes #8667 + +- lib: #ifdef on USE_HTTP2 better + + ... as nghttp2 might not be the library that provides HTTP/2 support. + + Closes #8661 + +- [Michał Antoniak brought this change] + + mbedtls: remove 'protocols' array from backend when ALPN is not used + + Closes #8663 + +- http2: RST the stream if we stop it on our own will + + For the "simulated 304" case the done-call isn't considered "premature" + but since the server didn't close the stream it needs to be reset to + stop delivering data. + + Closes #8664 + +- http: close the stream (not connection) on time condition abort + + Closes #8664 + +- http2: handle DONE called for the paused stream + + As it could otherwise stall all streams on the connection + + Reported-by: Evangelos Foutras + Fixes #8626 + Closes #8664 + +- tls: make mbedtls and NSS check for h2, not nghttp2 + + This makes them able to also negotiate HTTP/2 even when built to use + hyper for h2. + + Closes #8656 + +- tests/libtest/lib670.c: fixup the copyright year range + + follow-up to b54e18640ea4b7 + +- [Leandro Coutinho brought this change] + + lib670: avoid double check result + + Closes #8660 + +- vtls: use a generic "ALPN, server accepted" message + + Closes #8657 + +- vtls: use a backend standard message for "ALPN: offers %s" + + I call it VTLS_INFOF_ALPN_OFFER_1STR, the '1str' meaning that the + infof() call also needs a string argument: the ALPN ID. + + Closes #8657 + +- [Christian Schmitz brought this change] + + strcase.h: add comment about the return code + + Tool often we run into expecting this to work like strcmp, but it + returns 1 instead of 0 for match. + + Closes #8658 + +- vtls: provide a unified APLN-disagree string for all backends + + Also rephrase to make it sound less dangerous: + + "ALPN: server did not agree on a protocol. Uses default." + + Reported-by: Nick Coghlan + Fixes #8643 + Closes #8651 + +- projects/README: converted to markdown + + Closes #8652 + +- misc: spelling fixes + + Mostly in comments but also in the -w documentation for headers_json. + + Closes #8647 + +- KNOW_BUGS: HTTP3/Transfer closed with n bytes remaining to read + + "HTTP/3 does not support client certs" considered fixed, at least with + the ngtcp2 backend. + + Closes #8523 + +- CURLOPT_PREQUOTE.3: only works for FTP file transfers, not dirs + + Also add to quote.d. Add to TODO as something to add in a future. + + Reported-by: anon00000000 on github + Closes #8602 + Closes #8648 + +- RELEASE-NOTES: synced + +- pop3/smtp: return *WEIRD_SERVER_REPLY when not understood + + This leaves the CURLE_RECV_ERROR error code for explicit failure to + receive network data and allows users to better separate the problems. + + Ref #8356 + Reported-by: Rianov Viacheslav + Closes #8506 + +- docs: lots of minor language polish + + Mostly based on recent language decisions from "everything curl": + + - remove contractions (isn't => is not) + - *an* HTTP (consistency) + - runtime (no hyphen) + - backend (no hyphen) + - URL is uppercase + + Closes #8646 + +Jay Satiro (29 Mar 2022) +- projects: Update VC version names for VS2017, VS2022 + + - Rename VC15 -> VC14.10, VC17 -> VC14.30. + + The projects directory that holds the pre-generated Visual Studio + project files uses VC to indicate the MSVC version. At some point + support for Visual Studio 2017 (Visual Studio version 15 which uses MSVC + 14.10) was added as VC15. Visual Studio 2022 (Visual Studio version 17 + which uses MSVC 14.30) project files were recently added and followed + that same format using VC17. + + There is no such MSVC version (yet) as VC15 or VC17. + + For VS 2017 for example, the name we use is correct as either VS17, + VS2017, VC14.10. I opted for the latter since we use VC for earlier + versions (eg VC10, VC12, etc). + + Ref: https://github.com/curl/curl/pull/8438#issuecomment-1037070192 + + Closes https://github.com/curl/curl/pull/8447 + +Daniel Stenberg (29 Mar 2022) +- mqtt: better handling of TCP disconnect mid-message + + Reported-by: Jenny Heino + Bug: https://hackerone.com/reports/1521610 + Closes #8644 + +- CURLOPT_DISALLOW_USERNAME_IN_URL.3: use uppercase URL + +- [Ian Blanes brought this change] + + docs/DYNBUF: clarify documentation for Curl_dyn_ptr and Curl_dyn_uptr + + Closes #8606 + +- [Ian Blanes brought this change] + + curl: fix segmentation fault for empty output file names. + + Function glob_match_url set *result to NULL when called with filename = + "", producing an indirect NULL pointer dereference. + + Closes #8606 + +- TODO: Read keys from ~/.ssh/id_ecdsa, id_ed25519 + + It would be nice to expand the list of key locations curl uses for the + newer key types supported by libssh2. + + Closes #8586 + +- ngtcp2: update to work after recent ngtcp2 updates + + Assisted-by: Tatsuhiro Tsujikawa + Reported-by: jurisuk on github + Fixes #8638 + Closes #8639 + +- [Farzin brought this change] + + CURLOPT_PROGRESSFUNCTION.3: fix typo in example + + Closes #8636 + +- curl/header_json: output the header names in lowercase + + To better allow json[“header”]. + + Reported-by: Peter Korsgaard + Bug: https://daniel.haxx.se/blog/2022/03/24/easier-header-picking-with-curl/comment-page-1/#comment-25878 + Closes #8633 + +- RELEASE-NOTES: synced + +- headers.h: make Curl_headers_push() be CURLE_OK when not built + + ... to avoid errors when the function isn't there. + + Reported-by: Marcel Raad + Fixes #8627 + Closes #8628 + +- scripts: move three scripts from lib/ to scripts/ + + Move checksrc.pl, firefox-db2pem.sh and mk-ca-bundle.pl since they don't + particularly belong in lib/ + + Also created an EXTRA_DIST= in scripts/Makefile.am instead of specifying + those files in the root Makefile.am + + Closes #8625 + +Marc Hoersken (23 Mar 2022) +- lib/warnless.[ch]: only check for WIN32 and ignore _WIN32 + + curl_setup.h automatically defines WIN32 if just _WIN32 is defined. + + Therefore make sure curl_setup.h is included through warnless.h. + + Reviewed-by: Daniel Stenberg + Reviewed-by: Jay Satiro + + Closes #8594 + +- tests/server/util.h: align WIN32 condition with util.c + + There is no need to test for both _WIN32 and WIN32 as curl_setup.h + automatically defines the later if the first one is defined. + + Also tests/server/util.c is only checking for WIN32 arouund the + implementation of win32_perror, so just defining _WIN32 + would not be sufficient for a successful compilation. + + Reviewed-by: Daniel Stenberg + Reviewed-by: Jay Satiro + + Closes #8594 + +Daniel Stenberg (22 Mar 2022) +- [Philip H brought this change] + + firefox-db2pem.sh: make the shell script safer + + Reported by lift + + Closes #8616 + +Jay Satiro (22 Mar 2022) +- gtls: fix build for disabled TLS-SRP + + Prior to this change if, at build time, the GnuTLS backend was found to + have TLS-SRP support (HAVE_GNUTLS_SRP) but TLS-SRP was disabled in curl + via --disable-tls-srp (!USE_TLS_SRP) then a build error would occur. + + Bug: https://curl.se/mail/lib-2022-03/0046.html + Reported-by: Robert Brose + + Closes https://github.com/curl/curl/pull/8604 + +- winbuild: Add a Visual Studio example to the README + + - Add an example that explains in detail how the user can add libcurl to + their Visual Studio project. + + Ref: https://github.com/curl/curl/issues/8591 + + Closes https://github.com/curl/curl/pull/8592 + +- docs/opts: Mention Schannel client cert type is P12 + + Schannel backend code behaves same as Secure Transport, it expects a P12 + certificate file or the name of a certificate already in the user's OS + key store. Also, both backends ignore CURLOPT_SSLKEY (tool: --key) + because they expect the private key to already be available from the + keystore or P12 certificate. + + Ref: https://github.com/curl/curl/discussions/8581#discussioncomment-2337260 + + Closes https://github.com/curl/curl/pull/8587 + +Daniel Stenberg (22 Mar 2022) +- lib1945: fix compiler warning 4706 on MSVC + + Follow-up from d1e4a677340c + + Closes #8623 + +- [Philip H brought this change] + + ci/event-based.yml: improve impacket install + + skip python3-pip + install impacket with library module + + Closes #8621 + +- test1459: disable for oldlibssh + + This test with libssh 0.9.3 works fine on github but fails on circleci. + Might as well disable this test for oldlibssh installations. + + Closes #8622 + +- test1135: sync with recent API updates + + This test verifies that the order of functions in public headers remain + the same but hasn't been updated to care for recently added header + files. The order is important for some few platforms - or VERSIONINFO + needs to updated. + + This fix also updates VERSIONINFO to be sure. + + Closes #8620 + +- curl_easy_nextheader.3: fix two typos + + Reported-by: Timothe Litt + Bug: https://curl.se/mail/lib-2022-03/0060.html + +- options: remove mistaken space before paren in prototype + +- cirrus: add --enable-headers-api for some windows builds + +- GHA: --enable-headers-api in all workflows + +- lib: make the headers API depend on --enable-headers-api + +- configure: add --enable-headers-api to enable the headers API + + Defaults to disabled while labeled EXPERIMENTAL. + + Make all the headers API tests require 'headers-api' to run. + +- test1671: verify -w '%{header_json} + +- test1670: verify -w %header{} + +- curl: add %{header_json} support in -w handling + + Outputs all response headers as a JSON object. + +- curl: add %header{name} support in -w handling + + Outputs the response header 'name' + +- header api: add curl_easy_header and curl_easy_nextheader + + Add test 1940 to 1946 to verify. + + Closes #8593 + +- test1459: remove the different exit code for oldlibssh + + When using libssh/0.9.3/openssl/zlib, we seem to be getting the "right" + error code. + + Closes #8490 + +- libssh: unstick SFTP transfers when done event-based + + Test 604 and 606 (at least). + + Closes #8490 + +- gha: move the event-based test over from Zuul + + Switched libssh2 to libssh + + Closes #8490 + +- RELEASE-NOTES: synced + +- http: return error on colon-less HTTP headers + + It's a protocol violation and accepting them leads to no good. + + Add test case 398 to verify + + Closes #8610 + +- test718: edited slightly to return better HTTP + + Since hyper is picky and won't play ball otherwise. + + Bug: https://github.com/hyperium/hyper/issues/2783 + Reported-by: Daniel Valenzuela + Closes #8614 + +- hyper: no h2c support + + Make tests require h2c feature present to run, and only set h2c if + nghttp2 is used in the build. Hyper does not support it. + + Remove those tests from DISABLED + + Fixes #8605 + Closes #8613 + +- configure: bump the copyright year range int the generated output + +- [Andreas Falkenhahn brought this change] + + BINDINGS.md: add Hollywood binding + + Closes #8609 + +- HISTORY: add some 2022 data + +- scripts/copyright.pl: ignore the new mlc_config.json file + +- [Philip H brought this change] + + mlc_config.json: add file to ignore known troublesome URLs + + This is the config file for the CI markdown link checker and lets us + filter URLs that are known to cause problems. Like + https://curl.zuul.vexxhost.dev/ for now. + + Closes #8597 + +- [Philip H brought this change] + + winbuild/README.md: fixup dead link + + Closes #8597 + +Jay Satiro (18 Mar 2022) +- rtsp: don't let CSeq error override earlier errors + + - When done, if an error has already occurred then don't check the + sequence numbers for mismatch. + + A sequence number may not have been received if an error occurred. + + Prior to this change a sequence mismatch error would override earlier + errors. For example, a server that returns nothing would cause error + CURLE_GOT_NOTHING in Curl_http_done which was then overridden by + CURLE_RTSP_CSEQ_ERROR in rtsp_done. + + Closes https://github.com/curl/curl/pull/8525 + +- lib: fix some misuse of curlx_convert_wchar_to_UTF8 + + curlx_convert_wchar_to_UTF8 must be freed by curlx_unicodefree, but + prior to this change some uses mistakenly called free. + + I've reviewed all other uses of curlx_convert_wchar_to_UTF8 and + curlx_convert_UTF8_to_wchar. + + Ref: https://github.com/curl/curl/commit/1d5d0ae + + Closes https://github.com/curl/curl/pull/8521 + +- mk-ca-bundle.pl: Use stricter logic to process the certificates + + .. and bump version to 1.29. + + This change makes the script properly ignore unknown blocks and + otherwise fail when Mozilla changes the certdata format in ways we + don't expect. Though this is less flexible behavior it makes it far less + likely that an invalid certificate can slip through. + + Prior to this change the state machine did not always properly reset, + and it was possible that a certificate marked as invalid could then + later be marked as valid when there was conflicting trust info or + an unknown block was erroneously processed as part of the certificate. + + Ref: https://github.com/curl/curl/pull/7801#pullrequestreview-768384569 + + Closes https://github.com/curl/curl/pull/8411 + +Marcel Raad (17 Mar 2022) +- test375: fix line endings on Windows + + Closes https://github.com/curl/curl/pull/8599 + +Daniel Stenberg (17 Mar 2022) +- http: reject header contents with nul bytes + + They are not allowed by the protocol and allowing them risk that curl + misbehaves somewhere where C functions are used but won't work on the + full contents. Further, they are not supported by hyper and they cause + problems for the new coming headers API work. + + Updated test 262 to verify and enabled it for hyper as well + + Closes #8601 + +- [Philip H brought this change] + + CI: Do not use buildconf. Instead, just use: autoreconf -fi + + Closes #8596 + +- RELEASE-NOTES: synced + +Jay Satiro (14 Mar 2022) +- libssh: Improve fix for missing SSH_S_ stat macros + + - If building libcurl against an old libssh version missing SSH_S_IFMT + and SSH_S_IFLNK then use the values from a supported version. + + Prior to this change if libssh did not define SSH_S_IFMT and SSH_S_IFLNK + then S_IFMT and S_IFLNK, respectively, were used instead. The problem + with that is the user's S_ stat macros don't have the same values across + platforms. For example Windows has values different from Linux. + + Follow-up to 7b0fd39. + + Ref: https://github.com/curl/curl/pull/8511#discussion_r815292391 + Ref: https://github.com/curl/curl/pull/8574 + + Closes https://github.com/curl/curl/pull/8588 + +Marc Hoersken (13 Mar 2022) +- tool and tests: force flush of all buffers at end of program + + On Windows data can be lost in buffers in case of abnormal program + termination, especially in process chains as seen due to flaky tests. + Therefore flushing all buffers manually should avoid this data loss. + + In the curl tool we play the safe game by only flushing write buffers, + but in the testsuite where we manage all buffers, we flush everything. + + This should drastically reduce Windows CI and testsuite flakiness. + + Reviewed-by: Daniel Stenberg + + Supersedes #7833 and #6064 + Closes #8516 + +Daniel Stenberg (12 Mar 2022) +- [Jan Venekamp brought this change] + + BearSSL: add CURLOPT_SSL_CTX_FUNCTION support + + Closes #8478 + +- [Jan Venekamp brought this change] + + BearSSL: add CURLOPT_SSL_CIPHER_LIST support + + Closes #8477 + +Dan Fandrich (11 Mar 2022) +- tool_cb_hdr: Turn the Location: into a terminal hyperlink + + This turns even relative URLs into clickable hyperlinks in a supported + terminal when --styled-output is enabled. Many terminals already turn + URLs into clickable links but there is not enough information in a + relative URL to do this automatically otherwise. + +- keepalive-time.d: It takes many probes to detect brokenness + +Daniel Stenberg (11 Mar 2022) +- [HexTheDragon brought this change] + + curl: add --no-clobber + + Does not overwrite output files if they already exist + + Closes #7708 + Co-authored-by: Daniel Stenberg + +- RELEASE-NOTES: synced + + also bump next pending version to become 7.83.0 + +- [Jean-Philippe Menil brought this change] + + openssl: check SSL_get_peer_cert_chain return value + + Signed-off-by: Jean-Philippe Menil + Closes #8579 + +- [Jay Satiro brought this change] + + mk-ca-bundle.vbs: delete this script in favor of mk-ca-bundle.pl + + mk-ca-bundle.vbs is a Windows-specific script for Mozilla certificate + extraction, similar to mk-ca-bundle.pl which runs on any platform. The + vbs version has not been maintained while the perl version has been + maintained with improvements and security fixes. I don't think it's + worth the work to maintain both versions. Windows users should be able + to use mk-ca-bundle.pl without any problems, as long as they have perl. + + Closes #8412 + +- CURLSHOPT_UNLOCKFUNC.3: fix the callback prototype + + Copy and paste error + + Reported-by: Francisco Olarte + Fixes #8573 + Closes #8577 + +- remove-on-error.d: typo + + Reported-by: Colin Leroy + Bug: https://github.com/curl/curl/pull/8503#pullrequestreview-906520081 + +- curl: add --remove-on-error + + If a transfer returns an error, using this option makes curl remove the + leftover downloded (partial) local file before exiting. + + Added test 376 to verify + + Closes #8503 + +- libssh: fix build with old libssh versions + + ... that don't have the SSH_S_* defines. Spotted on a machine using + libssh 0.7.3 + + Closes #8574 + +- hyper: fix status_line() return code + + Detected while working on #7708 that happened to trigger an error here + with a new test case. + + Closes #8572 + +- [Alejandro R. Sedeño brought this change] + + configure.ac: move -pthread CFLAGS setting back where it used to be + + The fix for #8276 proposed in #8374 set `CFLAGS="$CFLAGS -pthead"` + earlier than it used to be set, applying it in cases where it should not + have been applied. + + This moves the AIX XLC check to a new `case $host in` block inside of + the `if test "$USE_THREADS_POSIX" != "1"` block, where `CFLAGS="$CFLAGS + -pthead"` used to happen. + + Fixes #8541 + Closes #8542 + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: add client certificate authentication for OpenSSL + + Closes #8522 + +- tool_operate: fix a scan-build warning + + ... and avoid the temp storing of the return code in a diff variable. + + Closes #8565 + +- test375: verify that --proxy errors out if proxy is disabled in the build + + Closes #8565 + +- curl: error out when options need features not present in libcurl + + Trying to use a proxy when libcurl was built with proxy support disabled + should make curl error out properly. + + Remove knowledge of disabled features from the tool code and instead + make it properly respond to what libcurl returns. Update all tests to + properly require the necessary features to be present/absent so that the + test suite can still be run even with libcurl builds with disabled + features. + + Ref: https://curl.se/mail/archive-2022-03/0013.html + Closes #8565 + +- ngtcp2: disconnect the QUIC connection proper + + Reported-by: mehatzri on github + Reviewed-by: Tatsuhiro Tsujikawa + Fixes #8534 + closes #8569 + +Dan Fandrich (9 Mar 2022) +- test386: Fix an incorrect test markup tag + +Daniel Stenberg (9 Mar 2022) +- [Don J Olmstead brought this change] + + nonblock: restore setsockopt method to curlx_nonblock + + The implementation using setsockopt was removed when BeOS support was + purged. However this functionality wasn't BeOS specific, it is still + used by for example Orbis OS (Playstation 4/5 OS). + + Closes #8562 + +- openssl: fix CN check error code + + Due to a missing 'else' this returns error too easily. + + Regressed in: d15692ebb + + Reported-by: Kristoffer Gleditsch + Fixes #8559 + Closes #8560 + +- [Frank Meier brought this change] + + connect: make Curl_getconnectinfo work with conn cache from share handle + + Closes #8524 + +- [lwthiker brought this change] + + openssl: enable CURLOPT_SSL_EC_CURVES with BoringSSL + + The CURLOPT_SSL_EC_CURVES option (used by the '--curves' flag) in + libcurl was ignored when compiling with BoringSSL because + HAVE_SSL_CTX_SET_EC_CURVES was explicitly disabled if BoringSSL was + detected. However, this feature is supported in BoringSSL since + 5fd1807d. This commit enables it, and also reduces the required minimal + OpenSSL version to 1.0.2 as per OpenSSL's official documentation. + + Fixes #8553 + Closes #8556 + +- [Samuel Henrique brought this change] + + json.d: fix typo (overriden -> overridden) + + Closes #8557 + +- wolfssl: fix compiler error without IPv6 + + Reported-by: Joseph Chen + Fixes #8550 + Closes #8552 + +- RELEASE-NOTES: synced + + and bump pending version to 7.82.1 + +- [Paul Howarth brought this change] + + runtests: make 'oldlibssh' be before 0.9.4 + + The 'oldlibssh' feature indicates that the error code returned by libssh + for a broken known_hosts file should be 67 rather than 60 (test1459). + This feature was added as part of #8444 with 'oldlibssh' mapping to + libssh versions prior to 0.9.6, and then refined as part of #8511 to map + to versions prior to 0.9.5. + + In Red Hat Enterprise Linux 8.5 there is a patched version of libssh + version 0.9.4 (https://git.centos.org/rpms/libssh/blob/c8/f/SOURCES) in + which test1459 fails because it returns the "new" value rather than the + "old" one. It's plausible that one of the patches is responsible for + this rather than the underlying code but I don't think so. + + This change therefore drops the 'oldlibssh' version check to map to + libssh versions older than 0.9.4, which fixes builds on RHEL-8. + + Closes #8548 + +- ipv4/6.d: clarify that they are about using IP addresses + + ... they may still *resolve* other families, but not use those + addresses. + + Ref: #8530 + Closes #8543 + +- [r-a-sattarov brought this change] + + curl/system.h: update ifdef condition for MCST-LCC compiler + + in mcst-lcc compiler => 1.25 added a new macro definition to determine + compiler + + Closes #8546 + +Marc Hoersken (6 Mar 2022) +- CI: install Python package impacket to run SMB test 1451 + + Install Python package impacket in relevant CI workflows. + + Follow up to #7935 + Supersedes #7940 + Closes #8544 + +Daniel Stenberg (5 Mar 2022) +- [Michał Antoniak brought this change] + + connect: use TCP_KEEPALIVE only if TCP_KEEPIDLE is not defined + + Closes #8539 + +- docs/HYPER.md: updated to reflect current hyper build needs + +- GHA: build hyper with nightly rustc + + Closes #8545 + +Version 7.82.0 (5 Mar 2022) + +Daniel Stenberg (5 Mar 2022) +- RELEASE-NOTES: synced + + The 7.82.0 release + +- THANKS: updates from the 7.82.0 release notes + +- misc: update copyright year ranges + +Jay Satiro (5 Mar 2022) +- unit1610: init SSL library before calling SHA256 functions + + The SSL library must be initialized (via global initialization) because + libcurl's SHA256 functions may call SHA256 functions in the SSL library. + + Reported-by: Gisle Vanem + + Fixes https://github.com/curl/curl/issues/8538 + Closes https://github.com/curl/curl/pull/8540 + +- examples/curlx: support building with OpenSSL 1.1.0+ + + - Access members of X509_STORE_CTX in OpenSSL 1.1.0+ by using API + functions. + + The X509_STORE_CTX struct has been opaque since OpenSSL 1.1.0. + + Ref: https://curl.se/mail/lib-2022-03/0004.html + + Closes https://github.com/curl/curl/pull/8529 + +- h2h3: fix typo + + Bug: https://github.com/curl/curl/issues/8381#issuecomment-1055440241 + Reported-by: Michael Kaufmann + +- [Farzin brought this change] + + CURLOPT_XFERINFOFUNCTION.3: fix example struct assignment + + Closes https://github.com/curl/curl/pull/8519 + +Daniel Stenberg (26 Feb 2022) +- azure-pipelines: add a build on Windows with libssh + + Closes #8511 + +- runtests: make 'oldlibssh' be before 0.9.5 + + Closes #8511 + +- libssh: fix include files and defines use for Windows builds + + Reported-by: 梦终无痕 + Bug: https://curl.se/mail/lib-2022-02/0131.html + Closes #8511 + +- RELEASE-NOTES: synced + +- [illusory-dream brought this change] + + winbuild: add parameter WITH_SSH + + For building with libssh + Closes #8514 + +- configure: change output for cross-compiled alt-svc support + + It said 'no', while it actually is 'yes' + + Closes #8512 + +- gha: add a macOS CI job with libssh + + Closes #8513 + +- TODO: remove "Bring back libssh tests on Travis" + + The job was added to Circle CI in d8ddd0e7536 + +- TODO: remove "better persistency for HTTP/1.0" + + Let's not bother. + +- TODO: remove "Option to ignore private IP" + + ... as curl ignores the IP entirely by default these days. + +- TODO: remove "hardcode the "localhost" addresses" + + This is implmented since 1a0ebf6632f88 + +- TODO: 1.24 was a dupe of 1.1 + +- TODO: remove "Typesafe curl_easy_setopt()" + + I don't consider this a serious TODO item + +- KNOWN_BUGS: remove "Uploading HTTP/3 files gets interrupted" + + This works now + +- KNOWN_BUGS: remove "HTTP/3 multipart POST with quiche fails" + + It works now + +- quiche: remove two leftover debug infof() outputs + +- [Tatsuhiro Tsujikawa brought this change] + + ngtcp2: Reset dynbuf when it is fully drained + + Reported-by: vl409 on github + Fixes #7351 + Closes #8504 + +- [Stewart Gebbie brought this change] + + hostip: avoid unused parameter error in Curl_resolv_check + + When built without DNS-over-HTTP and without asynchronous resolvers, + neither the dns nor the data parameters are used. + + That is Curl_resolv_check appears to call + Curl_resolver_is_resolved(data, dns). But, + with CURL_DISABLE_DOH without CURLRES_ASYNCH, the call is actually + elided via a macro definition. + + This fix resolves the resultant: "unused parameter 'data'" error. + + Closes #8505 + +- http2: move two infof calls to debug-h2-only + + and remove a superflous one + + Ref: https://github.com/curl/curl/discussions/8498 + Closes #8502 + +- [Jean-Philippe Menil brought this change] + + quiche: fix upload for bigger content-length + + Signed-off-by: Jean-Philippe Menil + Closes #8421 + +Jay Satiro (23 Feb 2022) +- [Farzin brought this change] + + CURLOPT_PROGRESSFUNCTION.3: fix example struct assignment + + Closes https://github.com/curl/curl/pull/8500 + +Daniel Stenberg (22 Feb 2022) +- [Rob Boeckermann brought this change] + + OS400/README: clarify compilation steps + + Closes #8494 + +- [Rob Boeckermann brought this change] + + OS400: fix typos in rpg include file + + This resolves issues compiling rpg code that includes the curl header + file. + + Closes #8494 + +- [Michał Antoniak brought this change] + + vtls: fix socket check conditions + + fix condition to check the second socket during associate and + disassociate connection + + Closes #8493 + +- libssh2: don't typecast socket to int for libssh2_session_handshake + + Since libssh2_socket_t uses SOCKET on windows which can be larger than + int. + + Closes #8492 + +- RELEASE-NOTES: fix typo and make one desc shorter + +- RELEASE-NOTES: synced + +- CURLOPT_XFERINFOFUNCTION.3: fix typo in example + + Reported-by: coralw on github + Fixes #8487 + Closes #8488 + +- README: disable linkchecks for the sponsor links + + Closes #8489 + +Jay Satiro (21 Feb 2022) +- openssl: check if sessionid flag is enabled before retrieving session + + Ideally, Curl_ssl_getsessionid should not be called unless sessionid + caching is enabled. There is a debug assertion in the function to help + ensure that. Therefore, the pattern in all vtls is basically: + + if(primary.sessionid) {lock(); Curl_ssl_getsessionid(...); unlock();} + + There was one instance in openssl.c where sessionid was not checked + beforehand and this change fixes that. + + Prior to this change an assertion would occur in openssl debug builds + during connection stage if session caching was disabled. + + Reported-by: Jim Beveridge + + Fixes https://github.com/curl/curl/issues/8472 + Closes https://github.com/curl/curl/pull/8484 + +- multi: allow user callbacks to call curl_multi_assign + + Several years ago a change was made to block user callbacks from calling + back into the API when not supported (recursive calls). One of the calls + blocked was curl_multi_assign. Recently the blocking was extended to the + multi interface API, however curl_multi_assign may need to be called + from within those user callbacks (eg CURLMOPT_SOCKETFUNCTION). + + I can't think of any callback where it would be unsafe to call + curl_multi_assign so I removed the restriction entirely. + + Reported-by: Michael Wallner + + Ref: https://github.com/curl/curl/commit/b46cfbc + Ref: https://github.com/curl/curl/commit/340bb19 + + Fixes https://github.com/curl/curl/issues/8480 + Closes https://github.com/curl/curl/pull/8483 + +Daniel Stenberg (21 Feb 2022) +- [Michał Antoniak brought this change] + + ssl: reduce allocated space for ssl backend when FTP is disabled + + Add assert() for the backend pointer in many places + + Closes #8471 + +- [Michał Antoniak brought this change] + + checkprefix: remove strlen calls + + Closes #8481 + +Jay Satiro (20 Feb 2022) +- [1337vt brought this change] + + curl.h: fix typo + + Closes https://github.com/curl/curl/pull/8482 + +- [Jan Venekamp brought this change] + + sectransp: mark a 3DES cipher as weak + + - Change TLS_ECDH_ECDSA_WITH_3DES_EDE_CBC_SHA strength to weak. + + All other 3DES ciphers are already marked as weak. + + Closes https://github.com/curl/curl/pull/8479 + +- [Jan Venekamp brought this change] + + bearssl: fix EXC_BAD_ACCESS on incomplete CA cert + + - Do not create trust anchor object for a CA certificate until after it + is processed. + + Prior to this change the object was created at state BR_PEM_BEGIN_OBJ + (certificate processing begin state). An incomplete certificate (for + example missing a newline at the end) never reaches BR_PEM_END_OBJ + (certificate processing end state) and therefore the trust anchor data + was not set in those objects, which caused EXC_BAD_ACCESS. + + Ref: https://github.com/curl/curl/pull/8106 + + Closes https://github.com/curl/curl/pull/8476 + +- [Jan Venekamp brought this change] + + bearssl: fix connect error on expired cert and no verify + + - When peer verification is disabled use the x509_decode engine instead + of the x509_minimal engine to parse and extract the public key from + the first cert of the chain. + + Prior to this change in such a case no key was extracted and that caused + CURLE_SSL_CONNECT_ERROR. The x509_minimal engine will stop parsing if + any validity check fails but the x509_decode won't. + + Ref: https://github.com/curl/curl/pull/8106 + + Closes https://github.com/curl/curl/pull/8475 + +- [Jan Venekamp brought this change] + + bearssl: fix session resumption (session id) + + Prior to this change br_ssl_client_reset was mistakenly called with + resume_session param set to 0, which disabled session resumption. + + Ref: https://github.com/curl/curl/pull/8106 + + Closes https://github.com/curl/curl/pull/8474 + +Daniel Stenberg (18 Feb 2022) +- [Michał Antoniak brought this change] + + openssl: fix build for version < 1.1.0 + + Closes #8470 + +- [Joel Depooter brought this change] + + schannel: move the algIds array out of schannel.h + + This array is only used by the SCHANNEL_CRED struct in the + schannel_acquire_credential_handle function. It can therefore be kept as + a local variable. This is a minor update to + bbb71507b7bab52002f9b1e0880bed6a32834511. + + This change also updates the NUM_CIPHERS value to accurately count the + number of ciphers options listed in schannel.c, which is 47 instead of + 45. It is unlikely that anyone tries to set all 47 values, but if they + had tried, the last two would not have been set. + + Closes #8469 + +- [Alejandro R. Sedeño brought this change] + + configure.ac: use user-specified gssapi dir when using pkg-config + + Using the system pkg-config path in the face of a user-specified + library path is asking to link the wrong library. + + Reported-by: Michael Kaufmann + Fixes #8289 + Closes #8456 + +- [Kevin Adler brought this change] + + os400: Add link to QADRT devkit to README.OS400 + + Closes #8455 + +- [Kevin Adler brought this change] + + os400: Add function wrapper for system command + + The wrapper will exit if the system command failed instead of blindly + continuing on. + + In addition, only copy docs which exist, since now the copy failure will + cause the build to stop. + + Closes #8455 + +- [Kevin Adler brought this change] + + os400: Default build to target current release + + V6R1M0 is not available as a target release since IBM i 7.2. To keep + from having to keep this up to date in git, default to the current + release. Users can configure this to whatever release they want to + actually build for. + + Closes #8455 + +- docs/INTERNALS.md: clean up, refer to the book + + The explanatory parts are now in the everything curl book (which can + also use images etc). This document now refers to that resource and only + leaves listings of supported versions of libs, tools and operating + systems. See https://everything.curl.dev/internals + + Closes #8467 + +Marcel Raad (17 Feb 2022) +- des: fix compile break for OpenSSL without DES + + When `USE_OPENSSL` was defined but OpenSSL had no DES support and a + different crypto library was used for that, `Curl_des_set_odd_parity` + was called but not defined. This could for example happen on Windows + and macOS when using OpenSSL v3 with deprecated features disabled. + + Use the same condition for the function definition as used at the + caller side, but leaving out the OpenSSL part to avoid including + OpenSSL headers. + + Closes https://github.com/curl/curl/pull/8459 + +Daniel Stenberg (17 Feb 2022) +- RELEASE-NOTES: synced + +- docs/DEPRECATE: remove NPN support in August 2022 + + Closes #8458 + +- ftp: provide error message for control bytes in path + + Closes #8460 + +- http: fix "unused parameter ‘conn’" warning + + Follow-up from 7d600ad1c395 + + Spotted on appveyor + + Closes #8465 + +Jay Satiro (17 Feb 2022) +- [Alejandro R. Sedeño brought this change] + + sha256: Fix minimum OpenSSL version + + - Change the minimum OpenSSL version for using their SHA256 + implementation from 0.9.7 to 0.9.8. + + EVP_sha256() does not appear in the OpenSSL source before 0.9.7h, and + does not get built by default until 0.9.8, so trying to use it for all + 0.9.7 is wrong, and before 0.9.8 is unreliable. + + Closes https://github.com/curl/curl/pull/8464 + +Daniel Stenberg (16 Feb 2022) +- KNOWN_BUGS: remove "slow connect to localhost on Windows" + + localhost is not resolved anymore since 1a0ebf6632f88 + +- KNOWN_BUGS: remove "HTTP/3 download is 5x times slower than HTTP/2" + + It's not actually a bug. More like room for improvement. + +- KNOWN_BUGS: remove "HTTP/3 download with quiche halts after a while" + + Follow-up to 96f85a0fef694 + +- KNOWN_BUGS: remove "pulseUI vpn" as a problem + + We haven't heard about this for a long time and rumours have it they + might have fixed it. + +- urldata: remove conn->bits.user_passwd + + The authentication status should be told by the transfer and not the + connection. + + Reported-by: John H. Ayad + Fixes #8449 + Closes #8451 + +- [Kevin Adler brought this change] + + gskit: Convert to using Curl_poll + + As mentioned in 32766cb, gskit was the last user of Curl_select which is + now gone. Convert to using Curl_poll to allow build to work on IBM i. + + Closes #8454 + +- [Kevin Adler brought this change] + + gskit: Fix initialization of Curl_ssl_gskit struct + + In c30bf22, Curl_ssl_getsock was factored out in to a member of + struct Curl_ssl but the gskit initialization was not updated to reflect + this new member. + + Closes #8454 + +- [Kevin Adler brought this change] + + gskit: Fix errors from Curl_strerror refactor + + 2f0bb864c1 replaced sterror with Curl_strerror, but the strerror buffer + shadows the set_buffer "buffer" parameter. To keep consistency with the + other functions that use Curl_strerror, rename the parameter. + + In addition, strerror.h is needed for the definition of STRERROR_LEN. + + Closes #8454 + +Marcel Raad (15 Feb 2022) +- ntlm: remove unused feature defines + + They're not used anymore and always supported. + + Closes https://github.com/curl/curl/pull/8453 + +Daniel Stenberg (15 Feb 2022) +- [Kantanat Wannapaka brought this change] + + README.md: fix link and layout + + replace tags and tags + + Closes #8448 + +- KNOWN_BUGS: fix typo "libpsl" + +Jay Satiro (14 Feb 2022) +- h2h3: fix compiler warning due to function prototype mismatch + + - Add missing const qualifier in Curl_pseudo_headers declaration. + +Daniel Stenberg (14 Feb 2022) +- [Stefan Eissing brought this change] + + urlapi: handle "redirects" smarter + + - avoid one malloc when setting a new url via curl_url_set() + and CURLUPART_URL. + - extract common pattern into a new static function. + + Closes #8450 + +- cijobs: pick up circleci configure lines better + +- circleci: add a job using wolfSSH + + Build only, no tests. + + Closes #8445 + +- scripts/ciconfig.pl: show used options not available + +- circleci: add a job using libssh + + Closes #8444 + +- runtests: set 'oldlibssh' for libssh versions before 0.9.6 + + ... and make test 1459 check for the different return code then. + + Closes #8444 + +Jay Satiro (13 Feb 2022) +- Makefile.am: Generate VS 2022 projects + + Follow-up to f13d4d0 which added VS 2022 project support. + + Ref: https://github.com/curl/curl/pull/8438 + +- [Daniel Stenberg brought this change] + + projects: remove support for MSVC before VC10 (Visual Studio 2010) + + - Remove Visual Studio project files for VC6, VC7, VC7.1, VC8 and VC9. + + Those versions are too old to be maintained any longer. + + Closes https://github.com/curl/curl/pull/8442 + +- [Stav Nir brought this change] + + projects: add support for Visual Studio 17 (2022) + + Closes https://github.com/curl/curl/pull/8438 + +Daniel Stenberg (13 Feb 2022) +- RELEASE-NOTES: synced + +- connect: follow-up fix the copyright year + +- [Michał Antoniak brought this change] + + misc: remove unused data when IPv6 is not supported + + Closes #8430 + +- scripts/ciconfig: show CI job config info + + Closes #8446 + +- quiche: handle stream reset + + A stream reset now causes a CURLE_PARTIAL_FILE error. I'm not convinced + this is the right action nor the right error code. + + Reported-by: Lucas Pardue + Fixes #8437 + Closes #8440 + +- mime: use a define instead of the magic number 24 + + MIME_BOUNDARY_DASHES is now the number of leading dashes in the + generated boundary string. + + Closes #8441 + +- [Henrik Holst brought this change] + + hostcheck: reduce strlen calls on chained certificates + + Closes #8428 + +- [Patrick Monnerat brought this change] + + mime: some more strlen() call removals. + + Closes #8423 + +- scripts/cijobs.pl: detect zuul cmake jobs better + +- url: exclude zonefrom_url when no ipv6 is available + + Closes #8439 + +- if2ip: make Curl_ipv6_scope a blank macro when IPv6-disabled + + Closes #8439 + +- [Henrik Holst brought this change] + + mprintf: remove strlen calls on empty strings in dprintf_formatf + + Turns out that in dprintf_formatf we did a strlen on empty strings, a + bit strange is how common this actually is, 24 alone when doing a simple + GET from https://curl.se + + Closes #8427 + +- wolfssl: return CURLE_AGAIN for the SSL_ERROR_NONE case + + Closes #8431 + +- wolfssl: when SSL_read() returns zero, check the error + + Returning zero indicates end of connection, so if there's no data read + but the connection is alive, it needs to return -1 with CURLE_AGAIN. + + Closes #8431 + +- quiche: after leaving h3_recving state, poll again + + This could otherwise easily leave libcurl "hanging" after the entire + transfer is done but without noticing the end-of-transfer signal. + + Assisted-by: Lucas Pardue + Closes #8436 + +- quiche: when *recv_body() returns data, drain it before polling again + + Assisted-by: Lucas Pardue + + Closes #8429 + +- [gaoxingwang on github brought this change] + + configure: fix '--enable-code-coverage' typo + + Fixes #8425 + Closes #8426 + +- lib/h2h3: #ifdef on ENABLE_QUIC, not the wrong define + + Otherwise the build fails when H3 is enabled but the build doesn't + include nghttp2. + + Closes #8424 + +- hostcheck: pass in pattern length too, to avoid a strlen call + + Removes one strlen() call per SAN name in a cert-check. + + Closes #8418 + +- [Henrik Holst brought this change] + + misc: remove strlen for Curl_checkheaders + Curl_checkProxyheaders + + Closes #8409 + +- configure: requires --with-nss-deprecated to build with NSS + + Add deprecation plans to docs/DEPRECATE.md + + Closes #8395 + +- mqtt: free 'sendleftovers' in disconnect + + Fix a memory-leak + + Bug: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=43646 + Closes #8415 + +- [Patrick Monnerat brought this change] + + openldap: pass string length arguments to client_write() + + This uses the new STRCONST() macro and saves 2 strlen() calls on short + string constants per LDIF output line. + + Closes #8404 + +- [Henrik Holst brought this change] + + misc: reduce strlen() calls with Curl_dyn_add() + + Use STRCONST() to switch from Curl_dyn_add() to Curl_dyn_addn() for + string literals. + + Closes #8398 + +- http2: fix the array copy to nghttp2_nv + + Bug: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=44517 + Follow-up to 9f985a11e794 + Closes #8414 + +- RELEASE-NOTES: synced + +- scripts/cijobs.pl: output data about all currect CI jobs + + This script parses the config files for all the CI services currently in + use and output the information in a uniform way. The idea is that the + output from this script should be possible to massage into informational + tables or graphs to help us visualize what they are all testing and NOT + testing. + + Closes #8408 + +- maketgz: return error if 'make dist' fails + + To better detect this problem in CI jobs + + Reported-by: Marcel Raad + Bug: https://curl.se/mail/lib-2022-02/0070.html + Closes #8402 + +- h2h3: pass correct argument types to infof() + + Detected by Coverity. CID 1497993 + + Closes #8401 + +- lib/Makefile: remove config-tpf.h from the dist + + Follow-up from da15443dddea2bfb. Missed before because the 'distcheck' + CI job was not working as intended. + + Reported-by: Marcel Raad + Bug: https://curl.se/mail/lib-2022-02/0070.html + Closes #8403 + +- configure: remove support for "embedded ares" + + In March 2010 (commit 4259d2df7dd) we removed the embedded 'ares' + directory from the curl source tree but we have since supported + especially detecting and using that build directory. The time has come + to remove that kludge and ask users to specify the c-ares dir correctly + with --enable-ares. + + Closes #8397 + +- [Sebastian Sterk brought this change] + + github/workflows/mbedtls: fix indent & remove unnecessary line breaks + + Closes #8399 + +- CI: move the NSS job from zuul to GHA + + Closes #8396 + +- tests/unit/Makefile.am: add NSS_LIBS to build with NSS fine + + Closes #8396 + +Marcel Raad (7 Feb 2022) +- curl-openssl: fix SRP check for OpenSSL 3.0 + + When OpenSSL 3.0 is built with `--api=3.0` and `no-deprecated`, the SRP + functions exist in the library, but are disabled for user code. Check + if they are actually usable instead of only if they exist. Also, check + for the functions actually required for TLS-SRP. + + TLS-SRP support is still enabled if OpenSSL is configured with just + `--api=3.0` or with `--api=1.1.1 no-deprecated`. + + Closes https://github.com/curl/curl/pull/8394 + +Daniel Stenberg (7 Feb 2022) +- [Henrik Holst brought this change] + + http: make Curl_compareheader() take string length arguments too + + Also add STRCONST, a macro that returns a string literal and it's length + for functions that take "string,len" + + Removes unnecesary calls to strlen(). + + Closes #8391 + +- vquic/vquic.h: removed the unused H3 psuedo defines + +- ngtcp2: use Curl_pseudo_headers + +- quiche: use Curl_pseudo_headers + +- http2: use Curl_pseudo_headers + +- h2h3: added Curl_pseudo_headers() + + For use with both http2 and http3 requests. + +- ngtcp2/quiche: make :scheme possible to set + +- http2: allow CURLOPT_HTTPHEADER change ":scheme" + + The only h2 psuedo header that wasn't previously possible to change by a + user. This change also makes it impossible to send a HTTP/1 header that + starts with a colon, which I don't think anyone does anyway. + + The other pseudo headers are possible to change indirectly by doing the + rightly crafted request. + + Reported-by: siddharthchhabrap on github + Fixes #8381 + Closes #8393 + +- h2/h3: provide and refer to pseudo headers as defines + + ... and do sizeof() on the defines to use constants better. + + Closes #8389 + +- [Michał Antoniak brought this change] + + smb: passing a socket for writing and reading data instead of FIRSTSOCKET + + Closes #8383 + +- x509asn1: toggle off functions not needed for diff tls backends + + ... and clean the header file from private defines/structs (move to C + file) and unused function prototypes. + + Closes #8386 + +- lib: move hostcheck and x509sn1 sources to vtls/ + + ... since they are used strictly by TLS code. + + Closes #8386 + +Marcel Raad (4 Feb 2022) +- version_win32: fix warning for `CURL_WINDOWS_APP` + + The build version is not supported by the UWP code. + + Closes https://github.com/curl/curl/pull/8385 + +Daniel Stenberg (4 Feb 2022) +- tests/disable-scan.pl: properly detect multiple symbols per line + + Test 1165 would fail on some systems because it didn't detect + CURL_DISABLE_* symbols that were used to the right of another one on the + same line! The script would only detect and extract the first one. + + Reported-by: Marcel Raad + Fixes #8384 + Closes #8388 + +Jay Satiro (4 Feb 2022) +- config.d: Clarify _curlrc filename is still valid on Windows + + Recent changes added support for filename .curlrc on Windows, and + when it's not found curl falls back on the original Windows filename + _curlrc. _curlrc was removed from the doc, however it is still valid. + + Closes https://github.com/curl/curl/pull/8382 + +Daniel Stenberg (4 Feb 2022) +- lib: remove support for CURL_DOES_CONVERSIONS + + TPF was the only user and support for that was dropped. + + Closes #8378 + +- TPF: drop support + + There has been no TPF related changes done since September 2010 (commit + 7e1a45e224e57) and since this is a platform that is relatively different + than many others (== needs attention), I draw the conclusion that this + build is broken since a long time. + + Closes #8378 + +- scripts/delta: check the file delta for current branch + + ... also polish the output style a little bit + +Jay Satiro (3 Feb 2022) +- [Fabian Keil brought this change] + + runtests.pl: tolerate test directories without Makefile.inc + + Silences the following warnings when using a Makefile.inc-free + TESTDIR using the "-o" argument: + + readline() on closed filehandle D at ./runtests.pl line 592. + Use of uninitialized value $disttests in pattern match (m//) at + ./runtests.pl line 3602. + + Closes https://github.com/curl/curl/pull/8379 + +Daniel Stenberg (3 Feb 2022) +- [Henrik Holst brought this change] + + setopt: do bounds-check before strdup + + Curl_setstropt() allocated memory for the string before checking if the + string was within bounds. The bounds check should be done first. + + Closes #8377 + +- [Michał Antoniak brought this change] + + mbedtls: enable use of mbedtls without filesystem functions support + + Closes #8376 + +- [Bernhard Walle brought this change] + + configure: support specification of a nghttp2 library path + + This enables using --with-nghttp2= on systems without pkg-config. + + Closes #8375 + +- scripts/release-notes.pl: remove leftover debug output + +- RELEASE-NOTES: synced + +- scripts/release-notes.pl: fix number extraction for full URLs + +- [Leah Neukirchen brought this change] + + scripts/completion.pl: improve zsh completion + + - Detect all spellings of , etc as well as . + - Only complete directories for . + - Complete URLs for . + - Complete --request and --ftp-method. + + Closes #8363 + +- [Davide Cassioli brought this change] + + configure: use correct CFLAGS for threaded resolver with xlC on AIX + + Fixes #8276 + Closes #8374 + +- mailmap: Henrik Holst + +Jay Satiro (2 Feb 2022) +- build: fix ngtcp2 crypto library detection + + - Change library link check for ngtcp2_crypto_{gnutls,openssl} to + to use function ngtcp2_crypto_recv_client_initial_cb instead of + ngtcp2_crypto_ctx_initial. + + The latter function is no longer external since two days ago in + ngtcp2/ngtcp2@533451f. curl HTTP/3 CI builds have been failing since + then because they would not link to the ngtcp2 crypto library. + + Ref: https://github.com/ngtcp2/ngtcp2/pull/356 + + Closes https://github.com/curl/curl/pull/8372 + +- [Henrik Holst brought this change] + + urlapi: remove an unnecessary call to strlen + + - Use strcpy instead of strlen+memcpy to copy the url path. + + Ref: https://curl.se/mail/lib-2022-02/0006.html + + Closes https://github.com/curl/curl/pull/8370 + +Daniel Stenberg (1 Feb 2022) +- scripts/copyright.pl: fix for handling removed files better + +- vxworks: drop support + + No changes or fixes in vxworks related code since 2009 leads me to + believe that this doesn't work anymore. + + Closes #8362 + +- [Henrik Holst brought this change] + + base64: remove an unnecessary call to strlen + + Closes #8369 + +- tool_getparam: initial --json support + + Adds these test cases: + + 383 - simple single command line option + 384 - reading it from stdin + 385 - getting two --json options on command line + 386 - --next works after --json + + Closes #8314 + +- [Bjarni Ingi Gislason brought this change] + + curl_getdate.3: remove pointless .PP line + + mandoc: WARNING: skipping paragraph macro: PP empty + + Reported-by: Samuel Henrique + Closes #8365 + +- [Sebastian Sterk brought this change] + + multi: grammar fix in comment + + After 'must', the verb is used without 'to'. Correct: "must" or "have + to" + + Closes #8368 + +- openldap: fix compiler warning when built without SSL support + + openldap.c:841:52: error: unused parameter ‘data’ [-Werror=unused-parameter] + + Closes #8367 + +- [Samuel Henrique brought this change] + + CURLSHOPT_LOCKFUNC.3: fix typo "relased" -> "released" + + Found when packaging 7.81.0 for Debian. + + Closes #8364 + +- netware: remove support + + There are no current users and no Netware related changes done in the + code for over 13 years is a clear sign this is abandoned. + + Closes #8358 + +- CI: move two jobs from Zuul to Circle CI + + - openssl-no-verbose + - openssl-no-proxy + + Closes #8359 + +- cirlceci: also run a c-ares job on arm with debug enabled + + Closes #8357 + +- ci: move the OpenSSL + c-ares job from Zuul to Circle CI + + Closes #8357 + +- mailmap: Jan-Piet Mens + +- [luminixinc on github brought this change] + + multi: remember connection_id before returning connection to pool + + Fix a bug that does not require a new CVE as discussed on hackerone.com. + Previously `connection_id` was accessed after returning connection to + the shared pool. + + Bug: https://hackerone.com/reports/1463013 + Closes #8355 + +Jay Satiro (31 Jan 2022) +- write-out.d: Fix num_headers formatting + +- [Jan-Piet Mens brought this change] + + docs: capitalize the name 'Netscape' + + Closes https://github.com/curl/curl/pull/8354 + +Daniel Stenberg (30 Jan 2022) +- RELEASE-NOTES: synced + +- [Antoine Pietri brought this change] + + docs: grammar proofread, typo fixes + + (Partially automated) proofread of most of the documentation, leading to + various typo fixes. + + Closes #8353 + +- urldata: CONN_IS_PROXIED replaces bits.close when proxy can be disabled + + To remove run-time checks for such builds. + + Closes #8350 + +- setopt: fix the TLSAUTH #ifdefs for proxy-disabled builds + + Closes #8350 + +- conncache: make conncache_add_bundle return the pointer + + Simplifies the logic a little and avoids a ternary operator. + + Ref: #8346 + Closes #8349 + +- mailmap: neutric on github + +Jay Satiro (30 Jan 2022) +- [neutric on github brought this change] + + docs/TheArtOfHttpScripting: fix example POST URL + + Closes https://github.com/curl/curl/pull/8352 + +Daniel Stenberg (28 Jan 2022) +- nss: handshake callback during shutdown has no conn->bundle + + The callback gets called because of the call to PR_Recv() done to + attempt to avoid RST on the TCP connection. The conn->bundle pointer is + already cleared at this point so avoid dereferencing it. + + Reported-by: Eric Musser + Fixes #8341 + Closes #8342 + +- [Michał Antoniak brought this change] + + mbedtls: remove #include + + mbedtls/certs.h file contains only certificates example (all definitions + is beginning by mbedtls_test_*). None of them is used so we can avoid + include the file. + + Closes #8343 + +- [Michał Antoniak brought this change] + + mbedtls: enable use of mbedtls without CRL support + + Closes #8344 + +- [Bernhard Walle brought this change] + + configure: set CURL_LIBRARY_PATH for nghttp2 + + To execute the test program, we might need the library path so that the + lib is found at runtime. + + Closes #8340 + +Jay Satiro (28 Jan 2022) +- schannel: restore debug message in schannel_connect_step2 + + This is a follow-up to recent commit 2218c3a which removed the debug + message to avoid an unused variable warning. The message has been + reworked to avoid the warning. + + Ref: https://github.com/curl/curl/pull/8320#issuecomment-1022957904 + + Closes https://github.com/curl/curl/pull/8336 + +- test3021: disable all msys2 path transformation + + - Disable all MSYS2 path transformation in test3021 and test3022. + + Prior to this change path transformation in those tests was disabled + only for arguments that start with forward slashes. However arguments + that are in base64 contain forward slashes at any position and caused + unwanted translations. + + == Info: Denied establishing ssh session: mismatch sha256 fingerprint. + Remote +/EYG2YDzDGm6yiwepEMSuExgRRMoTi8Di1UN3kixZw= is not equal to + +C:/msys64/EYG2YDzDGm6yiwepEMSuExgRRMoTi8Di1UN3kixZw + + In the above example an argument containing a base64 sha256 fingerprint + was passed to curl after MSYS2 translated +/ into +C:/msys64/, and then + the fingerprint didn't match what was expected. + + Ref: https://www.msys2.org/wiki/Porting/ + + Fixes https://github.com/curl/curl/issues/8084 + Closes https://github.com/curl/curl/pull/8325 + +Daniel Stenberg (27 Jan 2022) +- CI: move scan-build job from Zuul to Azure Pipelines + + Closes #8338 + +Marcel Raad (27 Jan 2022) +- openssl: fix `ctx_option_t` for OpenSSL v3+ + + The options have been changed to `uint64_t` in + https://github.com/openssl/openssl/commit/56bd17830f2d5855b533d923d4e0649d3ed61d11. + + Closes https://github.com/curl/curl/pull/8331 + +Daniel Stenberg (27 Jan 2022) +- CI: move 'distcheck' job from zuul to azure pipelines + + Assisted-by: Kushal Das + + Closes #8334 + +- vtls: pass on the right SNI name + + The TLS backends convert the host name to SNI name and need to use that. + This involves cutting off any trailing dot and lowercasing. + + Co-authored-by: Jay Satiro + Closes #8320 + +- url: revert the removal of trailing dot from host name + + Reverts 5de8d84098db1bd24e (May 2014, shipped in 7.37.0) and the + follow-up changes done afterward. + + Keep the dot in names for everything except the SNI to make curl behave + more similar to current browsers. This means 'name' and 'name.' send the + same SNI for different 'Host:' headers. + + Updated test 1322 accordingly + + Fixes #8290 + Reported-by: Charles Cazabon + Closes #8320 + +- [neutric on github brought this change] + + docs/TheArtOfHttpScripting: fix capitalization + + Closes #8333 + +- tests/memanalyze.pl: also count and show "total allocations" + + This is the total number of bytes allocated, increasing for new + allocations and never reduced when freed. The existing "Maximum + allocated" is the high water mark. + + Closes #8330 + +- mailmap: spellfix githuh => github + +- RELEASE-NOTES: synced + +- hostcheck: fixed to not touch used input strings + + Avoids the need to clone the strings before check, thus avoiding + mallocs, which for cases where there are many SAN names in a cert could + end up numerous. + + Closes #8321 + +- ngtcp2: adapt to changed end of headers callback proto + + Closes #8322 + +- [Xiaoke Wang brought this change] + + openssl: check SSL_get_ex_data to prevent potential NULL dereference + + Closes #8268 + +Jay Satiro (23 Jan 2022) +- md5: check md5_init_func return value + + Prior to this change the md5_init_func (my_md5_init) return value was + ignored. + + Closes https://github.com/curl/curl/pull/8319 + +- md5: refactor for standard compliance + + - Wrap OpenSSL / wolfSSL MD5 functions instead of taking their function + addresses during static initialization. + + Depending on how curl was built the old way may have used a dllimport + function address during static initialization, which is not standard + compliant, resulting in Visual Studio warning C4232 (nonstandard + extension). Instead the function pointers now point to the wrappers + which call the MD5 functions. + + This change only affects OpenSSL and wolfSSL because calls to other SSL + libraries' md5 functions were already wrapped. Also sha256.c already + does this for all SSL libraries. + + Ref: https://github.com/curl/curl/pull/8298 + + Closes https://github.com/curl/curl/pull/8318 + +Daniel Stenberg (21 Jan 2022) +- [Lucas Pardue brought this change] + + docs: update IETF links to use datatracker + + The tools.ietf.org domain has been deprecated a while now, with the + links being redirected to datatracker.ietf.org. + + Rather than make people eat that redirect time, this change switches the + URL to a more canonical source. + + Closes #8317 + +- [Harry Sarson brought this change] + + CI: test building wolfssl with --enable-opensslextra + + Closes #8315 + +- [Harry Sarson brought this change] + + misc: allow curl to build with wolfssl --enable-opensslextra + + put all #include of openssl files behind wolfssl ifdefs so that we can + use the wolfssl/ prefixed include paths. Without these curl only builds + when wolfssl is built with enable-all. + + Fixes #8292 + Closes #8315 + +- [Lucas Pardue brought this change] + + quiche: change qlog file extension to `.sqlog` + + quiche has just switched it's qlog serialization format to JSON-SEQ by + default . The spec says this SHOULD use `.sqlog` extension. + + I believe ngtcp2 also supports JSON-SEQ by default as of + https://github.com/ngtcp2/ngtcp2/commit/9baf06fc3f352a1d062b6953ae1de22cae30639d + + Let's update curl so that tools know what format we are using! + + Closes #8316 + +Jay Satiro (21 Jan 2022) +- projects: Fix Visual Studio wolfSSL configurations + + - Change build-wolfssl.bat to disable SSLv3, enable TLSv1.3, enable + wolfSSL_DES_ecb_encrypt (needed by NTLM) and enable alt cert chains. + + - Disable warning C4214 'bit field types other than int'. + + - Add include directory wolfssl\wolfssl. + + wolfSSL offers OpenSSL API compatibility that libcurl uses, and some + recent change in libcurl included an include file for wolfSSL like + openssl/foo.h, which has a path like wolfssl\wolfssl\openssl\foo.h. + + The include directory issue was reported in #8292 but it's currently + unclear whether this type of change is needed for other build systems. + + Bug: https://github.com/curl/curl/issues/8292 + Reported-by: Harry Sarson + + Closes https://github.com/curl/curl/pull/8298 + +Daniel Stenberg (21 Jan 2022) +- openssl: return error if TLS 1.3 is requested when not supported + + Previously curl would just silently ignore it if the necessary defines + are not present at build-time. + + Reported-by: Stefan Eissing + Fixes #8309 + Closes #8310 + +- TODO: Passing NOTIFY option to CURLOPT_MAIL_RCPT + + Closes #8232 + +- [Philip H brought this change] + + workflows/wolfssl: install impacket + + needed Python Package for SMB tests + + Closes #8307 + +- url: make Curl_disconnect return void + + 1. The function would only ever return CURLE_OK anyway + 2. Only one caller actually used the return code + 3. Most callers did (void)Curl_disconnect() + + Closes #8303 + +- docs: document HTTP/2 not insisting on TLS 1.2 + + Both for --http2 and CURLOPT_HTTP_VERSION. + + Reported-by: jhoyla on github + Fixes #8235 + Closes #8300 + +- cmdline-opts/gen.pl: fix option matching to improve references + + Previously it could mistakenly match partial names when there are + options that start with the same prefix, leading to the wrong references + used. + + Closes #8299 + +- TODO: Less memory massaging with Schannel + +- [Patrick Monnerat brought this change] + + runtests.pl: disable debuginfod + + Valgrind and gdb implement this feature: as this highly slows down tests, + disable it. + + Closes #8291 + +- RELEASE-NOTES: synced + +- CURLMOPT_TIMERFUNCTION/DATA.3: fix the examples + + ... to not call libcurl recursively back. + + Closes #8286 + +- multi: set in_callback for multi interface callbacks + + This makes most libcurl functions return error if called from within a + callback using the same multi handle. For example timer or socket + callbacks calling curl_multi_socket_action. + + Reported-by: updatede on github + Fixes #8282 + Closes #8286 + +- docs/HISTORY.md: mention alt-svc and HSTS + +- misc: remove the final watcom references + + Follow-up to bbf8cae44dedc495e6 + + We removed support for the watcom builds files back in September + 2020. This removes all remaining watcom references and ifdefs. + + Closes #8287 + +- misc: remove BeOS code and references + + There has not been a mention of this OS in any commit since December + 2004 (58f4af7973e3d2). The OS is also long gone. + + Closes #8288 + +- tool_getparam: DNS options that need c-ares now fail without it + + Just silently accepting the options and then not having any effect is + not good. + + Ref: #8283 + Closes #8285 + +- curl: remove "separators" (when using globbed URLs) + + Unless muted (with -s) When doing globbing, curl would output mime-like + separators between the separate transfers. This is not documented + anywhere, surprises users and clobbers the output. Gone now. + + Updated test 18 and 1235 + + Reported-by: jonny112 on github + Bug: https://github.com/curl/curl/discussions/8257 + Closes #8278 + +Jay Satiro (15 Jan 2022) +- [Niels Martignène brought this change] + + mbedtls: fix CURLOPT_SSLCERT_BLOB (again) + + - Increase the buffer length passed to mbedtls_x509_crt_parse to account + for the null byte appended to the temporary blob. + + Follow-up to 867ad1c which uses a null terminated copy of the + certificate blob, because mbedtls_x509_crt_parse requires PEM data + to be null terminated. + + Ref: https://github.com/curl/curl/commit/867ad1c#r63439893 + Ref: https://github.com/curl/curl/pull/8146 + + Closes https://github.com/curl/curl/pull/8260 + +Daniel Stenberg (15 Jan 2022) +- [Alessandro Ghedini brought this change] + + quiche: verify the server cert on connect + + Similarly to c148f0f551f9bea0e3d0, make quiche correctly acknowledge + `CURLOPT_SSL_VERIFYPEER` and `CURLOPT_SSL_VERIFYHOST`. + + Fixes #8173 + Closes #8275 + +- [Ikko Ashimine brought this change] + + checksrc: fix typo in comment + + enfore -> enforce + + Closes #8281 + +- curl-openssl: remove the OpenSSL headers and library versions check + + It is more work to maintain that check than the (any?) benefit it + brings. + + Fixes #8279 + Reported-by: Satadru Pramanik + Closes #8280 + +- mqtt: free any leftover when done + + Oss-fuzz found an issue when the "sendleftovers" pointer could leak memory. + Fix this by always freeing it (if still assigned) in the done function. + + Bug: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=43515 + Closes #8274 + +- formdata: avoid size_t => long typecast overflows + + Typically a problem for platforms with 32 bit long and 64 bit size_t + + Reported-by: Fabian Yamaguchi + Bug: https://hackerone.com/reports/1444539 + Closes #8272 + +- RELEASE-NOTES: synced + + bump next release to become 7.82.0 + +Marcel Raad (13 Jan 2022) +- build: enable -Warith-conversion + + This makes the behavior consistent between GCC 10 and earlier versions. + + Closes https://github.com/curl/curl/pull/8271 + +- build: fix -Wenum-conversion handling + + Don't enable that warning when warnings are disabled. + Also add it to CMake. + + Closes https://github.com/curl/curl/pull/8271 + +- appveyor: use VS 2017 image for the autotools builds + + The newer images don't have all required MSYS2 packages. + + Fixes https://github.com/curl/curl/issues/8248 + Closes https://github.com/curl/curl/pull/8265 + +- appveyor: update images from VS 2019 to 2022 + + Closes https://github.com/curl/curl/pull/8265 + +Daniel Stenberg (12 Jan 2022) +- [Michał Antoniak brought this change] + + mbedtls: return CURLcode result instead of a mbedtls error code + + ... when a certificate fails to be loaded from a blob + + Closes #8266 + +- curl_multi_socket.3: remove callback and typical usage descriptions + + 1. The callback is better described in the option for setting it. Having + it in a single place reduces the risk that one of them is wrong. + + 2. The "typical usage" is wrong since the functions described in this + man page are both deprecated so they cannot be used in any "typical" way + anymore. + + Closes #8262 + +- curl-functions.m4: revert DYLD_LIBRARY_PATH tricks in CURL_RUN_IFELSE + + Mostly reverts ba0657c343f, but now instead just run the plain macro on + darwin. The approach as used on other platforms is simply not necessary + on macOS. + + Fixes #8229 + Reported-by: Ryan Schmidt + Closes #8247 + +- [Patrick Monnerat brought this change] + + openldap: implement SASL authentication + + As credentials can be quite different depending on the mechanism used, + there are no default mechanisms for LDAP and simple bind with a DN is + then used. + + The caller has to provide mechanism(s) using CURLOPT_LOGIN_OPTIONS to + enable SASL authentication and disable simple bind. + + Closes #8152 + +Jay Satiro (10 Jan 2022) +- [Cameron Will brought this change] + + CURLOPT_RESOLVE.3: change example port to 443 + + 83cc966 changed documentation from using http to https. However, + CURLOPT_RESOLVE being set to port 80 in the documentation means that it + isn't valid for the new URL. Update to 443. + + Closes https://github.com/curl/curl/pull/8258 + +Daniel Stenberg (10 Jan 2022) +- [Fabian Keil brought this change] + + test374: gif data without new line at the end + + Closes #8239 + +- [Fabian Keil brought this change] + + runtests.pl: support the nonewline attribute for the data part + + Added to FILEFORMAT + + Closes #8239 + +- [Patrick Monnerat brought this change] + + curl tool: erase some more sensitive command line arguments + + As the ps command may reveal sensitive command line info, obfuscate + options --tlsuser, --tlspasswd, --proxy-tlsuser, --proxy-tlspassword and + --oauth2-bearer arguments. + + Reported-by: Stephen Boost + + Closes #7964 + +- mesalink: remove support + + Mesalink has ceased development. We can no longer encourage use of it. + It seems to be continued under the name TabbySSL, but no attempts have + (yet) been to make curl support it. + + Fixes #8188 + Closes #8191 + +- ldap: return CURLE_URL_MALFORMAT for bad URL + + For consistency, use the same return code for URL malformats, + independently of what scheme that is used. Previously this would return + CURLE_LDAP_INVALID_URL, but starting now that error cannot be returned. + + Closes #8170 + +- docs/cmdline-opts: add "mutexed" options for more http versions + + Update four http version man page sections. + + Closes #8254 + +- [Stephen M. Coakley brought this change] + + rustls: add CURLOPT_CAINFO_BLOB support + + Add support for `CURLOPT_CAINFO_BLOB` `CURLOPT_PROXY_CAINFO_BLOB` to the + rustls TLS backend. Multiple certificates in a single PEM string are + supported just like OpenSSL does with this option. + + This is compatible at least with rustls-ffi 0.8+ which is our new + minimum version anyway. + + I was able to build and run this on Windows, pulling trusted certs from + the system and then add them to rustls by setting + `CURLOPT_CAINFO_BLOB`. Handy! + + Closes #8255 + +- scripts/copyright.pl: ignore missing files + +- RELEASE-NOTES: synced + +- data/DISABLED: disable test 313 for wolfssl builds + + It was previously disabled only in the CI jobs yaml + + Closes #8252 + +- runtests: make 'wolfssl' a testable feature + + Closes #8252 + +- GHA: install stunnel in the medbtls + wolfssl CI jobs + + Closes #8252 + +- CI: move the rustls CI job to GHA from Zuul + + Closes #8251 + +- DISABLE: disable a dozen tests in the rustls build + + Disables tests that don't yet work with the rustls backend. + + Fixes #8004 + Closes #8250 + +- runtests: make 'rustls' a testable feature + +- remote-header-name.d: clarify + + - it strips off the path from the server provided name + - it saves in current directory or --output-dir + + Ref: https://curl.se/mail/archive-2022-01/0032.html + Closes #8249 + +- url: given a user in the URL, find pwd for that user in netrc + + Add test 380 and 381 to verify, edited test 133 + + Reported-by: Manfred Schwarb + Fixes #8241 + Closes #8243 + +- [Niels Martignène brought this change] + + mbedtls: Fix ssl_init error with mbedTLS 3.1.0+ + + Since mbedTLS 3.1.0, mbedtls_ssl_setup() fails if the provided + config struct is not valid. + + mbedtls_ssl_config_defaults() needs to be called before the config + struct is passed to mbedtls_ssl_setup(). + + Closes #8238 + +- [Filip Lundgren brought this change] + + cmake: fix iOS CMake project generation error + + Closes #8244 + +- ngtcp2: fix declaration of ‘result’ shadows a previous local + + Follow-up to 8fbd6feddfa587cfd3 + + Closes #8245 + +- openssl.h: avoid including OpenSSL headers here + + ... by instead using the struct version of the typedef'ed pointer. To + fix build errors when both Schannel and OpenSSL are enabled. + + Fixes #8240 + Reported-by: Jan Ehrhardt + Closes #8246 + +- curl_url_set.3: mention when CURLU_ALLOW_SPACE was added + +- tool_findfile: free mem properly + + Follow-up to 764e4f066d5 + + Closes #8242 + +- tool_findfile: check ~/.config/curlrc too + + ... after the initial checks for .curlrc and if XDG_CONFIG_HOME is not + set, use $HOME and $CURL_HOME to check if ~/.config/curlrc is present. + + Add test 436 to verify + + Reported-by: Sandro Jaeckel + Fixes #8208 + Closes #8213 + +- runtests: allow client/file to specify multiple directories + + ... and make sure to mkdir them all + +- scripts/copyright.pl: support many provided file names on the cmdline + +- [Fabian Keil brought this change] + + tests/FILEFORMAT.md: fix typo + +- [Fabian Keil brought this change] + + Add test373: multiple chunks with binary zeros + +- [Fabian Keil brought this change] + + Add test372: binary zero in data element + +- [Fabian Keil brought this change] + + tests/server/getpart.c: properly deal with binary data containing NUL bytes + +- [Fabian Keil brought this change] + + runtests.pl: properly print the test if it contains binary zeros + +- mailmap: Xiaoke Wang + +- openssl: copyright year update + + Follow-up to 30aea2b1ede + +- scripts/copyright.pl: hush unless -v (for verbose) is used + +- [Xiaoke Wang brought this change] + + openssl: check the return value of BIO_new_mem_buf() + + Closes #8233 + +- examples/multi-app.c: call curl_multi_remove_handle as well + + Fixes #8234 + Reported-by: Melroy van den Berg + Closes #8236 + +- COPYING: bump copyright year range + +- RELEASE-NOTES: synced + + and bump curlver after release + +- docs: fix mandoc -T lint formatting complaints + + Closes #8228 + +- next.d. remove .fi/.nf as they are handled by gen.pl + + Closes #8228 + +- gen.pl: terminate "example" sections better + + If the example (section that is prefixed with spaces) ends the + description gen.pl would previously miss to output the terminating .fi + + Closes #8228 + +- [Satadru Pramanik brought this change] + + curl-functions.m4: fix LIBRARY_PATH adjustment to avoid eval + + $$ usage in a m4 file introduces the PID in linux. + Instead, just duplicate previous working code with a case switch. + + Fixes #8229 + Closes #8230 + +Version 7.81.0 (5 Jan 2022) + +Daniel Stenberg (5 Jan 2022) +- RELEASE-NOTES: synced + + curl 7.81.0 release + +- THANKS: add names from 7.81.0 release + +- curl_multi_init.3: fix the copyright year range + +- test719-721: require "proxy" feature present to run + + Bug: https://github.com/curl/curl/pull/8223#issuecomment-1005188696 + Reported-by: Marc Hörsken + + Closes #8226 + +- test719: require ipv6 support to run + + Follow-up to effd2bd7ba2a5fd244 + Reported-by: Marc Hörsken + Bug: https://github.com/curl/curl/pull/8217#issuecomment-1004681145 + + Closes #8223 + +- test719-721: verify SOCKS details + + Using the new verify/socks details + +- runtests: add verify/socks check + + If used, this data is compared with the data in log/socksd-request.log + which the socksd server logs. + + Added to FILEFORMAT.md + +- server/socksd: log atyp + address in a separate log + + To allow the test suite to verify that the right data arrived + +- socks5: use appropriate ATYP for numerical IP address host names + + When not resolving the address locallly (known as socks5h). + + Add test 719 and 720 to verify. + + Reported-by: Peter Piekarski + Fixes #8216 + Closes #8217 + +Jay Satiro (3 Jan 2022) +- curl_multi_init.3: fix EXAMPLE formatting + +Daniel Stenberg (3 Jan 2022) +- RELEASE-NOTES: synced + +- libtest: avoid "assignment within conditional expression" + + In lib530, lib540 and lib582 + + Closes #8218 + +- ftp: disable warning 4706 in MSVC + + Follow-up to 21248e052d + + Disabling "assignment within conditional expression" for MSVC needs to + be done before the function starts, for it to take effect. + + Closes #8218 + +- tool_operate: warn if too many output arguments were found + + More output instructions than URLs is likely a user error. + + Add test case 371 to verify + + Closes #8210 + +- .github/workflows/mbedtls.yml: bump to mbedtls 3.1.0 + + Closes #8215 + +- zuul: remove the mbedtls jobs + + Now running as github workflows + + Closes #8215 + +- github/workflows: add mbedtls and mbedtls-clang + + Closes #8215 + +- [Valentin Richter brought this change] + + mbedtls: fix private member designations for v3.1.0 + + "As a last resort, you can access the field foo of a structure bar by + writing bar.MBEDTLS_PRIVATE(foo). Note that you do so at your own risk, + since such code is likely to break in a future minor version of Mbed + TLS." - + https://github.com/ARMmbed/mbedtls/blob/f2d1199edc5834df4297f247f213e614f7782d1d/docs/3.0-migration-guide.md + + That future minor version is v3.1.0. I set the >= to == for the version + checks because v3.1.0 is a release, and I am not sure when the private + designation was reverted after v3.0.0. + + Closes #8214 + +- [Valentin Richter brought this change] + + cmake: prevent dev warning due to mismatched arg + + -- curl version=[7.81.0-DEV] + CMake Warning (dev) at /usr/share/cmake-3.22.1/Modules/FindPackageHandleStandardArgs.cmake:438 (message): + The package name passed to `find_package_handle_standard_args` (MBEDTLS) + does not match the name of the calling package (MbedTLS). This can lead to + problems in calling code that expects `find_package` result variables + (e.g., `_FOUND`) to follow a certain pattern. + Call Stack (most recent call first): + deps/curl/CMake/FindMbedTLS.cmake:31 (find_package_handle_standard_args) + deps/curl/CMakeLists.txt:473 (find_package) + This warning is for project developers. Use -Wno-dev to suppress it. + + Closes #8207 + +- urlapi: if possible, shorten given numerical IPv6 addresses + + Extended test 1560 to verify + + Closes #8206 + +- [Michał Antoniak brought this change] + + url: reduce ssl backend count for CURL_DISABLE_PROXY builds + + Closes #8212 + +- KNOWN_BUGS: "Trying local ports fails on Windows" + + Reported-by: gclinch on github + Closes #8112 + +- misc: update copyright year range + +- zuul: remove the wolfssl even more + + Follow-up to 1914465cf180d32b3d + +- examples/multi-single.c: remove WAITMS() + + As it isn't used. + + Reported-by: Melroy van den Berg + Fixes #8200 + Closes #8201 + +- gtls: add gnutls include for the session type + + Follow-up to 8fbd6feddfa5 to make it build more universally + +- m4/curl-compilers: tell clang -Wno-pointer-bool-conversion + + To hush compiler warnings we don't care for: error: address of function + 'X' will always evaluate to 'true' + + Fixes #8197 + Closes #8198 + +- http_proxy: don't close the socket (too early) + + ... and double-check in the OpenSSL shutdown that the socket is actually + still there before it is used. + + Fixes #8193 + Closes #8195 + + Reported-by: Leszek Kubik + +- ngtcp2: verify the server certificate for the gnutls case + + Closes #8178 + +- ngtcp2: verify the server cert on connect (quictls) + + Make ngtcp2+quictls correctly acknowledge `CURLOPT_SSL_VERIFYPEER` and + `CURLOPT_SSL_VERIFYHOST`. + + The name check now uses a function from lib/vtls/openssl.c which will + need attention for when TLS is not done by OpenSSL or is disabled while + QUIC is enabled. + + Possibly the servercert() function in openssl.c should be adjusted to be + able to use for both regular TLS and QUIC. + + Ref: #8173 + Closes #8178 + +- zuul: remove the wolfssl build + +- github workflow: add wolfssl + + Closes #8196 + +- [Nicolas Sterchele brought this change] + + zuul: fix quiche build pointing to wrong Cargo + + Fixes #8184 + Closes #8189 + +- checksrc: detect more kinds of NULL comparisons we avoid + + Co-authored-by: Jay Satiro + Closes #8180 + +- RELEASE-NOTES: synced + +- mesalink: remove the BACKEND define kludge + + Closes #8183 + +- schannel: remove the BACKEND define kludge + + Closes #8182 + +- gtls: check return code for gnutls_alpn_set_protocols + + Closes #8181 + +- [Stefan Huber brought this change] + + README: label the link to the support document + + Closes #8185 diff --git a/trunk/libs/libcurl/curl-7.x/CMake/CMakeConfigurableFile.in b/trunk/libs/libcurl/curl-7.x/CMake/CMakeConfigurableFile.in index 8ccd016a..b93e7539 100644 --- a/trunk/libs/libcurl/curl-7.x/CMake/CMakeConfigurableFile.in +++ b/trunk/libs/libcurl/curl-7.x/CMake/CMakeConfigurableFile.in @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,5 +18,7 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### @CMAKE_CONFIGURABLE_FILE_CONTENT@ diff --git a/trunk/libs/libcurl/curl-7.x/CMake/CurlSymbolHiding.cmake b/trunk/libs/libcurl/curl-7.x/CMake/CurlSymbolHiding.cmake index e99ea6f6..75215a12 100644 --- a/trunk/libs/libcurl/curl-7.x/CMake/CurlSymbolHiding.cmake +++ b/trunk/libs/libcurl/curl-7.x/CMake/CurlSymbolHiding.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### include(CheckCSourceCompiles) diff --git a/trunk/libs/libcurl/curl-7.x/CMake/CurlTests.c b/trunk/libs/libcurl/curl-7.x/CMake/CurlTests.c index e418146b..e55e3a62 100644 --- a/trunk/libs/libcurl/curl-7.x/CMake/CurlTests.c +++ b/trunk/libs/libcurl/curl-7.x/CMake/CurlTests.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * + * SPDX-License-Identifier: curl + * ***************************************************************************/ #ifdef TIME_WITH_SYS_TIME /* Time with sys/time test */ @@ -56,7 +58,7 @@ return 0; # define PLATFORM_AIX_V3 #endif /* */ -#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__) +#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) #error "O_NONBLOCK does not work on this platform" #endif @@ -229,10 +231,6 @@ int main () { ; return 0; } # include # ifdef HAVE_WINSOCK2_H # include -# else -# ifdef HAVE_WINSOCK_H -# include -# endif # endif #endif @@ -258,10 +256,6 @@ main () # include # ifdef HAVE_WINSOCK2_H # include -# else -# ifdef HAVE_WINSOCK_H -# include -# endif # endif #endif @@ -285,10 +279,6 @@ main () # include # ifdef HAVE_WINSOCK2_H # include -# else -# ifdef HAVE_WINSOCK_H -# include -# endif # endif #endif @@ -313,10 +303,6 @@ main () # include # ifdef HAVE_WINSOCK2_H # include -# else -# ifdef HAVE_WINSOCK_H -# include -# endif # endif #endif @@ -403,10 +389,6 @@ main () # include # ifdef HAVE_WINSOCK2_H # include -# else -# ifdef HAVE_WINSOCK_H -# include -# endif # endif #endif /* includes start */ @@ -534,3 +516,50 @@ main() { return 0; } #endif +#ifdef HAVE_ATOMIC +/* includes start */ +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_UNISTD_H +# include +#endif +#ifdef HAVE_STDATOMIC_H +# include +#endif +/* includes end */ + +int +main() { + _Atomic int i = 1; + i = 0; // Force an atomic-write operation. + return i; +} +#endif +#ifdef HAVE_WIN32_WINNT +/* includes start */ +#ifdef WIN32 +/* + * Don't include unneeded stuff in Windows headers to avoid compiler + * warnings and macro clashes. + * Make sure to define this macro before including any Windows headers. + */ +# ifndef WIN32_LEAN_AND_MEAN +# define WIN32_LEAN_AND_MEAN +# endif +# ifndef NOGDI +# define NOGDI +# endif +# include "../lib/setup-win32.h" +#endif +/* includes end */ + +#define enquote(x) #x +#define expand(x) enquote(x) +#pragma message("_WIN32_WINNT=" expand(_WIN32_WINNT)) + +int +main() { + return 0; +} +#endif diff --git a/trunk/libs/libcurl/curl-7.x/CMake/FindBearSSL.cmake b/trunk/libs/libcurl/curl-7.x/CMake/FindBearSSL.cmake index 9455f4ba..88d5e87a 100644 --- a/trunk/libs/libcurl/curl-7.x/CMake/FindBearSSL.cmake +++ b/trunk/libs/libcurl/curl-7.x/CMake/FindBearSSL.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### find_path(BEARSSL_INCLUDE_DIRS bearssl.h) diff --git a/trunk/libs/libcurl/curl-7.x/CMake/FindBrotli.cmake b/trunk/libs/libcurl/curl-7.x/CMake/FindBrotli.cmake index 0ed08550..833e1811 100644 --- a/trunk/libs/libcurl/curl-7.x/CMake/FindBrotli.cmake +++ b/trunk/libs/libcurl/curl-7.x/CMake/FindBrotli.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### include(FindPackageHandleStandardArgs) diff --git a/trunk/libs/libcurl/curl-7.x/CMake/FindCARES.cmake b/trunk/libs/libcurl/curl-7.x/CMake/FindCARES.cmake index 71806823..99cf31d9 100644 --- a/trunk/libs/libcurl/curl-7.x/CMake/FindCARES.cmake +++ b/trunk/libs/libcurl/curl-7.x/CMake/FindCARES.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### # - Find c-ares # Find the c-ares includes and library diff --git a/trunk/libs/libcurl/curl-7.x/CMake/FindGSS.cmake b/trunk/libs/libcurl/curl-7.x/CMake/FindGSS.cmake index 4e4747d6..ec2bd57b 100644 --- a/trunk/libs/libcurl/curl-7.x/CMake/FindGSS.cmake +++ b/trunk/libs/libcurl/curl-7.x/CMake/FindGSS.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### # - Try to find the GSS Kerberos library # Once done this will define diff --git a/trunk/libs/libcurl/curl-7.x/CMake/FindLibPSL.cmake b/trunk/libs/libcurl/curl-7.x/CMake/FindLibPSL.cmake new file mode 100644 index 00000000..66abdd79 --- /dev/null +++ b/trunk/libs/libcurl/curl-7.x/CMake/FindLibPSL.cmake @@ -0,0 +1,45 @@ +#*************************************************************************** +# _ _ ____ _ +# Project ___| | | | _ \| | +# / __| | | | |_) | | +# | (__| |_| | _ <| |___ +# \___|\___/|_| \_\_____| +# +# Copyright (C) 1998 - 2022, Daniel Stenberg, , 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 +# +########################################################################### +# - Try to find the libpsl library +# Once done this will define +# +# LIBPSL_FOUND - system has the libpsl library +# LIBPSL_INCLUDE_DIR - the libpsl include directory +# LIBPSL_LIBRARY - the libpsl library name + +find_path(LIBPSL_INCLUDE_DIR libpsl.h) + +find_library(LIBPSL_LIBRARY NAMES psl libpsl) + +if(LIBPSL_INCLUDE_DIR) + file(STRINGS "${LIBPSL_INCLUDE_DIR}/libpsl.h" libpsl_version_str REGEX "^#define[\t ]+PSL_VERSION[\t ]+\"(.*)\"") + string(REGEX REPLACE "^.*\"([^\"]+)\"" "\\1" LIBPSL_VERSION "${libpsl_version_str}") +endif() + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(LibPSL + REQUIRED_VARS LIBPSL_LIBRARY LIBPSL_INCLUDE_DIR + VERSION_VAR LIBPSL_VERSION) + +mark_as_advanced(LIBPSL_INCLUDE_DIR LIBPSL_LIBRARY) diff --git a/trunk/libs/libcurl/curl-7.x/CMake/FindLibSSH2.cmake b/trunk/libs/libcurl/curl-7.x/CMake/FindLibSSH2.cmake index ce46a408..0ec7f7e3 100644 --- a/trunk/libs/libcurl/curl-7.x/CMake/FindLibSSH2.cmake +++ b/trunk/libs/libcurl/curl-7.x/CMake/FindLibSSH2.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### # - Try to find the libssh2 library # Once done this will define diff --git a/trunk/libs/libcurl/curl-7.x/CMake/FindMSH3.cmake b/trunk/libs/libcurl/curl-7.x/CMake/FindMSH3.cmake new file mode 100644 index 00000000..96477e28 --- /dev/null +++ b/trunk/libs/libcurl/curl-7.x/CMake/FindMSH3.cmake @@ -0,0 +1,70 @@ +#*************************************************************************** +# _ _ ____ _ +# Project ___| | | | _ \| | +# / __| | | | |_) | | +# | (__| |_| | _ <| |___ +# \___|\___/|_| \_\_____| +# +# Copyright (C) 1998 - 2022, Daniel Stenberg, , 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 +# +########################################################################### + +#[=======================================================================[.rst: +FindMSH3 +---------- + +Find the msh3 library + +Result Variables +^^^^^^^^^^^^^^^^ + +``MSH3_FOUND`` + System has msh3 +``MSH3_INCLUDE_DIRS`` + The msh3 include directories. +``MSH3_LIBRARIES`` + The libraries needed to use msh3 +#]=======================================================================] +if(UNIX) + find_package(PkgConfig QUIET) + pkg_search_module(PC_MSH3 libmsh3) +endif() + +find_path(MSH3_INCLUDE_DIR msh3.h + HINTS + ${PC_MSH3_INCLUDEDIR} + ${PC_MSH3_INCLUDE_DIRS} +) + +find_library(MSH3_LIBRARY NAMES msh3 + HINTS + ${PC_MSH3_LIBDIR} + ${PC_MSH3_LIBRARY_DIRS} +) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(MSH3 + REQUIRED_VARS + MSH3_LIBRARY + MSH3_INCLUDE_DIR +) + +if(MSH3_FOUND) + set(MSH3_LIBRARIES ${MSH3_LIBRARY}) + set(MSH3_INCLUDE_DIRS ${MSH3_INCLUDE_DIR}) +endif() + +mark_as_advanced(MSH3_INCLUDE_DIRS MSH3_LIBRARIES) diff --git a/trunk/libs/libcurl/curl-7.x/CMake/FindMbedTLS.cmake b/trunk/libs/libcurl/curl-7.x/CMake/FindMbedTLS.cmake index 1746093d..fcd6717f 100644 --- a/trunk/libs/libcurl/curl-7.x/CMake/FindMbedTLS.cmake +++ b/trunk/libs/libcurl/curl-7.x/CMake/FindMbedTLS.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### find_path(MBEDTLS_INCLUDE_DIRS mbedtls/ssl.h) @@ -28,7 +30,7 @@ find_library(MBEDCRYPTO_LIBRARY mbedcrypto) set(MBEDTLS_LIBRARIES "${MBEDTLS_LIBRARY}" "${MBEDX509_LIBRARY}" "${MBEDCRYPTO_LIBRARY}") include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(MBEDTLS DEFAULT_MSG +find_package_handle_standard_args(MbedTLS DEFAULT_MSG MBEDTLS_INCLUDE_DIRS MBEDTLS_LIBRARY MBEDX509_LIBRARY MBEDCRYPTO_LIBRARY) mark_as_advanced(MBEDTLS_INCLUDE_DIRS MBEDTLS_LIBRARY MBEDX509_LIBRARY MBEDCRYPTO_LIBRARY) diff --git a/trunk/libs/libcurl/curl-7.x/CMake/FindNGHTTP2.cmake b/trunk/libs/libcurl/curl-7.x/CMake/FindNGHTTP2.cmake index 8614492b..6d70c4a0 100644 --- a/trunk/libs/libcurl/curl-7.x/CMake/FindNGHTTP2.cmake +++ b/trunk/libs/libcurl/curl-7.x/CMake/FindNGHTTP2.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### include(FindPackageHandleStandardArgs) diff --git a/trunk/libs/libcurl/curl-7.x/CMake/FindNGHTTP3.cmake b/trunk/libs/libcurl/curl-7.x/CMake/FindNGHTTP3.cmake index 643b6009..8d8ebc1b 100644 --- a/trunk/libs/libcurl/curl-7.x/CMake/FindNGHTTP3.cmake +++ b/trunk/libs/libcurl/curl-7.x/CMake/FindNGHTTP3.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### #[=======================================================================[.rst: diff --git a/trunk/libs/libcurl/curl-7.x/CMake/FindNGTCP2.cmake b/trunk/libs/libcurl/curl-7.x/CMake/FindNGTCP2.cmake index 5757009a..61e54c2d 100644 --- a/trunk/libs/libcurl/curl-7.x/CMake/FindNGTCP2.cmake +++ b/trunk/libs/libcurl/curl-7.x/CMake/FindNGTCP2.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### #[=======================================================================[.rst: @@ -69,7 +71,7 @@ endif() if(NGTCP2_FIND_COMPONENTS) set(NGTCP2_CRYPTO_BACKEND "") foreach(component IN LISTS NGTCP2_FIND_COMPONENTS) - if(component MATCHES "^(OpenSSL|GnuTLS)") + if(component MATCHES "^(BoringSSL|OpenSSL|GnuTLS)") if(NGTCP2_CRYPTO_BACKEND) message(FATAL_ERROR "NGTCP2: Only one crypto library can be selected") endif() diff --git a/trunk/libs/libcurl/curl-7.x/CMake/FindNSS.cmake b/trunk/libs/libcurl/curl-7.x/CMake/FindNSS.cmake index 899c6b07..6742dda8 100644 --- a/trunk/libs/libcurl/curl-7.x/CMake/FindNSS.cmake +++ b/trunk/libs/libcurl/curl-7.x/CMake/FindNSS.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### if(UNIX) find_package(PkgConfig QUIET) diff --git a/trunk/libs/libcurl/curl-7.x/CMake/FindQUICHE.cmake b/trunk/libs/libcurl/curl-7.x/CMake/FindQUICHE.cmake index 0247364d..fc47027d 100644 --- a/trunk/libs/libcurl/curl-7.x/CMake/FindQUICHE.cmake +++ b/trunk/libs/libcurl/curl-7.x/CMake/FindQUICHE.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### #[=======================================================================[.rst: diff --git a/trunk/libs/libcurl/curl-7.x/CMake/FindWolfSSL.cmake b/trunk/libs/libcurl/curl-7.x/CMake/FindWolfSSL.cmake index 42256b3c..986f01e0 100644 --- a/trunk/libs/libcurl/curl-7.x/CMake/FindWolfSSL.cmake +++ b/trunk/libs/libcurl/curl-7.x/CMake/FindWolfSSL.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### find_path(WolfSSL_INCLUDE_DIR NAMES wolfssl/ssl.h) find_library(WolfSSL_LIBRARY NAMES wolfssl) diff --git a/trunk/libs/libcurl/curl-7.x/CMake/FindZstd.cmake b/trunk/libs/libcurl/curl-7.x/CMake/FindZstd.cmake index eaba3974..2d654044 100644 --- a/trunk/libs/libcurl/curl-7.x/CMake/FindZstd.cmake +++ b/trunk/libs/libcurl/curl-7.x/CMake/FindZstd.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### #[=======================================================================[.rst: diff --git a/trunk/libs/libcurl/curl-7.x/CMake/Macros.cmake b/trunk/libs/libcurl/curl-7.x/CMake/Macros.cmake index d57dd6ad..4d7380eb 100644 --- a/trunk/libs/libcurl/curl-7.x/CMake/Macros.cmake +++ b/trunk/libs/libcurl/curl-7.x/CMake/Macros.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### #File defines convenience macros for available feature testing diff --git a/trunk/libs/libcurl/curl-7.x/CMake/OtherTests.cmake b/trunk/libs/libcurl/curl-7.x/CMake/OtherTests.cmake index 5cddf4af..9f62c9de 100644 --- a/trunk/libs/libcurl/curl-7.x/CMake/OtherTests.cmake +++ b/trunk/libs/libcurl/curl-7.x/CMake/OtherTests.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### include(CheckCSourceCompiles) # The begin of the sources (macros and includes) @@ -33,7 +35,6 @@ set(signature_call_conv) if(HAVE_WINDOWS_H) add_header_include(HAVE_WINSOCK2_H "winsock2.h") add_header_include(HAVE_WINDOWS_H "windows.h") - add_header_include(HAVE_WINSOCK_H "winsock.h") set(_source_epilogue "${_source_epilogue}\n#ifndef WIN32_LEAN_AND_MEAN\n#define WIN32_LEAN_AND_MEAN\n#endif") set(signature_call_conv "PASCAL") @@ -237,8 +238,8 @@ endif() unset(CMAKE_TRY_COMPILE_TARGET_TYPE) if(NOT DEFINED CMAKE_TOOLCHAIN_FILE) - if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - # only try this on non-macOS + if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "iOS") + # only try this on non-apple platforms # if not cross-compilation... include(CheckCSourceRuns) diff --git a/trunk/libs/libcurl/curl-7.x/CMake/Platforms/WindowsCache.cmake b/trunk/libs/libcurl/curl-7.x/CMake/Platforms/WindowsCache.cmake index fb803f8a..dc589ca9 100644 --- a/trunk/libs/libcurl/curl-7.x/CMake/Platforms/WindowsCache.cmake +++ b/trunk/libs/libcurl/curl-7.x/CMake/Platforms/WindowsCache.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,36 +18,26 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### if(NOT UNIX) if(WIN32) - set(HAVE_LIBDL 0) - set(HAVE_LIBUCB 0) set(HAVE_LIBSOCKET 0) - set(NOT_NEED_LIBNSL 0) - set(HAVE_LIBNSL 0) set(HAVE_GETHOSTNAME 1) set(HAVE_LIBZ 0) - set(HAVE_DLOPEN 0) - - set(HAVE_ALLOCA_H 0) set(HAVE_ARPA_INET_H 0) - set(HAVE_DLFCN_H 0) set(HAVE_FCNTL_H 1) set(HAVE_INTTYPES_H 0) set(HAVE_IO_H 1) - set(HAVE_MALLOC_H 1) - set(HAVE_MEMORY_H 1) set(HAVE_NETDB_H 0) - set(HAVE_NETINET_IF_ETHER_H 0) set(HAVE_NETINET_IN_H 0) set(HAVE_NET_IF_H 0) set(HAVE_PROCESS_H 1) set(HAVE_PWD_H 0) set(HAVE_SETJMP_H 1) set(HAVE_SIGNAL_H 1) - set(HAVE_SOCKIO_H 0) set(HAVE_STDINT_H 0) set(HAVE_STDLIB_H 1) set(HAVE_STRINGS_H 0) @@ -66,38 +56,24 @@ if(NOT UNIX) set(HAVE_TIME_H 1) set(HAVE_UNISTD_H 0) set(HAVE_UTIME_H 0) - set(HAVE_X509_H 0) set(HAVE_ZLIB_H 0) - set(HAVE_SIZEOF_LONG_DOUBLE 1) - set(SIZEOF_LONG_DOUBLE 8) - set(HAVE_SOCKET 1) - set(HAVE_POLL 0) set(HAVE_SELECT 1) set(HAVE_STRDUP 1) - set(HAVE_STRSTR 1) set(HAVE_STRTOK_R 0) - set(HAVE_STRFTIME 1) - set(HAVE_UNAME 0) set(HAVE_STRCASECMP 0) set(HAVE_STRICMP 1) set(HAVE_STRCMPI 1) set(HAVE_GETTIMEOFDAY 0) - set(HAVE_INET_ADDR 1) set(HAVE_CLOSESOCKET 1) - set(HAVE_SETVBUF 0) set(HAVE_SIGSETJMP 0) set(HAVE_GETPASS_R 0) - set(HAVE_STRLCAT 0) set(HAVE_GETPWUID 0) set(HAVE_GETEUID 0) set(HAVE_UTIME 1) set(HAVE_RAND_EGD 0) - set(HAVE_RAND_SCREEN 0) - set(HAVE_RAND_STATUS 0) set(HAVE_GMTIME_R 0) - set(HAVE_LOCALTIME_R 0) set(HAVE_GETHOSTBYNAME_R 0) set(HAVE_SIGNAL_FUNC 1) set(HAVE_SIGNAL_MACRO 0) diff --git a/trunk/libs/libcurl/curl-7.x/CMake/Utilities.cmake b/trunk/libs/libcurl/curl-7.x/CMake/Utilities.cmake index 8f9b861b..78bfd6ff 100644 --- a/trunk/libs/libcurl/curl-7.x/CMake/Utilities.cmake +++ b/trunk/libs/libcurl/curl-7.x/CMake/Utilities.cmake @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### # File containing various utilities diff --git a/trunk/libs/libcurl/curl-7.x/CMake/cmake_uninstall.cmake.in b/trunk/libs/libcurl/curl-7.x/CMake/cmake_uninstall.cmake.in index e96c1432..55801f50 100644 --- a/trunk/libs/libcurl/curl-7.x/CMake/cmake_uninstall.cmake.in +++ b/trunk/libs/libcurl/curl-7.x/CMake/cmake_uninstall.cmake.in @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### if(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") message(FATAL_ERROR "Cannot find install manifest: @CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt") diff --git a/trunk/libs/libcurl/curl-7.x/CMake/curl-config.cmake.in b/trunk/libs/libcurl/curl-7.x/CMake/curl-config.cmake.in index 957148ec..496a92d0 100644 --- a/trunk/libs/libcurl/curl-7.x/CMake/curl-config.cmake.in +++ b/trunk/libs/libcurl/curl-7.x/CMake/curl-config.cmake.in @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### @PACKAGE_INIT@ diff --git a/trunk/libs/libcurl/curl-7.x/CMakeLists.txt b/trunk/libs/libcurl/curl-7.x/CMakeLists.txt index d8084de8..f8cdf1aa 100644 --- a/trunk/libs/libcurl/curl-7.x/CMakeLists.txt +++ b/trunk/libs/libcurl/curl-7.x/CMakeLists.txt @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### # curl/libcurl CMake script # by Tetetest and Sukender (Benoit Neil) @@ -65,7 +67,11 @@ message(STATUS "curl version=[${CURL_VERSION}]") # SET(PACKAGE_STRING "curl-") # SET(PACKAGE_BUGREPORT "a suitable curl mailing list => https://curl.se/mail/") set(OPERATING_SYSTEM "${CMAKE_SYSTEM_NAME}") -set(OS "\"${CMAKE_SYSTEM_NAME}\"") +if(CMAKE_C_COMPILER_TARGET) + set(OS "\"${CMAKE_C_COMPILER_TARGET}\"") +else() + set(OS "\"${CMAKE_SYSTEM_NAME}\"") +endif() include_directories(${CURL_SOURCE_DIR}/include) @@ -76,20 +82,11 @@ option(BUILD_SHARED_LIBS "Build shared libraries" ON) option(ENABLE_ARES "Set to ON to enable c-ares support" OFF) if(WIN32) option(CURL_STATIC_CRT "Set to ON to build libcurl with static CRT on Windows (/MT)." OFF) - option(ENABLE_INET_PTON "Set to OFF to prevent usage of inet_pton when building against modern SDKs while still requiring compatibility with older Windows versions, such as Windows XP, Windows Server 2003 etc." ON) option(ENABLE_UNICODE "Set to ON to use the Unicode version of the Windows API functions" OFF) set(CURL_TARGET_WINDOWS_VERSION "" CACHE STRING "Minimum target Windows version as hex string") if(CURL_TARGET_WINDOWS_VERSION) add_definitions(-D_WIN32_WINNT=${CURL_TARGET_WINDOWS_VERSION}) set(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -D_WIN32_WINNT=${CURL_TARGET_WINDOWS_VERSION}") - elseif(ENABLE_INET_PTON) - # _WIN32_WINNT_VISTA (0x0600) - add_definitions(-D_WIN32_WINNT=0x0600) - set(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -D_WIN32_WINNT=0x0600") - else() - # _WIN32_WINNT_WINXP (0x0501) - add_definitions(-D_WIN32_WINNT=0x0501) - set(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -D_WIN32_WINNT=0x0501") endif() if(ENABLE_UNICODE) add_definitions(-DUNICODE -D_UNICODE) @@ -109,7 +106,7 @@ option(ENABLE_CURLDEBUG "Set to ON to build with TrackMemory feature enabled" OF if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG) if(PICKY_COMPILER) - foreach(_CCOPT -pedantic -Wall -W -Wpointer-arith -Wwrite-strings -Wunused -Wshadow -Winline -Wnested-externs -Wmissing-declarations -Wmissing-prototypes -Wfloat-equal -Wsign-compare -Wundef -Wendif-labels -Wstrict-prototypes -Wdeclaration-after-statement -Wstrict-aliasing=3 -Wcast-align -Wtype-limits -Wold-style-declaration -Wmissing-parameter-type -Wempty-body -Wclobbered -Wignored-qualifiers -Wconversion -Wvla -Wdouble-promotion) + foreach(_CCOPT -pedantic -Wall -W -Wpointer-arith -Wwrite-strings -Wunused -Wshadow -Winline -Wnested-externs -Wmissing-declarations -Wmissing-prototypes -Wfloat-equal -Wsign-compare -Wundef -Wendif-labels -Wstrict-prototypes -Wdeclaration-after-statement -Wstrict-aliasing=3 -Wcast-align -Wtype-limits -Wold-style-declaration -Wmissing-parameter-type -Wempty-body -Wclobbered -Wignored-qualifiers -Wconversion -Wvla -Wdouble-promotion -Wenum-conversion -Warith-conversion) # surprisingly, CHECK_C_COMPILER_FLAG needs a new variable to store each new # test result in. string(MAKE_C_IDENTIFIER "OPT${_CCOPT}" _optvarname) @@ -259,6 +256,17 @@ if(ENABLE_IPV6 AND NOT WIN32) set(ENABLE_IPV6 OFF CACHE BOOL "Define if you want to enable IPv6 support" FORCE) endif() + + if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT ENABLE_ARES) + set(use_core_foundation ON) + + find_library(SYSTEMCONFIGURATION_FRAMEWORK "SystemConfiguration") + if(NOT SYSTEMCONFIGURATION_FRAMEWORK) + message(FATAL_ERROR "SystemConfiguration framework not found") + endif() + + list(APPEND CURL_LIBS "-framework SystemConfiguration") + endif() endif() if(USE_MANUAL) @@ -319,20 +327,7 @@ if(ENABLE_THREADED_RESOLVER) endif() # Check for all needed libraries -check_library_exists_concat("${CMAKE_DL_LIBS}" dlopen HAVE_LIBDL) check_library_exists_concat("socket" connect HAVE_LIBSOCKET) -check_library_exists("c" gethostbyname "" NOT_NEED_LIBNSL) - -# Yellowtab Zeta needs different libraries than BeOS 5. -if(BEOS) - set(NOT_NEED_LIBNSL 1) - check_library_exists_concat("bind" gethostbyname HAVE_LIBBIND) - check_library_exists_concat("bnetapi" closesocket HAVE_LIBBNETAPI) -endif() - -if(NOT NOT_NEED_LIBNSL) - check_library_exists_concat("nsl" gethostbyname HAVE_LIBNSL) -endif() check_function_exists(gethostname HAVE_GETHOSTNAME) @@ -341,85 +336,94 @@ if(WIN32) check_library_exists_concat("winmm" getch HAVE_LIBWINMM) endif() -# check SSL libraries -# TODO support GnuTLS +# This check below for use of deprecated symbols is only temporary and is to +# be removed again after a year's service. Remove after November 25, 2022. +set(CURL_RECONFIG_REQUIRED 0) +foreach(_LIB GSSAPI OPENLDAP LIBSSH LIBSSH2 BEARSSL MBEDTLS NSS OPENSSL + SCHANNEL SECTRANSP WOLFSSL) + if(CMAKE_USE_${_LIB}) + set(CURL_RECONFIG_REQUIRED 1) + message(SEND_ERROR "The option CMAKE_USE_${_LIB} was renamed to CURL_USE_${_LIB}.") + endif() +endforeach() if(CMAKE_USE_WINSSL) - message(FATAL_ERROR "The cmake option CMAKE_USE_WINSSL was renamed to CMAKE_USE_SCHANNEL.") + set(CURL_RECONFIG_REQUIRED 1) + message(SEND_ERROR "The option CMAKE_USE_WINSSL was renamed to CURL_USE_SCHANNEL.") +endif() +if(CURL_RECONFIG_REQUIRED) + message(FATAL_ERROR "Reconfig required") endif() +# check SSL libraries +# TODO support GnuTLS +option(CURL_ENABLE_SSL "Enable SSL support" ON) + if(APPLE) - option(CMAKE_USE_SECTRANSP "enable Apple OS native SSL/TLS" OFF) + cmake_dependent_option(CURL_USE_SECTRANSP "enable Apple OS native SSL/TLS" OFF CURL_ENABLE_SSL OFF) endif() if(WIN32) - option(CMAKE_USE_SCHANNEL "enable Windows native SSL/TLS" OFF) + cmake_dependent_option(CURL_USE_SCHANNEL "enable Windows native SSL/TLS" OFF CURL_ENABLE_SSL OFF) cmake_dependent_option(CURL_WINDOWS_SSPI "Use windows libraries to allow NTLM authentication without openssl" ON - CMAKE_USE_SCHANNEL OFF) + CURL_USE_SCHANNEL OFF) endif() -option(CMAKE_USE_MBEDTLS "Enable mbedTLS for SSL/TLS" OFF) -option(CMAKE_USE_BEARSSL "Enable BearSSL for SSL/TLS" OFF) -option(CMAKE_USE_NSS "Enable NSS for SSL/TLS" OFF) -option(CMAKE_USE_WOLFSSL "enable wolfSSL for SSL/TLS" OFF) +cmake_dependent_option(CURL_USE_MBEDTLS "Enable mbedTLS for SSL/TLS" OFF CURL_ENABLE_SSL OFF) +cmake_dependent_option(CURL_USE_BEARSSL "Enable BearSSL for SSL/TLS" OFF CURL_ENABLE_SSL OFF) +cmake_dependent_option(CURL_USE_NSS "Enable NSS for SSL/TLS" OFF CURL_ENABLE_SSL OFF) +cmake_dependent_option(CURL_USE_WOLFSSL "enable wolfSSL for SSL/TLS" OFF CURL_ENABLE_SSL OFF) set(openssl_default ON) -if(WIN32 OR CMAKE_USE_SECTRANSP OR CMAKE_USE_SCHANNEL OR CMAKE_USE_MBEDTLS OR CMAKE_USE_NSS OR CMAKE_USE_WOLFSSL) +if(WIN32 OR CURL_USE_SECTRANSP OR CURL_USE_SCHANNEL OR CURL_USE_MBEDTLS OR CURL_USE_NSS OR CURL_USE_WOLFSSL) set(openssl_default OFF) endif() -option(CMAKE_USE_OPENSSL "Use OpenSSL code. Experimental" ${openssl_default}) +cmake_dependent_option(CURL_USE_OPENSSL "Use OpenSSL code. Experimental" ${openssl_default} CURL_ENABLE_SSL OFF) option(CURL_DISABLE_OPENSSL_AUTO_LOAD_CONFIG "Disable automatic loading of OpenSSL configuration" OFF) count_true(enabled_ssl_options_count - CMAKE_USE_SCHANNEL - CMAKE_USE_SECTRANSP - CMAKE_USE_OPENSSL - CMAKE_USE_MBEDTLS - CMAKE_USE_BEARSSL - CMAKE_USE_NSS - CMAKE_USE_WOLFSSL + CURL_USE_SCHANNEL + CURL_USE_SECTRANSP + CURL_USE_OPENSSL + CURL_USE_MBEDTLS + CURL_USE_BEARSSL + CURL_USE_NSS + CURL_USE_WOLFSSL ) if(enabled_ssl_options_count GREATER "1") set(CURL_WITH_MULTI_SSL ON) endif() -if(CMAKE_USE_SCHANNEL) +if(CURL_USE_SCHANNEL) set(SSL_ENABLED ON) set(USE_SCHANNEL ON) # Windows native SSL/TLS support - set(USE_WINDOWS_SSPI ON) # CMAKE_USE_SCHANNEL implies CURL_WINDOWS_SSPI + set(USE_WINDOWS_SSPI ON) # CURL_USE_SCHANNEL implies CURL_WINDOWS_SSPI endif() if(CURL_WINDOWS_SSPI) set(USE_WINDOWS_SSPI ON) set(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -DSECURITY_WIN32") endif() -if(CMAKE_USE_DARWINSSL) - message(FATAL_ERROR "The cmake option CMAKE_USE_DARWINSSL was renamed to CMAKE_USE_SECTRANSP.") +if(CURL_USE_SECTRANSP) + set(use_core_foundation ON) + + find_library(SECURITY_FRAMEWORK "Security") + if(NOT SECURITY_FRAMEWORK) + message(FATAL_ERROR "Security framework not found") + endif() + + set(SSL_ENABLED ON) + set(USE_SECTRANSP ON) + list(APPEND CURL_LIBS "-framework Security") endif() -if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") +if(use_core_foundation) find_library(COREFOUNDATION_FRAMEWORK "CoreFoundation") if(NOT COREFOUNDATION_FRAMEWORK) message(FATAL_ERROR "CoreFoundation framework not found") endif() - find_library(SYSTEMCONFIGURATION_FRAMEWORK "SystemConfiguration") - if(NOT SYSTEMCONFIGURATION_FRAMEWORK) - message(FATAL_ERROR "SystemConfiguration framework not found") - endif() - - list(APPEND CURL_LIBS "-framework CoreFoundation" "-framework SystemConfiguration") - - if(CMAKE_USE_SECTRANSP) - find_library(SECURITY_FRAMEWORK "Security") - if(NOT SECURITY_FRAMEWORK) - message(FATAL_ERROR "Security framework not found") - endif() - - set(SSL_ENABLED ON) - set(USE_SECTRANSP ON) - list(APPEND CURL_LIBS "-framework Security") - endif() + list(APPEND CURL_LIBS "-framework CoreFoundation") endif() -if(CMAKE_USE_OPENSSL) +if(CURL_USE_OPENSSL) find_package(OpenSSL REQUIRED) set(SSL_ENABLED ON) set(USE_OPENSSL ON) @@ -435,19 +439,13 @@ if(CMAKE_USE_OPENSSL) endif() set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIR}) - check_include_file("openssl/crypto.h" HAVE_OPENSSL_CRYPTO_H) - check_include_file("openssl/err.h" HAVE_OPENSSL_ERR_H) - check_include_file("openssl/pem.h" HAVE_OPENSSL_PEM_H) - check_include_file("openssl/rsa.h" HAVE_OPENSSL_RSA_H) - check_include_file("openssl/ssl.h" HAVE_OPENSSL_SSL_H) - check_include_file("openssl/x509.h" HAVE_OPENSSL_X509_H) - check_include_file("openssl/rand.h" HAVE_OPENSSL_RAND_H) - check_symbol_exists(RAND_status "${CURL_INCLUDES}" HAVE_RAND_STATUS) - check_symbol_exists(RAND_screen "${CURL_INCLUDES}" HAVE_RAND_SCREEN) - check_symbol_exists(RAND_egd "${CURL_INCLUDES}" HAVE_RAND_EGD) -endif() - -if(CMAKE_USE_MBEDTLS) + check_symbol_exists(RAND_egd "${CURL_INCLUDES}" HAVE_RAND_EGD) + check_symbol_exists(OPENSSL_IS_BORINGSSL "openssl/base.h" HAVE_BORINGSSL) + + add_definitions(-DOPENSSL_SUPPRESS_DEPRECATED) +endif() + +if(CURL_USE_MBEDTLS) find_package(MbedTLS REQUIRED) set(SSL_ENABLED ON) set(USE_MBEDTLS ON) @@ -455,7 +453,7 @@ if(CMAKE_USE_MBEDTLS) include_directories(${MBEDTLS_INCLUDE_DIRS}) endif() -if(CMAKE_USE_BEARSSL) +if(CURL_USE_BEARSSL) find_package(BearSSL REQUIRED) set(SSL_ENABLED ON) set(USE_BEARSSL ON) @@ -463,7 +461,7 @@ if(CMAKE_USE_BEARSSL) include_directories(${BEARSSL_INCLUDE_DIRS}) endif() -if(CMAKE_USE_WOLFSSL) +if(CURL_USE_WOLFSSL) find_package(WolfSSL REQUIRED) set(SSL_ENABLED ON) set(USE_WOLFSSL ON) @@ -471,7 +469,7 @@ if(CMAKE_USE_WOLFSSL) include_directories(${WolfSSL_INCLUDE_DIRS}) endif() -if(CMAKE_USE_NSS) +if(CURL_USE_NSS) find_package(NSS REQUIRED) include_directories(${NSS_INCLUDE_DIRS}) list(APPEND CURL_LIBS ${NSS_LIBRARIES}) @@ -498,7 +496,7 @@ function(CheckQuicSupportInOpenSSL) set(CMAKE_REQUIRED_LIBRARIES "${OPENSSL_LIBRARIES}") check_symbol_exists(SSL_CTX_set_quic_method "openssl/ssl.h" HAVE_SSL_CTX_SET_QUIC_METHOD) if(NOT HAVE_SSL_CTX_SET_QUIC_METHOD) - message(FATAL_ERROR "QUIC support is missing in OpenSSL/boringssl. Try setting -DOPENSSL_ROOT_DIR") + message(FATAL_ERROR "QUIC support is missing in OpenSSL/BoringSSL. Try setting -DOPENSSL_ROOT_DIR") endif() cmake_pop_check_state() endfunction() @@ -506,7 +504,11 @@ endfunction() option(USE_NGTCP2 "Use ngtcp2 and nghttp3 libraries for HTTP/3 support" OFF) if(USE_NGTCP2) if(USE_OPENSSL) - find_package(NGTCP2 REQUIRED OpenSSL) + if(HAVE_BORINGSSL) + find_package(NGTCP2 REQUIRED BoringSSL) + else() + find_package(NGTCP2 REQUIRED OpenSSL) + endif() CheckQuicSupportInOpenSSL() elseif(USE_GNUTLS) # TODO add GnuTLS support as vtls library. @@ -541,6 +543,16 @@ if(USE_QUICHE) cmake_pop_check_state() endif() +option(USE_MSH3 "Use msquic library for HTTP/3 support" OFF) +if(USE_MSH3) + if(USE_NGTCP2 OR USE_QUICHE) + message(FATAL_ERROR "Only one HTTP/3 backend can be selected!") + endif() + set(USE_MSH3 ON) + include_directories(${MSH3_INCLUDE_DIRS}) + list(APPEND CURL_LIBS ${MSH3_LIBRARIES}) +endif() + if(NOT CURL_DISABLE_LDAP) if(WIN32) option(USE_WIN32_LDAP "Use Windows LDAP implementation" ON) @@ -552,19 +564,18 @@ if(NOT CURL_DISABLE_LDAP) endif() endif() - option(CMAKE_USE_OPENLDAP "Use OpenLDAP code." OFF) - mark_as_advanced(CMAKE_USE_OPENLDAP) + option(CURL_USE_OPENLDAP "Use OpenLDAP code." OFF) + mark_as_advanced(CURL_USE_OPENLDAP) set(CMAKE_LDAP_LIB "ldap" CACHE STRING "Name or full path to ldap library") set(CMAKE_LBER_LIB "lber" CACHE STRING "Name or full path to lber library") - if(CMAKE_USE_OPENLDAP AND USE_WIN32_LDAP) - message(FATAL_ERROR "Cannot use USE_WIN32_LDAP and CMAKE_USE_OPENLDAP at the same time") + if(CURL_USE_OPENLDAP AND USE_WIN32_LDAP) + message(FATAL_ERROR "Cannot use USE_WIN32_LDAP and CURL_USE_OPENLDAP at the same time") endif() # Now that we know, we're not using windows LDAP... if(USE_WIN32_LDAP) check_include_file_concat("winldap.h" HAVE_WINLDAP_H) - check_include_file_concat("winber.h" HAVE_WINBER_H) else() # Check for LDAP set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES}) @@ -588,7 +599,7 @@ if(NOT CURL_DISABLE_LDAP) set(CURL_DISABLE_LDAP ON CACHE BOOL "" FORCE) set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES_BAK}) #LDAP includes won't be used else() - if(CMAKE_USE_OPENLDAP) + if(CURL_USE_OPENLDAP) set(USE_OPENLDAP ON) endif() if(CMAKE_LDAP_INCLUDE_DIR) @@ -647,27 +658,24 @@ endif() if(NOT CURL_DISABLE_LDAPS) check_include_file_concat("ldap_ssl.h" HAVE_LDAP_SSL_H) - check_include_file_concat("ldapssl.h" HAVE_LDAPSSL_H) endif() -# Check for idn +# Check for idn2 option(USE_LIBIDN2 "Use libidn2 for IDN support" ON) -set(HAVE_LIBIDN2 OFF) if(USE_LIBIDN2) check_library_exists_concat("idn2" idn2_lookup_ul HAVE_LIBIDN2) +else() + set(HAVE_LIBIDN2 OFF) endif() if(WIN32) option(USE_WIN32_IDN "Use WinIDN for IDN support" OFF) if(USE_WIN32_IDN) - list(APPEND CURL_LIBS "Normaliz") + list(APPEND CURL_LIBS "normaliz") set(WANT_IDN_PROTOTYPES ON) endif() endif() -# Check for symbol dlopen (same as HAVE_LIBDL) -check_library_exists("${CURL_LIBS}" dlopen "" HAVE_DLOPEN) - set(HAVE_LIBZ OFF) set(HAVE_ZLIB_H OFF) set(USE_ZLIB OFF) @@ -717,14 +725,39 @@ if(CURL_ZSTD) endif() endif() +#libpsl +option(CURL_USE_LIBPSL "Use libPSL" ON) +mark_as_advanced(CURL_USE_LIBPSL) +set(USE_LIBPSL OFF) +set(HAVE_LIBPSL OFF) +set(HAVE_LIBSPSL_H OFF) + +if(CURL_USE_LIBPSL) + find_package(LibPSL) + if(LIBPSL_FOUND) + list(APPEND CURL_LIBS ${LIBPSL_LIBRARY}) + set(CMAKE_REQUIRED_LIBRARIES ${LIBPSL_LIBRARY}) + list(APPEND CMAKE_REQUIRED_INCLUDES "${LIBPSL_INCLUDE_DIR}") + include_directories("${LIBPSL_INCLUDE_DIR}") + set(HAVE_LIBPSL ON) + set(USE_LIBPSL ON) + + # find_package has already found the headers + set(HAVE_LIBPSL_H ON) + set(CURL_INCLUDES ${CURL_INCLUDES} "${LIBPSL_INCLUDE_DIR}/libpsl.h") + set(CURL_TEST_DEFINES "${CURL_TEST_DEFINES} -DHAVE_LIBPSL_H") + unset(CMAKE_REQUIRED_LIBRARIES) + endif() +endif() + #libSSH2 -option(CMAKE_USE_LIBSSH2 "Use libSSH2" ON) -mark_as_advanced(CMAKE_USE_LIBSSH2) +option(CURL_USE_LIBSSH2 "Use libSSH2" ON) +mark_as_advanced(CURL_USE_LIBSSH2) set(USE_LIBSSH2 OFF) set(HAVE_LIBSSH2 OFF) set(HAVE_LIBSSH2_H OFF) -if(CMAKE_USE_LIBSSH2) +if(CURL_USE_LIBSSH2) find_package(LibSSH2) if(LIBSSH2_FOUND) list(APPEND CURL_LIBS ${LIBSSH2_LIBRARY}) @@ -743,9 +776,9 @@ if(CMAKE_USE_LIBSSH2) endif() # libssh -option(CMAKE_USE_LIBSSH "Use libSSH" OFF) -mark_as_advanced(CMAKE_USE_LIBSSH) -if(NOT HAVE_LIBSSH2 AND CMAKE_USE_LIBSSH) +option(CURL_USE_LIBSSH "Use libSSH" OFF) +mark_as_advanced(CURL_USE_LIBSSH) +if(NOT HAVE_LIBSSH2 AND CURL_USE_LIBSSH) find_package(libssh CONFIG) if(libssh_FOUND) message(STATUS "Found libssh ${libssh_VERSION}") @@ -756,10 +789,10 @@ if(NOT HAVE_LIBSSH2 AND CMAKE_USE_LIBSSH) endif() endif() -option(CMAKE_USE_GSSAPI "Use GSSAPI implementation (right now only Heimdal is supported with CMake build)" OFF) -mark_as_advanced(CMAKE_USE_GSSAPI) +option(CURL_USE_GSSAPI "Use GSSAPI implementation (right now only Heimdal is supported with CMake build)" OFF) +mark_as_advanced(CURL_USE_GSSAPI) -if(CMAKE_USE_GSSAPI) +if(CURL_USE_GSSAPI) find_package(GSS) set(HAVE_GSSAPI ${GSS_FOUND}) @@ -908,13 +941,11 @@ endif() # Check for header files if(NOT UNIX) check_include_file_concat("windows.h" HAVE_WINDOWS_H) - check_include_file_concat("winsock.h" HAVE_WINSOCK_H) check_include_file_concat("ws2tcpip.h" HAVE_WS2TCPIP_H) check_include_file_concat("winsock2.h" HAVE_WINSOCK2_H) check_include_file_concat("wincrypt.h" HAVE_WINCRYPT_H) endif() -check_include_file_concat("stdio.h" HAVE_STDIO_H) check_include_file_concat("inttypes.h" HAVE_INTTYPES_H) check_include_file_concat("sys/filio.h" HAVE_SYS_FILIO_H) check_include_file_concat("sys/ioctl.h" HAVE_SYS_IOCTL_H) @@ -927,11 +958,9 @@ check_include_file_concat("sys/sockio.h" HAVE_SYS_SOCKIO_H) check_include_file_concat("sys/stat.h" HAVE_SYS_STAT_H) check_include_file_concat("sys/time.h" HAVE_SYS_TIME_H) check_include_file_concat("sys/types.h" HAVE_SYS_TYPES_H) -check_include_file_concat("sys/uio.h" HAVE_SYS_UIO_H) check_include_file_concat("sys/un.h" HAVE_SYS_UN_H) check_include_file_concat("sys/utime.h" HAVE_SYS_UTIME_H) check_include_file_concat("sys/xattr.h" HAVE_SYS_XATTR_H) -check_include_file_concat("alloca.h" HAVE_ALLOCA_H) check_include_file_concat("arpa/inet.h" HAVE_ARPA_INET_H) check_include_file_concat("arpa/tftp.h" HAVE_ARPA_TFTP_H) check_include_file_concat("assert.h" HAVE_ASSERT_H) @@ -940,7 +969,6 @@ check_include_file_concat("fcntl.h" HAVE_FCNTL_H) check_include_file_concat("idn2.h" HAVE_IDN2_H) check_include_file_concat("ifaddrs.h" HAVE_IFADDRS_H) check_include_file_concat("io.h" HAVE_IO_H) -check_include_file_concat("krb.h" HAVE_KRB_H) check_include_file_concat("libgen.h" HAVE_LIBGEN_H) check_include_file_concat("locale.h" HAVE_LOCALE_H) check_include_file_concat("net/if.h" HAVE_NET_IF_H) @@ -949,15 +977,14 @@ check_include_file_concat("netinet/in.h" HAVE_NETINET_IN_H) check_include_file_concat("netinet/tcp.h" HAVE_NETINET_TCP_H) check_include_file("linux/tcp.h" HAVE_LINUX_TCP_H) -check_include_file_concat("pem.h" HAVE_PEM_H) check_include_file_concat("poll.h" HAVE_POLL_H) check_include_file_concat("pwd.h" HAVE_PWD_H) check_include_file_concat("setjmp.h" HAVE_SETJMP_H) check_include_file_concat("signal.h" HAVE_SIGNAL_H) check_include_file_concat("ssl.h" HAVE_SSL_H) +check_include_file_concat("stdatomic.h" HAVE_STDATOMIC_H) check_include_file_concat("stdbool.h" HAVE_STDBOOL_H) check_include_file_concat("stdint.h" HAVE_STDINT_H) -check_include_file_concat("stdio.h" HAVE_STDIO_H) check_include_file_concat("stdlib.h" HAVE_STDLIB_H) check_include_file_concat("string.h" HAVE_STRING_H) check_include_file_concat("strings.h" HAVE_STRINGS_H) @@ -967,26 +994,18 @@ check_include_file_concat("termios.h" HAVE_TERMIOS_H) check_include_file_concat("time.h" HAVE_TIME_H) check_include_file_concat("unistd.h" HAVE_UNISTD_H) check_include_file_concat("utime.h" HAVE_UTIME_H) -check_include_file_concat("x509.h" HAVE_X509_H) check_include_file_concat("process.h" HAVE_PROCESS_H) check_include_file_concat("stddef.h" HAVE_STDDEF_H) -check_include_file_concat("dlfcn.h" HAVE_DLFCN_H) -check_include_file_concat("malloc.h" HAVE_MALLOC_H) -check_include_file_concat("memory.h" HAVE_MEMORY_H) -check_include_file_concat("netinet/if_ether.h" HAVE_NETINET_IF_ETHER_H) check_include_file_concat("stdint.h" HAVE_STDINT_H) -check_include_file_concat("sockio.h" HAVE_SOCKIO_H) check_include_file_concat("sys/utsname.h" HAVE_SYS_UTSNAME_H) check_type_size(size_t SIZEOF_SIZE_T) check_type_size(ssize_t SIZEOF_SSIZE_T) check_type_size("long long" SIZEOF_LONG_LONG) check_type_size("long" SIZEOF_LONG) -check_type_size("short" SIZEOF_SHORT) check_type_size("int" SIZEOF_INT) check_type_size("__int64" SIZEOF___INT64) -check_type_size("long double" SIZEOF_LONG_DOUBLE) check_type_size("time_t" SIZEOF_TIME_T) if(NOT HAVE_SIZEOF_SSIZE_T) if(SIZEOF_LONG EQUAL SIZEOF_SIZE_T) @@ -1000,11 +1019,12 @@ endif() if(HAVE_SIZEOF_LONG_LONG) set(HAVE_LONGLONG 1) - set(HAVE_LL 1) endif() -find_file(RANDOM_FILE urandom /dev) -mark_as_advanced(RANDOM_FILE) +if(NOT CMAKE_CROSSCOMPILING) + find_file(RANDOM_FILE urandom /dev) + mark_as_advanced(RANDOM_FILE) +endif() # Check for some functions that are used if(HAVE_LIBWS2_32) @@ -1013,40 +1033,29 @@ elseif(HAVE_LIBSOCKET) set(CMAKE_REQUIRED_LIBRARIES socket) endif() +check_symbol_exists(fchmod "${CURL_INCLUDES}" HAVE_FCHMOD) check_symbol_exists(basename "${CURL_INCLUDES}" HAVE_BASENAME) check_symbol_exists(socket "${CURL_INCLUDES}" HAVE_SOCKET) check_symbol_exists(select "${CURL_INCLUDES}" HAVE_SELECT) -check_symbol_exists(poll "${CURL_INCLUDES}" HAVE_POLL) check_symbol_exists(strdup "${CURL_INCLUDES}" HAVE_STRDUP) -check_symbol_exists(strstr "${CURL_INCLUDES}" HAVE_STRSTR) check_symbol_exists(strtok_r "${CURL_INCLUDES}" HAVE_STRTOK_R) -check_symbol_exists(strftime "${CURL_INCLUDES}" HAVE_STRFTIME) -check_symbol_exists(uname "${CURL_INCLUDES}" HAVE_UNAME) check_symbol_exists(strcasecmp "${CURL_INCLUDES}" HAVE_STRCASECMP) check_symbol_exists(stricmp "${CURL_INCLUDES}" HAVE_STRICMP) check_symbol_exists(strcmpi "${CURL_INCLUDES}" HAVE_STRCMPI) -check_symbol_exists(strncmpi "${CURL_INCLUDES}" HAVE_STRNCMPI) check_symbol_exists(alarm "${CURL_INCLUDES}" HAVE_ALARM) -if(NOT HAVE_STRNCMPI) - set(HAVE_STRCMPI) -endif() check_symbol_exists(getppid "${CURL_INCLUDES}" HAVE_GETPPID) check_symbol_exists(utimes "${CURL_INCLUDES}" HAVE_UTIMES) check_symbol_exists(gettimeofday "${CURL_INCLUDES}" HAVE_GETTIMEOFDAY) -check_symbol_exists(inet_addr "${CURL_INCLUDES}" HAVE_INET_ADDR) check_symbol_exists(closesocket "${CURL_INCLUDES}" HAVE_CLOSESOCKET) check_symbol_exists(sigsetjmp "${CURL_INCLUDES}" HAVE_SIGSETJMP) check_symbol_exists(getpass_r "${CURL_INCLUDES}" HAVE_GETPASS_R) check_symbol_exists(getpwuid "${CURL_INCLUDES}" HAVE_GETPWUID) check_symbol_exists(getpwuid_r "${CURL_INCLUDES}" HAVE_GETPWUID_R) check_symbol_exists(geteuid "${CURL_INCLUDES}" HAVE_GETEUID) -check_symbol_exists(usleep "${CURL_INCLUDES}" HAVE_USLEEP) check_symbol_exists(utime "${CURL_INCLUDES}" HAVE_UTIME) check_symbol_exists(gmtime_r "${CURL_INCLUDES}" HAVE_GMTIME_R) -check_symbol_exists(localtime_r "${CURL_INCLUDES}" HAVE_LOCALTIME_R) -check_symbol_exists(gethostbyname "${CURL_INCLUDES}" HAVE_GETHOSTBYNAME) check_symbol_exists(gethostbyname_r "${CURL_INCLUDES}" HAVE_GETHOSTBYNAME_R) check_symbol_exists(signal "${CURL_INCLUDES}" HAVE_SIGNAL_FUNC) @@ -1054,7 +1063,6 @@ check_symbol_exists(SIGALRM "${CURL_INCLUDES}" HAVE_SIGNAL_MACRO) if(HAVE_SIGNAL_FUNC AND HAVE_SIGNAL_MACRO) set(HAVE_SIGNAL 1) endif() -check_symbol_exists(uname "${CURL_INCLUDES}" HAVE_UNAME) check_symbol_exists(strtoll "${CURL_INCLUDES}" HAVE_STRTOLL) check_symbol_exists(_strtoi64 "${CURL_INCLUDES}" HAVE__STRTOI64) check_symbol_exists(strerror_r "${CURL_INCLUDES}" HAVE_STRERROR_R) @@ -1063,7 +1071,6 @@ check_symbol_exists(getaddrinfo "${CURL_INCLUDES}" HAVE_GETADDRINFO) check_symbol_exists(freeaddrinfo "${CURL_INCLUDES}" HAVE_FREEADDRINFO) check_symbol_exists(pipe "${CURL_INCLUDES}" HAVE_PIPE) check_symbol_exists(ftruncate "${CURL_INCLUDES}" HAVE_FTRUNCATE) -check_symbol_exists(getprotobyname "${CURL_INCLUDES}" HAVE_GETPROTOBYNAME) check_symbol_exists(getpeername "${CURL_INCLUDES}" HAVE_GETPEERNAME) check_symbol_exists(getsockname "${CURL_INCLUDES}" HAVE_GETSOCKNAME) check_symbol_exists(if_nametoindex "${CURL_INCLUDES}" HAVE_IF_NAMETOINDEX) @@ -1071,9 +1078,6 @@ check_symbol_exists(getrlimit "${CURL_INCLUDES}" HAVE_GETRLIMIT) check_symbol_exists(setlocale "${CURL_INCLUDES}" HAVE_SETLOCALE) check_symbol_exists(setmode "${CURL_INCLUDES}" HAVE_SETMODE) check_symbol_exists(setrlimit "${CURL_INCLUDES}" HAVE_SETRLIMIT) -check_symbol_exists(fcntl "${CURL_INCLUDES}" HAVE_FCNTL) -check_symbol_exists(ioctl "${CURL_INCLUDES}" HAVE_IOCTL) -check_symbol_exists(setsockopt "${CURL_INCLUDES}" HAVE_SETSOCKOPT) check_function_exists(mach_absolute_time HAVE_MACH_ABSOLUTE_TIME) check_symbol_exists(inet_pton "${CURL_INCLUDES}" HAVE_INET_PTON) @@ -1140,6 +1144,7 @@ foreach(CURL_TEST HAVE_FILE_OFFSET_BITS HAVE_VARIADIC_MACROS_C99 HAVE_VARIADIC_MACROS_GCC + HAVE_ATOMIC ) curl_internal_test(${CURL_TEST}) endforeach() @@ -1156,6 +1161,19 @@ set(CMAKE_EXTRA_INCLUDE_FILES "curl/system.h") check_type_size("curl_off_t" SIZEOF_CURL_OFF_T) set(CMAKE_EXTRA_INCLUDE_FILES "") +if(WIN32) + # detect actual value of _WIN32_WINNT and store as HAVE_WIN32_WINNT + curl_internal_test(HAVE_WIN32_WINNT) + if(HAVE_WIN32_WINNT) + string(REGEX MATCH ".*_WIN32_WINNT=0x[0-9a-fA-F]+" OUTPUT "${OUTPUT}") + string(REGEX REPLACE ".*_WIN32_WINNT=" "" OUTPUT "${OUTPUT}") + math(EXPR HAVE_WIN32_WINNT "${OUTPUT}" OUTPUT_FORMAT DECIMAL) + message(STATUS "Found _WIN32_WINNT=${OUTPUT} (${HAVE_WIN32_WINNT})") + endif() + # avoid storing HAVE_WIN32_WINNT in CMake cache + unset(HAVE_WIN32_WINNT CACHE) +endif() + set(CMAKE_REQUIRED_FLAGS) foreach(CURL_TEST @@ -1272,6 +1290,8 @@ if(WIN32) if(USE_WIN32_CRYPTO OR USE_SCHANNEL) list(APPEND CURL_LIBS "advapi32" "crypt32") endif() + + list(APPEND CURL_LIBS "bcrypt") endif() if(MSVC) @@ -1412,6 +1432,9 @@ _add_if("HTTP3" USE_NGTCP2 OR USE_QUICHE) _add_if("MultiSSL" CURL_WITH_MULTI_SSL) _add_if("HTTPS-proxy" SSL_ENABLED AND (USE_OPENSSL OR USE_GNUTLS OR USE_NSS)) _add_if("unicode" ENABLE_UNICODE) +_add_if("threadsafe" HAVE_ATOMIC OR (WIN32 AND + HAVE_WIN32_WINNT GREATER_EQUAL 0x600)) +_add_if("PSL" USE_LIBPSL) string(REPLACE ";" " " SUPPORT_FEATURES "${_items}") message(STATUS "Enabled features: ${SUPPORT_FEATURES}") @@ -1484,12 +1507,10 @@ set(libdir "${CMAKE_INSTALL_PREFIX}/lib") foreach(_lib ${CMAKE_C_IMPLICIT_LINK_LIBRARIES} ${CURL_LIBS}) if(TARGET "${_lib}") set(_libname "${_lib}") - get_target_property(_libtype "${_libname}" TYPE) - if(_libtype STREQUAL INTERFACE_LIBRARY) - # Interface libraries can occur when an external project embeds curl and - # defined targets such as ZLIB::ZLIB by themselves. Ignore these as - # reading the LOCATION property will error out. Assume the user won't need - # this information in the .pc file. + get_target_property(_imported "${_libname}" IMPORTED) + if(NOT _imported) + # Reading the LOCATION property on non-imported target will error out. + # Assume the user won't need this information in the .pc file. continue() endif() get_target_property(_lib "${_libname}" LOCATION) diff --git a/trunk/libs/libcurl/curl-7.x/COPYING b/trunk/libs/libcurl/curl-7.x/COPYING new file mode 100644 index 00000000..90f05adf --- /dev/null +++ b/trunk/libs/libcurl/curl-7.x/COPYING @@ -0,0 +1,22 @@ +COPYRIGHT AND PERMISSION NOTICE + +Copyright (c) 1996 - 2022, Daniel Stenberg, , and many +contributors, see the THANKS file. + +All rights reserved. + +Permission to use, copy, modify, and distribute this software for any purpose +with or without fee is hereby granted, provided that the above copyright +notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN +NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE +OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of a copyright holder shall not +be used in advertising or otherwise to promote the sale, use or other dealings +in this Software without prior written authorization of the copyright holder. diff --git a/trunk/libs/libcurl/curl-7.x/MacOSX-Framework b/trunk/libs/libcurl/curl-7.x/MacOSX-Framework index c12fd731..97cd00b9 100755 --- a/trunk/libs/libcurl/curl-7.x/MacOSX-Framework +++ b/trunk/libs/libcurl/curl-7.x/MacOSX-Framework @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -19,6 +19,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### # This script performs all of the steps needed to build a # universal binary libcurl.framework for Mac OS X 10.4 or greater. @@ -55,7 +57,7 @@ DEVELOPER_PATH=`xcode-select --print-path` if test -d "$DEVELOPER_PATH/Platforms/MacOSX.platform/Developer/SDKs"; then SDK_PATH="$DEVELOPER_PATH/Platforms/MacOSX.platform/Developer/SDKs" else - SDK_PATH="$DEVELOPER_PATH/SDKs"; + SDK_PATH="$DEVELOPER_PATH/SDKs" fi OLD_SDK=`ls $SDK_PATH|head -1` NEW_SDK=`ls -r $SDK_PATH|head -1` @@ -116,7 +118,7 @@ if test ! -z $SDK32; then mkdir -p libcurl.framework/${FRAMEWORK_VERSION}/Resources cp lib/.libs/libcurl.dylib libcurl.framework/${FRAMEWORK_VERSION}/libcurl install_name_tool -id @rpath/libcurl.framework/${FRAMEWORK_VERSION}/libcurl libcurl.framework/${FRAMEWORK_VERSION}/libcurl - /usr/bin/sed -e "s/7\.12\.3/$VERSION/" lib/libcurl.plist >libcurl.framework/${FRAMEWORK_VERSION}/Resources/Info.plist + cp lib/libcurl.plist libcurl.framework/${FRAMEWORK_VERSION}/Resources/Info.plist mkdir -p libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl cp include/curl/*.h libcurl.framework/${FRAMEWORK_VERSION}/Headers/curl pushd libcurl.framework diff --git a/trunk/libs/libcurl/curl-7.x/Makefile b/trunk/libs/libcurl/curl-7.x/Makefile index 1a531c15..ab5a9b5f 100644 --- a/trunk/libs/libcurl/curl-7.x/Makefile +++ b/trunk/libs/libcurl/curl-7.x/Makefile @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### all: @@ -73,31 +75,6 @@ amiga: cd ./lib && make -f makefile.amiga cd ./src && make -f makefile.amiga -netware: - $(MAKE) -C lib -f Makefile.netware - $(MAKE) -C src -f Makefile.netware - -netware-clean: - $(MAKE) -C lib -f Makefile.netware clean - $(MAKE) -C src -f Makefile.netware clean - $(MAKE) -C docs/examples -f Makefile.netware clean - -netware-vclean netware-distclean: - $(MAKE) -C lib -f Makefile.netware vclean - $(MAKE) -C src -f Makefile.netware vclean - $(MAKE) -C docs/examples -f Makefile.netware vclean - -netware-install: - $(MAKE) -C lib -f Makefile.netware install - $(MAKE) -C src -f Makefile.netware install - -netware-examples-%: - $(MAKE) -C docs/examples -f Makefile.netware CFG=$@ - -netware-%: - $(MAKE) -C lib -f Makefile.netware CFG=$@ - $(MAKE) -C src -f Makefile.netware CFG=$@ - unix: all unix-ssl: ssl @@ -106,7 +83,7 @@ linux: all linux-ssl: ssl -ca-bundle: lib/mk-ca-bundle.pl +ca-bundle: scripts/mk-ca-bundle.pl @echo "generate a fresh ca-bundle.crt" @perl $< -b -l -u lib/ca-bundle.crt diff --git a/trunk/libs/libcurl/curl-7.x/Makefile.am b/trunk/libs/libcurl/curl-7.x/Makefile.am index 16adc983..40771ed3 100644 --- a/trunk/libs/libcurl/curl-7.x/Makefile.am +++ b/trunk/libs/libcurl/curl-7.x/Makefile.am @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ # 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 @@ -34,8 +36,10 @@ CMAKE_DIST = \ CMake/FindBrotli.cmake \ CMake/FindCARES.cmake \ CMake/FindGSS.cmake \ + CMake/FindLibPSL.cmake \ CMake/FindLibSSH2.cmake \ CMake/FindMbedTLS.cmake \ + CMake/FindMSH3.cmake \ CMake/FindNGHTTP2.cmake \ CMake/FindNGHTTP3.cmake \ CMake/FindNGTCP2.cmake \ @@ -49,41 +53,6 @@ CMAKE_DIST = \ CMake/Utilities.cmake \ CMakeLists.txt -VC6_LIBTMPL = projects/Windows/VC6/lib/libcurl.tmpl -VC6_LIBDSP = projects/Windows/VC6/lib/libcurl.dsp.dist -VC6_LIBDSP_DEPS = $(VC6_LIBTMPL) Makefile.am lib/Makefile.inc -VC6_SRCTMPL = projects/Windows/VC6/src/curl.tmpl -VC6_SRCDSP = projects/Windows/VC6/src/curl.dsp.dist -VC6_SRCDSP_DEPS = $(VC6_SRCTMPL) Makefile.am src/Makefile.inc - -VC7_LIBTMPL = projects/Windows/VC7/lib/libcurl.tmpl -VC7_LIBVCPROJ = projects/Windows/VC7/lib/libcurl.vcproj.dist -VC7_LIBVCPROJ_DEPS = $(VC7_LIBTMPL) Makefile.am lib/Makefile.inc -VC7_SRCTMPL = projects/Windows/VC7/src/curl.tmpl -VC7_SRCVCPROJ = projects/Windows/VC7/src/curl.vcproj.dist -VC7_SRCVCPROJ_DEPS = $(VC7_SRCTMPL) Makefile.am src/Makefile.inc - -VC71_LIBTMPL = projects/Windows/VC7.1/lib/libcurl.tmpl -VC71_LIBVCPROJ = projects/Windows/VC7.1/lib/libcurl.vcproj.dist -VC71_LIBVCPROJ_DEPS = $(VC71_LIBTMPL) Makefile.am lib/Makefile.inc -VC71_SRCTMPL = projects/Windows/VC7.1/src/curl.tmpl -VC71_SRCVCPROJ = projects/Windows/VC7.1/src/curl.vcproj.dist -VC71_SRCVCPROJ_DEPS = $(VC71_SRCTMPL) Makefile.am src/Makefile.inc - -VC8_LIBTMPL = projects/Windows/VC8/lib/libcurl.tmpl -VC8_LIBVCPROJ = projects/Windows/VC8/lib/libcurl.vcproj.dist -VC8_LIBVCPROJ_DEPS = $(VC8_LIBTMPL) Makefile.am lib/Makefile.inc -VC8_SRCTMPL = projects/Windows/VC8/src/curl.tmpl -VC8_SRCVCPROJ = projects/Windows/VC8/src/curl.vcproj.dist -VC8_SRCVCPROJ_DEPS = $(VC8_SRCTMPL) Makefile.am src/Makefile.inc - -VC9_LIBTMPL = projects/Windows/VC9/lib/libcurl.tmpl -VC9_LIBVCPROJ = projects/Windows/VC9/lib/libcurl.vcproj.dist -VC9_LIBVCPROJ_DEPS = $(VC9_LIBTMPL) Makefile.am lib/Makefile.inc -VC9_SRCTMPL = projects/Windows/VC9/src/curl.tmpl -VC9_SRCVCPROJ = projects/Windows/VC9/src/curl.vcproj.dist -VC9_SRCVCPROJ_DEPS = $(VC9_SRCTMPL) Makefile.am src/Makefile.inc - VC10_LIBTMPL = projects/Windows/VC10/lib/libcurl.tmpl VC10_LIBVCXPROJ = projects/Windows/VC10/lib/libcurl.vcxproj.dist VC10_LIBVCXPROJ_DEPS = $(VC10_LIBTMPL) Makefile.am lib/Makefile.inc @@ -112,59 +81,56 @@ VC14_SRCTMPL = projects/Windows/VC14/src/curl.tmpl VC14_SRCVCXPROJ = projects/Windows/VC14/src/curl.vcxproj.dist VC14_SRCVCXPROJ_DEPS = $(VC14_SRCTMPL) Makefile.am src/Makefile.inc -VC15_LIBTMPL = projects/Windows/VC15/lib/libcurl.tmpl -VC15_LIBVCXPROJ = projects/Windows/VC15/lib/libcurl.vcxproj.dist -VC15_LIBVCXPROJ_DEPS = $(VC15_LIBTMPL) Makefile.am lib/Makefile.inc -VC15_SRCTMPL = projects/Windows/VC15/src/curl.tmpl -VC15_SRCVCXPROJ = projects/Windows/VC15/src/curl.vcxproj.dist -VC15_SRCVCXPROJ_DEPS = $(VC15_SRCTMPL) Makefile.am src/Makefile.inc - -VC_DIST = projects/README \ - projects/build-openssl.bat \ - projects/build-wolfssl.bat \ - projects/checksrc.bat \ - projects/Windows/VC6/curl-all.dsw \ - projects/Windows/VC6/lib/libcurl.dsw \ - projects/Windows/VC6/src/curl.dsw \ - projects/Windows/VC7/curl-all.sln \ - projects/Windows/VC7/lib/libcurl.sln \ - projects/Windows/VC7/src/curl.sln \ - projects/Windows/VC7.1/curl-all.sln \ - projects/Windows/VC7.1/lib/libcurl.sln \ - projects/Windows/VC7.1/src/curl.sln \ - projects/Windows/VC8/curl-all.sln \ - projects/Windows/VC8/lib/libcurl.sln \ - projects/Windows/VC8/src/curl.sln \ - projects/Windows/VC9/curl-all.sln \ - projects/Windows/VC9/lib/libcurl.sln \ - projects/Windows/VC9/src/curl.sln \ - projects/Windows/VC10/curl-all.sln \ - projects/Windows/VC10/lib/libcurl.sln \ - projects/Windows/VC10/lib/libcurl.vcxproj.filters \ - projects/Windows/VC10/src/curl.sln \ - projects/Windows/VC10/src/curl.vcxproj.filters \ - projects/Windows/VC11/curl-all.sln \ - projects/Windows/VC11/lib/libcurl.sln \ - projects/Windows/VC11/lib/libcurl.vcxproj.filters \ - projects/Windows/VC11/src/curl.sln \ - projects/Windows/VC11/src/curl.vcxproj.filters \ - projects/Windows/VC12/curl-all.sln \ - projects/Windows/VC12/lib/libcurl.sln \ - projects/Windows/VC12/lib/libcurl.vcxproj.filters \ - projects/Windows/VC12/src/curl.sln \ - projects/Windows/VC12/src/curl.vcxproj.filters \ - projects/Windows/VC14/curl-all.sln \ - projects/Windows/VC14/lib/libcurl.sln \ - projects/Windows/VC14/lib/libcurl.vcxproj.filters \ - projects/Windows/VC14/src/curl.sln \ - projects/Windows/VC14/src/curl.vcxproj.filters \ - projects/Windows/VC15/curl-all.sln \ - projects/Windows/VC15/lib/libcurl.sln \ - projects/Windows/VC15/lib/libcurl.vcxproj.filters \ - projects/Windows/VC15/src/curl.sln \ - projects/Windows/VC15/src/curl.vcxproj.filters \ - projects/generate.bat \ - projects/wolfssl_options.h \ +VC14_10_LIBTMPL = projects/Windows/VC14.10/lib/libcurl.tmpl +VC14_10_LIBVCXPROJ = projects/Windows/VC14.10/lib/libcurl.vcxproj.dist +VC14_10_LIBVCXPROJ_DEPS = $(VC14_10_LIBTMPL) Makefile.am lib/Makefile.inc +VC14_10_SRCTMPL = projects/Windows/VC14.10/src/curl.tmpl +VC14_10_SRCVCXPROJ = projects/Windows/VC14.10/src/curl.vcxproj.dist +VC14_10_SRCVCXPROJ_DEPS = $(VC14_10_SRCTMPL) Makefile.am src/Makefile.inc + +VC14_30_LIBTMPL = projects/Windows/VC14.30/lib/libcurl.tmpl +VC14_30_LIBVCXPROJ = projects/Windows/VC14.30/lib/libcurl.vcxproj.dist +VC14_30_LIBVCXPROJ_DEPS = $(VC14_30_LIBTMPL) Makefile.am lib/Makefile.inc +VC14_30_SRCTMPL = projects/Windows/VC14.30/src/curl.tmpl +VC14_30_SRCVCXPROJ = projects/Windows/VC14.30/src/curl.vcxproj.dist +VC14_30_SRCVCXPROJ_DEPS = $(VC14_30_SRCTMPL) Makefile.am src/Makefile.inc + +VC_DIST = projects/README.md \ + projects/build-openssl.bat \ + projects/build-wolfssl.bat \ + projects/checksrc.bat \ + projects/Windows/VC10/curl-all.sln \ + projects/Windows/VC10/lib/libcurl.sln \ + projects/Windows/VC10/lib/libcurl.vcxproj.filters \ + projects/Windows/VC10/src/curl.sln \ + projects/Windows/VC10/src/curl.vcxproj.filters \ + projects/Windows/VC11/curl-all.sln \ + projects/Windows/VC11/lib/libcurl.sln \ + projects/Windows/VC11/lib/libcurl.vcxproj.filters \ + projects/Windows/VC11/src/curl.sln \ + projects/Windows/VC11/src/curl.vcxproj.filters \ + projects/Windows/VC12/curl-all.sln \ + projects/Windows/VC12/lib/libcurl.sln \ + projects/Windows/VC12/lib/libcurl.vcxproj.filters \ + projects/Windows/VC12/src/curl.sln \ + projects/Windows/VC12/src/curl.vcxproj.filters \ + projects/Windows/VC14/curl-all.sln \ + projects/Windows/VC14/lib/libcurl.sln \ + projects/Windows/VC14/lib/libcurl.vcxproj.filters \ + projects/Windows/VC14/src/curl.sln \ + projects/Windows/VC14/src/curl.vcxproj.filters \ + projects/Windows/VC14.10/curl-all.sln \ + projects/Windows/VC14.10/lib/libcurl.sln \ + projects/Windows/VC14.10/lib/libcurl.vcxproj.filters \ + projects/Windows/VC14.10/src/curl.sln \ + projects/Windows/VC14.10/src/curl.vcxproj.filters \ + projects/Windows/VC14.30/curl-all.sln \ + projects/Windows/VC14.30/lib/libcurl.sln \ + projects/Windows/VC14.30/lib/libcurl.vcxproj.filters \ + projects/Windows/VC14.30/src/curl.sln \ + projects/Windows/VC14.30/src/curl.vcxproj.filters \ + projects/generate.bat \ + projects/wolfssl_options.h \ projects/wolfssl_override.props WINBUILD_DIST = winbuild/README.md winbuild/gen_resp_file.bat \ @@ -180,17 +146,14 @@ PLAN9_DIST = plan9/include/mkfile \ plan9/src/mkfile.inc \ plan9/src/mkfile -EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in \ - RELEASE-NOTES buildconf libcurl.pc.in MacOSX-Framework \ - scripts/updatemanpages.pl $(CMAKE_DIST) \ - $(VC_DIST) $(WINBUILD_DIST) $(PLAN9_DIST) \ - lib/libcurl.vers.in buildconf.bat scripts/coverage.sh scripts/completion.pl +EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in \ + RELEASE-NOTES buildconf libcurl.pc.in MacOSX-Framework $(CMAKE_DIST) \ + $(VC_DIST) $(WINBUILD_DIST) $(PLAN9_DIST) lib/libcurl.vers.in buildconf.bat -CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) $(VC7_LIBVCPROJ) $(VC7_SRCVCPROJ) \ - $(VC71_LIBVCPROJ) $(VC71_SRCVCPROJ) $(VC8_LIBVCPROJ) $(VC8_SRCVCPROJ) \ - $(VC9_LIBVCPROJ) $(VC9_SRCVCPROJ) $(VC10_LIBVCXPROJ) $(VC10_SRCVCXPROJ) \ - $(VC11_LIBVCXPROJ) $(VC11_SRCVCXPROJ) $(VC12_LIBVCXPROJ) $(VC12_SRCVCXPROJ) \ - $(VC14_LIBVCXPROJ) $(VC14_SRCVCXPROJ) $(VC15_LIBVCXPROJ) $(VC15_SRCVCXPROJ) +CLEANFILES = $(VC10_LIBVCXPROJ) $(VC10_SRCVCXPROJ) $(VC11_LIBVCXPROJ) \ + $(VC11_SRCVCXPROJ) $(VC12_LIBVCXPROJ) $(VC12_SRCVCXPROJ) $(VC14_LIBVCXPROJ) \ + $(VC14_SRCVCXPROJ) $(VC14_10_LIBVCXPROJ) $(VC14_10_SRCVCXPROJ) \ + $(VC14_30_LIBVCXPROJ) $(VC14_30_SRCVCXPROJ) bin_SCRIPTS = curl-config @@ -248,6 +211,9 @@ test-event: test-am: @(cd tests; $(MAKE) all am-test) +test-ci: + @(cd tests; $(MAKE) all ci-test) + endif examples: @@ -315,13 +281,13 @@ uninstall-hook: (cd docs && $(MAKE) uninstall) (cd docs/libcurl && $(MAKE) uninstall) -ca-bundle: lib/mk-ca-bundle.pl +ca-bundle: $(srcdir)/scripts/mk-ca-bundle.pl @echo "generating a fresh ca-bundle.crt" - @perl $< -b -l -u lib/ca-bundle.crt + @perl $(srcdir)/scripts/mk-ca-bundle.pl -b -l -u lib/ca-bundle.crt -ca-firefox: lib/firefox-db2pem.sh +ca-firefox: $(srcdir)/scripts/firefox-db2pem.sh @echo "generating a fresh ca-bundle.crt" - ./lib/firefox-db2pem.sh lib/ca-bundle.crt + $(srcdir)/scripts/firefox-db2pem.sh lib/ca-bundle.crt checksrc: (cd lib && $(MAKE) checksrc) @@ -333,13 +299,11 @@ checksrc: .PHONY: vc-ide -vc-ide: $(VC6_LIBDSP_DEPS) $(VC6_SRCDSP_DEPS) $(VC7_LIBVCPROJ_DEPS) \ - $(VC7_SRCVCPROJ_DEPS) $(VC71_LIBVCPROJ_DEPS) $(VC71_SRCVCPROJ_DEPS) \ - $(VC8_LIBVCPROJ_DEPS) $(VC8_SRCVCPROJ_DEPS) $(VC9_LIBVCPROJ_DEPS) \ - $(VC9_SRCVCPROJ_DEPS) $(VC10_LIBVCXPROJ_DEPS) $(VC10_SRCVCXPROJ_DEPS) \ +vc-ide: $(VC10_LIBVCXPROJ_DEPS) $(VC10_SRCVCXPROJ_DEPS) \ $(VC11_LIBVCXPROJ_DEPS) $(VC11_SRCVCXPROJ_DEPS) $(VC12_LIBVCXPROJ_DEPS) \ $(VC12_SRCVCXPROJ_DEPS) $(VC14_LIBVCXPROJ_DEPS) $(VC14_SRCVCXPROJ_DEPS) \ - $(VC15_LIBVCXPROJ_DEPS) $(VC15_SRCVCXPROJ_DEPS) + $(VC14_10_LIBVCXPROJ_DEPS) $(VC14_10_SRCVCXPROJ_DEPS) \ + $(VC14_30_LIBVCXPROJ_DEPS) $(VC14_30_SRCVCXPROJ_DEPS) @(win32_lib_srcs='$(LIB_CFILES)'; \ win32_lib_hdrs='$(LIB_HFILES) config-win32.h'; \ win32_lib_rc='$(LIB_RCFILES)'; \ @@ -500,104 +464,8 @@ function gen_element(type, dir, file)\ printf("%s\r\n", $$0);\ }';\ \ - echo "generating '$(VC6_LIBDSP)'"; \ - awk -v proj_type=dsp \ - -v lib_srcs="$$sorted_lib_srcs" \ - -v lib_hdrs="$$sorted_lib_hdrs" \ - -v lib_rc="$$win32_lib_rc" \ - -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \ - -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \ - -v lib_vquic_srcs="$$sorted_lib_vquic_srcs" \ - -v lib_vquic_hdrs="$$sorted_lib_vquic_hdrs" \ - -v lib_vssh_srcs="$$sorted_lib_vssh_srcs" \ - -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ - -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ - -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC6_LIBTMPL) > $(VC6_LIBDSP) || { exit 1; }; \ - \ - echo "generating '$(VC6_SRCDSP)'"; \ - awk -v proj_type=dsp \ - -v src_srcs="$$sorted_src_srcs" \ - -v src_hdrs="$$sorted_src_hdrs" \ - -v src_rc="$$win32_src_rc" \ - -v src_x_srcs="$$sorted_src_x_srcs" \ - -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC6_SRCTMPL) > $(VC6_SRCDSP) || { exit 1; }; \ - \ - echo "generating '$(VC7_LIBVCPROJ)'"; \ - awk -v proj_type=vcproj1 \ - -v lib_srcs="$$sorted_lib_srcs" \ - -v lib_hdrs="$$sorted_lib_hdrs" \ - -v lib_rc="$$win32_lib_rc" \ - -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \ - -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \ - -v lib_vquic_srcs="$$sorted_lib_vquic_srcs" \ - -v lib_vquic_hdrs="$$sorted_lib_vquic_hdrs" \ - -v lib_vssh_srcs="$$sorted_lib_vssh_srcs" \ - -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ - -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ - -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC7_LIBTMPL) > $(VC7_LIBVCPROJ) || { exit 1; }; \ - \ - echo "generating '$(VC7_SRCVCPROJ)'"; \ - awk -v proj_type=vcproj1 \ - -v src_srcs="$$sorted_src_srcs" \ - -v src_hdrs="$$sorted_src_hdrs" \ - -v src_rc="$$win32_src_rc" \ - -v src_x_srcs="$$sorted_src_x_srcs" \ - -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC7_SRCTMPL) > $(VC7_SRCVCPROJ) || { exit 1; }; \ - \ - echo "generating '$(VC71_LIBVCPROJ)'"; \ - awk -v proj_type=vcproj1 \ - -v lib_srcs="$$sorted_lib_srcs" \ - -v lib_hdrs="$$sorted_lib_hdrs" \ - -v lib_rc="$$win32_lib_rc" \ - -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \ - -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \ - -v lib_vquic_srcs="$$sorted_lib_vquic_srcs" \ - -v lib_vquic_hdrs="$$sorted_lib_vquic_hdrs" \ - -v lib_vssh_srcs="$$sorted_lib_vssh_srcs" \ - -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ - -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ - -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC71_LIBTMPL) > $(VC71_LIBVCPROJ) || { exit 1; }; \ - \ - echo "generating '$(VC71_SRCVCPROJ)'"; \ - awk -v proj_type=vcproj1 \ - -v src_srcs="$$sorted_src_srcs" \ - -v src_hdrs="$$sorted_src_hdrs" \ - -v src_rc="$$win32_src_rc" \ - -v src_x_srcs="$$sorted_src_x_srcs" \ - -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC71_SRCTMPL) > $(VC71_SRCVCPROJ) || { exit 1; }; \ - \ - echo "generating '$(VC8_LIBVCPROJ)'"; \ - awk -v proj_type=vcproj2 \ - -v lib_srcs="$$sorted_lib_srcs" \ - -v lib_hdrs="$$sorted_lib_hdrs" \ - -v lib_rc="$$win32_lib_rc" \ - -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \ - -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \ - -v lib_vquic_srcs="$$sorted_lib_vquic_srcs" \ - -v lib_vquic_hdrs="$$sorted_lib_vquic_hdrs" \ - -v lib_vssh_srcs="$$sorted_lib_vssh_srcs" \ - -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ - -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ - -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC8_LIBTMPL) > $(VC8_LIBVCPROJ) || { exit 1; }; \ - \ - echo "generating '$(VC8_SRCVCPROJ)'"; \ - awk -v proj_type=vcproj2 \ - -v src_srcs="$$sorted_src_srcs" \ - -v src_hdrs="$$sorted_src_hdrs" \ - -v src_rc="$$win32_src_rc" \ - -v src_x_srcs="$$sorted_src_x_srcs" \ - -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC8_SRCTMPL) > $(VC8_SRCVCPROJ) || { exit 1; }; \ - \ - echo "generating '$(VC9_LIBVCPROJ)'"; \ - awk -v proj_type=vcproj2 \ + echo "generating '$(VC10_LIBVCXPROJ)'"; \ + awk -v proj_type=vcxproj \ -v lib_srcs="$$sorted_lib_srcs" \ -v lib_hdrs="$$sorted_lib_hdrs" \ -v lib_rc="$$win32_lib_rc" \ @@ -609,18 +477,18 @@ function gen_element(type, dir, file)\ -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC9_LIBTMPL) > $(VC9_LIBVCPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC10_LIBTMPL) > $(VC10_LIBVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC9_SRCVCPROJ)'"; \ - awk -v proj_type=vcproj2 \ + echo "generating '$(VC10_SRCVCXPROJ)'"; \ + awk -v proj_type=vcxproj \ -v src_srcs="$$sorted_src_srcs" \ -v src_hdrs="$$sorted_src_hdrs" \ -v src_rc="$$win32_src_rc" \ -v src_x_srcs="$$sorted_src_x_srcs" \ -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC9_SRCTMPL) > $(VC9_SRCVCPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC10_SRCTMPL) > $(VC10_SRCVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC10_LIBVCXPROJ)'"; \ + echo "generating '$(VC11_LIBVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v lib_srcs="$$sorted_lib_srcs" \ -v lib_hdrs="$$sorted_lib_hdrs" \ @@ -633,18 +501,18 @@ function gen_element(type, dir, file)\ -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC10_LIBTMPL) > $(VC10_LIBVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC11_LIBTMPL) > $(VC11_LIBVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC10_SRCVCXPROJ)'"; \ + echo "generating '$(VC11_SRCVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v src_srcs="$$sorted_src_srcs" \ -v src_hdrs="$$sorted_src_hdrs" \ -v src_rc="$$win32_src_rc" \ -v src_x_srcs="$$sorted_src_x_srcs" \ -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC10_SRCTMPL) > $(VC10_SRCVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC11_SRCTMPL) > $(VC11_SRCVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC11_LIBVCXPROJ)'"; \ + echo "generating '$(VC12_LIBVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v lib_srcs="$$sorted_lib_srcs" \ -v lib_hdrs="$$sorted_lib_hdrs" \ @@ -657,18 +525,18 @@ function gen_element(type, dir, file)\ -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC11_LIBTMPL) > $(VC11_LIBVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC12_LIBTMPL) > $(VC12_LIBVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC11_SRCVCXPROJ)'"; \ + echo "generating '$(VC12_SRCVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v src_srcs="$$sorted_src_srcs" \ -v src_hdrs="$$sorted_src_hdrs" \ -v src_rc="$$win32_src_rc" \ -v src_x_srcs="$$sorted_src_x_srcs" \ -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC11_SRCTMPL) > $(VC11_SRCVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC12_SRCTMPL) > $(VC12_SRCVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC12_LIBVCXPROJ)'"; \ + echo "generating '$(VC14_LIBVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v lib_srcs="$$sorted_lib_srcs" \ -v lib_hdrs="$$sorted_lib_hdrs" \ @@ -681,18 +549,18 @@ function gen_element(type, dir, file)\ -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC12_LIBTMPL) > $(VC12_LIBVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC14_LIBTMPL) > $(VC14_LIBVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC12_SRCVCXPROJ)'"; \ + echo "generating '$(VC14_SRCVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v src_srcs="$$sorted_src_srcs" \ -v src_hdrs="$$sorted_src_hdrs" \ -v src_rc="$$win32_src_rc" \ -v src_x_srcs="$$sorted_src_x_srcs" \ -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC12_SRCTMPL) > $(VC12_SRCVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC14_SRCTMPL) > $(VC14_SRCVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC14_LIBVCXPROJ)'"; \ + echo "generating '$(VC14_10_LIBVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v lib_srcs="$$sorted_lib_srcs" \ -v lib_hdrs="$$sorted_lib_hdrs" \ @@ -705,18 +573,18 @@ function gen_element(type, dir, file)\ -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC14_LIBTMPL) > $(VC14_LIBVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC14_10_LIBTMPL) > $(VC14_10_LIBVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC14_SRCVCXPROJ)'"; \ + echo "generating '$(VC14_10_SRCVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v src_srcs="$$sorted_src_srcs" \ -v src_hdrs="$$sorted_src_hdrs" \ -v src_rc="$$win32_src_rc" \ -v src_x_srcs="$$sorted_src_x_srcs" \ -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC14_SRCTMPL) > $(VC14_SRCVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC14_10_SRCTMPL) > $(VC14_10_SRCVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC15_LIBVCXPROJ)'"; \ + echo "generating '$(VC14_30_LIBVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v lib_srcs="$$sorted_lib_srcs" \ -v lib_hdrs="$$sorted_lib_hdrs" \ @@ -729,16 +597,16 @@ function gen_element(type, dir, file)\ -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC15_LIBTMPL) > $(VC15_LIBVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC14_30_LIBTMPL) > $(VC14_30_LIBVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC15_SRCVCXPROJ)'"; \ + echo "generating '$(VC14_30_SRCVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v src_srcs="$$sorted_src_srcs" \ -v src_hdrs="$$sorted_src_hdrs" \ -v src_rc="$$win32_src_rc" \ -v src_x_srcs="$$sorted_src_x_srcs" \ -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC15_SRCTMPL) > $(VC15_SRCVCXPROJ) || { exit 1; };) + "$$awk_code" $(srcdir)/$(VC14_30_SRCTMPL) > $(VC14_30_SRCVCXPROJ) || { exit 1; };) tidy: (cd src && $(MAKE) tidy) diff --git a/trunk/libs/libcurl/curl-7.x/Makefile.in b/trunk/libs/libcurl/curl-7.x/Makefile.in index 512b0553..43d656ad 100644 --- a/trunk/libs/libcurl/curl-7.x/Makefile.in +++ b/trunk/libs/libcurl/curl-7.x/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.4 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2021 Free Software Foundation, Inc. @@ -21,7 +21,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -34,6 +34,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### #*************************************************************************** @@ -43,7 +45,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -56,6 +58,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### #*************************************************************************** @@ -65,7 +69,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -78,17 +82,17 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### # ./src/Makefile.inc -# Using the backslash as line continuation character might be problematic -# with some make flavours, as Watcom's wmake showed us already. If we -# ever want to change this in a portable manner then we should consider -# this idea (posted to the libcurl list by Adam Kellas): +# Using the backslash as line continuation character might be problematic with +# some make flavours. If we ever want to change this in a portable manner then +# we should consider this idea : # CSRC1 = file1.c file2.c file3.c # CSRC2 = file4.c file5.c file6.c # CSOURCES = $(CSRC1) $(CSRC2) - VPATH = @srcdir@ am__is_gnu_make = { \ if test -z '$(MAKELEVEL)'; then \ @@ -165,15 +169,13 @@ build_triplet = @build@ host_triplet = @host@ subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compile_check_sizeof.m4 \ - $(top_srcdir)/m4/curl-amissl.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/curl-amissl.m4 \ $(top_srcdir)/m4/curl-bearssl.m4 \ $(top_srcdir)/m4/curl-compilers.m4 \ $(top_srcdir)/m4/curl-confopts.m4 \ $(top_srcdir)/m4/curl-functions.m4 \ $(top_srcdir)/m4/curl-gnutls.m4 \ - $(top_srcdir)/m4/curl-mbedtls.m4 \ - $(top_srcdir)/m4/curl-mesalink.m4 $(top_srcdir)/m4/curl-nss.m4 \ + $(top_srcdir)/m4/curl-mbedtls.m4 $(top_srcdir)/m4/curl-nss.m4 \ $(top_srcdir)/m4/curl-openssl.m4 \ $(top_srcdir)/m4/curl-override.m4 \ $(top_srcdir)/m4/curl-reentrant.m4 \ @@ -239,11 +241,11 @@ am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ -am__v_at_1 = +am__v_at_1 = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ @@ -376,6 +378,7 @@ CURL_DISABLE_TFTP = @CURL_DISABLE_TFTP@ CURL_LT_SHLIB_VERSIONED_FLAVOUR = @CURL_LT_SHLIB_VERSIONED_FLAVOUR@ CURL_NETWORK_AND_TIME_LIBS = @CURL_NETWORK_AND_TIME_LIBS@ CURL_NETWORK_LIBS = @CURL_NETWORK_LIBS@ +CURL_PLIST_VERSION = @CURL_PLIST_VERSION@ CURL_WITH_MULTI_SSL = @CURL_WITH_MULTI_SSL@ CYGPATH_W = @CYGPATH_W@ DEFAULT_SSL_BACKEND = @DEFAULT_SSL_BACKEND@ @@ -393,6 +396,7 @@ ENABLE_STATIC = @ENABLE_STATIC@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FISH_FUNCTIONS_DIR = @FISH_FUNCTIONS_DIR@ GCOV = @GCOV@ GREP = @GREP@ @@ -468,12 +472,13 @@ USE_LIBRTMP = @USE_LIBRTMP@ USE_LIBSSH = @USE_LIBSSH@ USE_LIBSSH2 = @USE_LIBSSH2@ USE_MBEDTLS = @USE_MBEDTLS@ -USE_MESALINK = @USE_MESALINK@ +USE_MSH3 = @USE_MSH3@ USE_NGHTTP2 = @USE_NGHTTP2@ USE_NGHTTP3 = @USE_NGHTTP3@ USE_NGTCP2 = @USE_NGTCP2@ USE_NGTCP2_CRYPTO_GNUTLS = @USE_NGTCP2_CRYPTO_GNUTLS@ USE_NGTCP2_CRYPTO_OPENSSL = @USE_NGTCP2_CRYPTO_OPENSSL@ +USE_NGTCP2_CRYPTO_WOLFSSL = @USE_NGTCP2_CRYPTO_WOLFSSL@ USE_NSS = @USE_NSS@ USE_OPENLDAP = @USE_OPENLDAP@ USE_QUICHE = @USE_QUICHE@ @@ -540,7 +545,6 @@ runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ -subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ @@ -558,8 +562,10 @@ CMAKE_DIST = \ CMake/FindBrotli.cmake \ CMake/FindCARES.cmake \ CMake/FindGSS.cmake \ + CMake/FindLibPSL.cmake \ CMake/FindLibSSH2.cmake \ CMake/FindMbedTLS.cmake \ + CMake/FindMSH3.cmake \ CMake/FindNGHTTP2.cmake \ CMake/FindNGHTTP3.cmake \ CMake/FindNGTCP2.cmake \ @@ -573,36 +579,6 @@ CMAKE_DIST = \ CMake/Utilities.cmake \ CMakeLists.txt -VC6_LIBTMPL = projects/Windows/VC6/lib/libcurl.tmpl -VC6_LIBDSP = projects/Windows/VC6/lib/libcurl.dsp.dist -VC6_LIBDSP_DEPS = $(VC6_LIBTMPL) Makefile.am lib/Makefile.inc -VC6_SRCTMPL = projects/Windows/VC6/src/curl.tmpl -VC6_SRCDSP = projects/Windows/VC6/src/curl.dsp.dist -VC6_SRCDSP_DEPS = $(VC6_SRCTMPL) Makefile.am src/Makefile.inc -VC7_LIBTMPL = projects/Windows/VC7/lib/libcurl.tmpl -VC7_LIBVCPROJ = projects/Windows/VC7/lib/libcurl.vcproj.dist -VC7_LIBVCPROJ_DEPS = $(VC7_LIBTMPL) Makefile.am lib/Makefile.inc -VC7_SRCTMPL = projects/Windows/VC7/src/curl.tmpl -VC7_SRCVCPROJ = projects/Windows/VC7/src/curl.vcproj.dist -VC7_SRCVCPROJ_DEPS = $(VC7_SRCTMPL) Makefile.am src/Makefile.inc -VC71_LIBTMPL = projects/Windows/VC7.1/lib/libcurl.tmpl -VC71_LIBVCPROJ = projects/Windows/VC7.1/lib/libcurl.vcproj.dist -VC71_LIBVCPROJ_DEPS = $(VC71_LIBTMPL) Makefile.am lib/Makefile.inc -VC71_SRCTMPL = projects/Windows/VC7.1/src/curl.tmpl -VC71_SRCVCPROJ = projects/Windows/VC7.1/src/curl.vcproj.dist -VC71_SRCVCPROJ_DEPS = $(VC71_SRCTMPL) Makefile.am src/Makefile.inc -VC8_LIBTMPL = projects/Windows/VC8/lib/libcurl.tmpl -VC8_LIBVCPROJ = projects/Windows/VC8/lib/libcurl.vcproj.dist -VC8_LIBVCPROJ_DEPS = $(VC8_LIBTMPL) Makefile.am lib/Makefile.inc -VC8_SRCTMPL = projects/Windows/VC8/src/curl.tmpl -VC8_SRCVCPROJ = projects/Windows/VC8/src/curl.vcproj.dist -VC8_SRCVCPROJ_DEPS = $(VC8_SRCTMPL) Makefile.am src/Makefile.inc -VC9_LIBTMPL = projects/Windows/VC9/lib/libcurl.tmpl -VC9_LIBVCPROJ = projects/Windows/VC9/lib/libcurl.vcproj.dist -VC9_LIBVCPROJ_DEPS = $(VC9_LIBTMPL) Makefile.am lib/Makefile.inc -VC9_SRCTMPL = projects/Windows/VC9/src/curl.tmpl -VC9_SRCVCPROJ = projects/Windows/VC9/src/curl.vcproj.dist -VC9_SRCVCPROJ_DEPS = $(VC9_SRCTMPL) Makefile.am src/Makefile.inc VC10_LIBTMPL = projects/Windows/VC10/lib/libcurl.tmpl VC10_LIBVCXPROJ = projects/Windows/VC10/lib/libcurl.vcxproj.dist VC10_LIBVCXPROJ_DEPS = $(VC10_LIBTMPL) Makefile.am lib/Makefile.inc @@ -627,58 +603,54 @@ VC14_LIBVCXPROJ_DEPS = $(VC14_LIBTMPL) Makefile.am lib/Makefile.inc VC14_SRCTMPL = projects/Windows/VC14/src/curl.tmpl VC14_SRCVCXPROJ = projects/Windows/VC14/src/curl.vcxproj.dist VC14_SRCVCXPROJ_DEPS = $(VC14_SRCTMPL) Makefile.am src/Makefile.inc -VC15_LIBTMPL = projects/Windows/VC15/lib/libcurl.tmpl -VC15_LIBVCXPROJ = projects/Windows/VC15/lib/libcurl.vcxproj.dist -VC15_LIBVCXPROJ_DEPS = $(VC15_LIBTMPL) Makefile.am lib/Makefile.inc -VC15_SRCTMPL = projects/Windows/VC15/src/curl.tmpl -VC15_SRCVCXPROJ = projects/Windows/VC15/src/curl.vcxproj.dist -VC15_SRCVCXPROJ_DEPS = $(VC15_SRCTMPL) Makefile.am src/Makefile.inc -VC_DIST = projects/README \ - projects/build-openssl.bat \ - projects/build-wolfssl.bat \ - projects/checksrc.bat \ - projects/Windows/VC6/curl-all.dsw \ - projects/Windows/VC6/lib/libcurl.dsw \ - projects/Windows/VC6/src/curl.dsw \ - projects/Windows/VC7/curl-all.sln \ - projects/Windows/VC7/lib/libcurl.sln \ - projects/Windows/VC7/src/curl.sln \ - projects/Windows/VC7.1/curl-all.sln \ - projects/Windows/VC7.1/lib/libcurl.sln \ - projects/Windows/VC7.1/src/curl.sln \ - projects/Windows/VC8/curl-all.sln \ - projects/Windows/VC8/lib/libcurl.sln \ - projects/Windows/VC8/src/curl.sln \ - projects/Windows/VC9/curl-all.sln \ - projects/Windows/VC9/lib/libcurl.sln \ - projects/Windows/VC9/src/curl.sln \ - projects/Windows/VC10/curl-all.sln \ - projects/Windows/VC10/lib/libcurl.sln \ - projects/Windows/VC10/lib/libcurl.vcxproj.filters \ - projects/Windows/VC10/src/curl.sln \ - projects/Windows/VC10/src/curl.vcxproj.filters \ - projects/Windows/VC11/curl-all.sln \ - projects/Windows/VC11/lib/libcurl.sln \ - projects/Windows/VC11/lib/libcurl.vcxproj.filters \ - projects/Windows/VC11/src/curl.sln \ - projects/Windows/VC11/src/curl.vcxproj.filters \ - projects/Windows/VC12/curl-all.sln \ - projects/Windows/VC12/lib/libcurl.sln \ - projects/Windows/VC12/lib/libcurl.vcxproj.filters \ - projects/Windows/VC12/src/curl.sln \ - projects/Windows/VC12/src/curl.vcxproj.filters \ - projects/Windows/VC14/curl-all.sln \ - projects/Windows/VC14/lib/libcurl.sln \ - projects/Windows/VC14/lib/libcurl.vcxproj.filters \ - projects/Windows/VC14/src/curl.sln \ - projects/Windows/VC14/src/curl.vcxproj.filters \ - projects/Windows/VC15/curl-all.sln \ - projects/Windows/VC15/lib/libcurl.sln \ - projects/Windows/VC15/lib/libcurl.vcxproj.filters \ - projects/Windows/VC15/src/curl.sln \ - projects/Windows/VC15/src/curl.vcxproj.filters \ - projects/generate.bat \ - projects/wolfssl_options.h \ +VC14_10_LIBTMPL = projects/Windows/VC14.10/lib/libcurl.tmpl +VC14_10_LIBVCXPROJ = projects/Windows/VC14.10/lib/libcurl.vcxproj.dist +VC14_10_LIBVCXPROJ_DEPS = $(VC14_10_LIBTMPL) Makefile.am lib/Makefile.inc +VC14_10_SRCTMPL = projects/Windows/VC14.10/src/curl.tmpl +VC14_10_SRCVCXPROJ = projects/Windows/VC14.10/src/curl.vcxproj.dist +VC14_10_SRCVCXPROJ_DEPS = $(VC14_10_SRCTMPL) Makefile.am src/Makefile.inc +VC14_30_LIBTMPL = projects/Windows/VC14.30/lib/libcurl.tmpl +VC14_30_LIBVCXPROJ = projects/Windows/VC14.30/lib/libcurl.vcxproj.dist +VC14_30_LIBVCXPROJ_DEPS = $(VC14_30_LIBTMPL) Makefile.am lib/Makefile.inc +VC14_30_SRCTMPL = projects/Windows/VC14.30/src/curl.tmpl +VC14_30_SRCVCXPROJ = projects/Windows/VC14.30/src/curl.vcxproj.dist +VC14_30_SRCVCXPROJ_DEPS = $(VC14_30_SRCTMPL) Makefile.am src/Makefile.inc +VC_DIST = projects/README.md \ + projects/build-openssl.bat \ + projects/build-wolfssl.bat \ + projects/checksrc.bat \ + projects/Windows/VC10/curl-all.sln \ + projects/Windows/VC10/lib/libcurl.sln \ + projects/Windows/VC10/lib/libcurl.vcxproj.filters \ + projects/Windows/VC10/src/curl.sln \ + projects/Windows/VC10/src/curl.vcxproj.filters \ + projects/Windows/VC11/curl-all.sln \ + projects/Windows/VC11/lib/libcurl.sln \ + projects/Windows/VC11/lib/libcurl.vcxproj.filters \ + projects/Windows/VC11/src/curl.sln \ + projects/Windows/VC11/src/curl.vcxproj.filters \ + projects/Windows/VC12/curl-all.sln \ + projects/Windows/VC12/lib/libcurl.sln \ + projects/Windows/VC12/lib/libcurl.vcxproj.filters \ + projects/Windows/VC12/src/curl.sln \ + projects/Windows/VC12/src/curl.vcxproj.filters \ + projects/Windows/VC14/curl-all.sln \ + projects/Windows/VC14/lib/libcurl.sln \ + projects/Windows/VC14/lib/libcurl.vcxproj.filters \ + projects/Windows/VC14/src/curl.sln \ + projects/Windows/VC14/src/curl.vcxproj.filters \ + projects/Windows/VC14.10/curl-all.sln \ + projects/Windows/VC14.10/lib/libcurl.sln \ + projects/Windows/VC14.10/lib/libcurl.vcxproj.filters \ + projects/Windows/VC14.10/src/curl.sln \ + projects/Windows/VC14.10/src/curl.vcxproj.filters \ + projects/Windows/VC14.30/curl-all.sln \ + projects/Windows/VC14.30/lib/libcurl.sln \ + projects/Windows/VC14.30/lib/libcurl.vcxproj.filters \ + projects/Windows/VC14.30/src/curl.sln \ + projects/Windows/VC14.30/src/curl.vcxproj.filters \ + projects/generate.bat \ + projects/wolfssl_options.h \ projects/wolfssl_override.props WINBUILD_DIST = winbuild/README.md winbuild/gen_resp_file.bat \ @@ -694,17 +666,14 @@ PLAN9_DIST = plan9/include/mkfile \ plan9/src/mkfile.inc \ plan9/src/mkfile -EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in \ - RELEASE-NOTES buildconf libcurl.pc.in MacOSX-Framework \ - scripts/updatemanpages.pl $(CMAKE_DIST) \ - $(VC_DIST) $(WINBUILD_DIST) $(PLAN9_DIST) \ - lib/libcurl.vers.in buildconf.bat scripts/coverage.sh scripts/completion.pl +EXTRA_DIST = CHANGES COPYING maketgz Makefile.dist curl-config.in \ + RELEASE-NOTES buildconf libcurl.pc.in MacOSX-Framework $(CMAKE_DIST) \ + $(VC_DIST) $(WINBUILD_DIST) $(PLAN9_DIST) lib/libcurl.vers.in buildconf.bat -CLEANFILES = $(VC6_LIBDSP) $(VC6_SRCDSP) $(VC7_LIBVCPROJ) $(VC7_SRCVCPROJ) \ - $(VC71_LIBVCPROJ) $(VC71_SRCVCPROJ) $(VC8_LIBVCPROJ) $(VC8_SRCVCPROJ) \ - $(VC9_LIBVCPROJ) $(VC9_SRCVCPROJ) $(VC10_LIBVCXPROJ) $(VC10_SRCVCXPROJ) \ - $(VC11_LIBVCXPROJ) $(VC11_SRCVCXPROJ) $(VC12_LIBVCXPROJ) $(VC12_SRCVCXPROJ) \ - $(VC14_LIBVCXPROJ) $(VC14_SRCVCXPROJ) $(VC15_LIBVCXPROJ) $(VC15_SRCVCXPROJ) +CLEANFILES = $(VC10_LIBVCXPROJ) $(VC10_SRCVCXPROJ) $(VC11_LIBVCXPROJ) \ + $(VC11_SRCVCXPROJ) $(VC12_LIBVCXPROJ) $(VC12_SRCVCXPROJ) $(VC14_LIBVCXPROJ) \ + $(VC14_SRCVCXPROJ) $(VC14_10_LIBVCXPROJ) $(VC14_10_SRCVCXPROJ) \ + $(VC14_30_LIBVCXPROJ) $(VC14_30_SRCVCXPROJ) bin_SCRIPTS = curl-config SUBDIRS = lib src @@ -735,10 +704,10 @@ LIB_VTLS_CFILES = \ vtls/bearssl.c \ vtls/gskit.c \ vtls/gtls.c \ + vtls/hostcheck.c \ vtls/keylog.c \ vtls/mbedtls.c \ vtls/mbedtls_threadlock.c \ - vtls/mesalink.c \ vtls/nss.c \ vtls/openssl.c \ vtls/rustls.c \ @@ -746,30 +715,34 @@ LIB_VTLS_CFILES = \ vtls/schannel_verify.c \ vtls/sectransp.c \ vtls/vtls.c \ - vtls/wolfssl.c + vtls/wolfssl.c \ + vtls/x509asn1.c LIB_VTLS_HFILES = \ vtls/bearssl.h \ vtls/gskit.h \ vtls/gtls.h \ + vtls/hostcheck.h \ vtls/keylog.h \ vtls/mbedtls.h \ vtls/mbedtls_threadlock.h \ - vtls/mesalink.h \ vtls/nssg.h \ vtls/openssl.h \ vtls/rustls.h \ vtls/schannel.h \ vtls/sectransp.h \ vtls/vtls.h \ - vtls/wolfssl.h + vtls/wolfssl.h \ + vtls/x509asn1.h LIB_VQUIC_CFILES = \ + vquic/msh3.c \ vquic/ngtcp2.c \ vquic/quiche.c \ vquic/vquic.c LIB_VQUIC_HFILES = \ + vquic/msh3.h \ vquic/ngtcp2.h \ vquic/quiche.h \ vquic/vquic.h @@ -822,16 +795,18 @@ LIB_CFILES = \ escape.c \ file.c \ fileinfo.c \ + fopen.c \ formdata.c \ ftp.c \ ftplistparser.c \ getenv.c \ getinfo.c \ gopher.c \ + h2h3.c \ hash.c \ + headers.c \ hmac.c \ hostasyn.c \ - hostcheck.c \ hostip.c \ hostip4.c \ hostip6.c \ @@ -861,7 +836,6 @@ LIB_CFILES = \ mqtt.c \ multi.c \ netrc.c \ - non-ascii.c \ nonblock.c \ openldap.c \ parsedate.c \ @@ -894,6 +868,7 @@ LIB_CFILES = \ system_win32.c \ telnet.c \ tftp.c \ + timediff.c \ timeval.c \ transfer.c \ url.c \ @@ -901,8 +876,7 @@ LIB_CFILES = \ version.c \ version_win32.c \ warnless.c \ - wildcard.c \ - x509asn1.c + wildcard.c LIB_HFILES = \ altsvc.h \ @@ -949,18 +923,21 @@ LIB_HFILES = \ doh.h \ dotdot.h \ dynbuf.h \ + easy_lock.h \ easyif.h \ easyoptions.h \ escape.h \ file.h \ fileinfo.h \ + fopen.h \ formdata.h \ ftp.h \ ftplistparser.h \ getinfo.h \ gopher.h \ + h2h3.h \ hash.h \ - hostcheck.h \ + headers.h \ hostip.h \ hsts.h \ http.h \ @@ -982,7 +959,6 @@ LIB_HFILES = \ multihandle.h \ multiif.h \ netrc.h \ - non-ascii.h \ nonblock.h \ parsedate.h \ pingpong.h \ @@ -1015,6 +991,7 @@ LIB_HFILES = \ system_win32.h \ telnet.h \ tftp.h \ + timediff.h \ timeval.h \ transfer.h \ url.h \ @@ -1022,8 +999,7 @@ LIB_HFILES = \ urldata.h \ version_win32.h \ warnless.h \ - wildcard.h \ - x509asn1.h + wildcard.h LIB_RCFILES = libcurl.rc CSOURCES = $(LIB_CFILES) $(LIB_VAUTH_CFILES) $(LIB_VTLS_CFILES) \ @@ -1032,11 +1008,11 @@ CSOURCES = $(LIB_CFILES) $(LIB_VAUTH_CFILES) $(LIB_VTLS_CFILES) \ HHEADERS = $(LIB_HFILES) $(LIB_VAUTH_HFILES) $(LIB_VTLS_HFILES) \ $(LIB_VQUIC_HFILES) $(LIB_VSSH_HFILES) - # libcurl has sources that provide functions named curlx_* that aren't part of # the official API, but we re-use the code here to avoid duplication. CURLX_CFILES = \ ../lib/strtoofft.c \ + ../lib/timediff.c \ ../lib/nonblock.c \ ../lib/warnless.c \ ../lib/curl_ctype.c \ @@ -1047,6 +1023,7 @@ CURLX_CFILES = \ CURLX_HFILES = \ ../lib/curl_setup.h \ ../lib/strtoofft.h \ + ../lib/timediff.h \ ../lib/nonblock.h \ ../lib/warnless.h \ ../lib/curl_ctype.h \ @@ -1065,19 +1042,19 @@ CURL_CFILES = \ tool_cb_see.c \ tool_cb_wrt.c \ tool_cfgable.c \ - tool_convert.c \ tool_dirhie.c \ tool_doswin.c \ tool_easysrc.c \ tool_filetime.c \ + tool_findfile.c \ tool_formparse.c \ tool_getparam.c \ tool_getpass.c \ tool_help.c \ tool_helpers.c \ - tool_homedir.c \ tool_hugehelp.c \ tool_libinfo.c \ + tool_listhelp.c \ tool_main.c \ tool_msgs.c \ tool_operate.c \ @@ -1107,17 +1084,16 @@ CURL_HFILES = \ tool_cb_see.h \ tool_cb_wrt.h \ tool_cfgable.h \ - tool_convert.h \ tool_dirhie.h \ tool_doswin.h \ tool_easysrc.h \ tool_filetime.h \ + tool_findfile.h \ tool_formparse.h \ tool_getparam.h \ tool_getpass.h \ tool_help.h \ tool_helpers.h \ - tool_homedir.h \ tool_hugehelp.h \ tool_libinfo.h \ tool_main.h \ @@ -1688,7 +1664,6 @@ uninstall-am: uninstall-binSCRIPTS uninstall-pkgconfigDATA .PRECIOUS: Makefile - # List of files required to generate VC IDE .dsp, .vcproj and .vcxproj files dist-hook: @@ -1732,6 +1707,9 @@ check: test examples check-docs @CROSSCOMPILING_FALSE@test-am: @CROSSCOMPILING_FALSE@ @(cd tests; $(MAKE) all am-test) +@CROSSCOMPILING_FALSE@test-ci: +@CROSSCOMPILING_FALSE@ @(cd tests; $(MAKE) all ci-test) + examples: @(cd docs/examples; $(MAKE) check) @@ -1797,13 +1775,13 @@ uninstall-hook: (cd docs && $(MAKE) uninstall) (cd docs/libcurl && $(MAKE) uninstall) -ca-bundle: lib/mk-ca-bundle.pl +ca-bundle: $(srcdir)/scripts/mk-ca-bundle.pl @echo "generating a fresh ca-bundle.crt" - @perl $< -b -l -u lib/ca-bundle.crt + @perl $(srcdir)/scripts/mk-ca-bundle.pl -b -l -u lib/ca-bundle.crt -ca-firefox: lib/firefox-db2pem.sh +ca-firefox: $(srcdir)/scripts/firefox-db2pem.sh @echo "generating a fresh ca-bundle.crt" - ./lib/firefox-db2pem.sh lib/ca-bundle.crt + $(srcdir)/scripts/firefox-db2pem.sh lib/ca-bundle.crt checksrc: (cd lib && $(MAKE) checksrc) @@ -1815,13 +1793,11 @@ checksrc: .PHONY: vc-ide -vc-ide: $(VC6_LIBDSP_DEPS) $(VC6_SRCDSP_DEPS) $(VC7_LIBVCPROJ_DEPS) \ - $(VC7_SRCVCPROJ_DEPS) $(VC71_LIBVCPROJ_DEPS) $(VC71_SRCVCPROJ_DEPS) \ - $(VC8_LIBVCPROJ_DEPS) $(VC8_SRCVCPROJ_DEPS) $(VC9_LIBVCPROJ_DEPS) \ - $(VC9_SRCVCPROJ_DEPS) $(VC10_LIBVCXPROJ_DEPS) $(VC10_SRCVCXPROJ_DEPS) \ +vc-ide: $(VC10_LIBVCXPROJ_DEPS) $(VC10_SRCVCXPROJ_DEPS) \ $(VC11_LIBVCXPROJ_DEPS) $(VC11_SRCVCXPROJ_DEPS) $(VC12_LIBVCXPROJ_DEPS) \ $(VC12_SRCVCXPROJ_DEPS) $(VC14_LIBVCXPROJ_DEPS) $(VC14_SRCVCXPROJ_DEPS) \ - $(VC15_LIBVCXPROJ_DEPS) $(VC15_SRCVCXPROJ_DEPS) + $(VC14_10_LIBVCXPROJ_DEPS) $(VC14_10_SRCVCXPROJ_DEPS) \ + $(VC14_30_LIBVCXPROJ_DEPS) $(VC14_30_SRCVCXPROJ_DEPS) @(win32_lib_srcs='$(LIB_CFILES)'; \ win32_lib_hdrs='$(LIB_HFILES) config-win32.h'; \ win32_lib_rc='$(LIB_RCFILES)'; \ @@ -1982,104 +1958,8 @@ function gen_element(type, dir, file)\ printf("%s\r\n", $$0);\ }';\ \ - echo "generating '$(VC6_LIBDSP)'"; \ - awk -v proj_type=dsp \ - -v lib_srcs="$$sorted_lib_srcs" \ - -v lib_hdrs="$$sorted_lib_hdrs" \ - -v lib_rc="$$win32_lib_rc" \ - -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \ - -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \ - -v lib_vquic_srcs="$$sorted_lib_vquic_srcs" \ - -v lib_vquic_hdrs="$$sorted_lib_vquic_hdrs" \ - -v lib_vssh_srcs="$$sorted_lib_vssh_srcs" \ - -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ - -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ - -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC6_LIBTMPL) > $(VC6_LIBDSP) || { exit 1; }; \ - \ - echo "generating '$(VC6_SRCDSP)'"; \ - awk -v proj_type=dsp \ - -v src_srcs="$$sorted_src_srcs" \ - -v src_hdrs="$$sorted_src_hdrs" \ - -v src_rc="$$win32_src_rc" \ - -v src_x_srcs="$$sorted_src_x_srcs" \ - -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC6_SRCTMPL) > $(VC6_SRCDSP) || { exit 1; }; \ - \ - echo "generating '$(VC7_LIBVCPROJ)'"; \ - awk -v proj_type=vcproj1 \ - -v lib_srcs="$$sorted_lib_srcs" \ - -v lib_hdrs="$$sorted_lib_hdrs" \ - -v lib_rc="$$win32_lib_rc" \ - -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \ - -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \ - -v lib_vquic_srcs="$$sorted_lib_vquic_srcs" \ - -v lib_vquic_hdrs="$$sorted_lib_vquic_hdrs" \ - -v lib_vssh_srcs="$$sorted_lib_vssh_srcs" \ - -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ - -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ - -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC7_LIBTMPL) > $(VC7_LIBVCPROJ) || { exit 1; }; \ - \ - echo "generating '$(VC7_SRCVCPROJ)'"; \ - awk -v proj_type=vcproj1 \ - -v src_srcs="$$sorted_src_srcs" \ - -v src_hdrs="$$sorted_src_hdrs" \ - -v src_rc="$$win32_src_rc" \ - -v src_x_srcs="$$sorted_src_x_srcs" \ - -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC7_SRCTMPL) > $(VC7_SRCVCPROJ) || { exit 1; }; \ - \ - echo "generating '$(VC71_LIBVCPROJ)'"; \ - awk -v proj_type=vcproj1 \ - -v lib_srcs="$$sorted_lib_srcs" \ - -v lib_hdrs="$$sorted_lib_hdrs" \ - -v lib_rc="$$win32_lib_rc" \ - -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \ - -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \ - -v lib_vquic_srcs="$$sorted_lib_vquic_srcs" \ - -v lib_vquic_hdrs="$$sorted_lib_vquic_hdrs" \ - -v lib_vssh_srcs="$$sorted_lib_vssh_srcs" \ - -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ - -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ - -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC71_LIBTMPL) > $(VC71_LIBVCPROJ) || { exit 1; }; \ - \ - echo "generating '$(VC71_SRCVCPROJ)'"; \ - awk -v proj_type=vcproj1 \ - -v src_srcs="$$sorted_src_srcs" \ - -v src_hdrs="$$sorted_src_hdrs" \ - -v src_rc="$$win32_src_rc" \ - -v src_x_srcs="$$sorted_src_x_srcs" \ - -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC71_SRCTMPL) > $(VC71_SRCVCPROJ) || { exit 1; }; \ - \ - echo "generating '$(VC8_LIBVCPROJ)'"; \ - awk -v proj_type=vcproj2 \ - -v lib_srcs="$$sorted_lib_srcs" \ - -v lib_hdrs="$$sorted_lib_hdrs" \ - -v lib_rc="$$win32_lib_rc" \ - -v lib_vauth_srcs="$$sorted_lib_vauth_srcs" \ - -v lib_vauth_hdrs="$$sorted_lib_vauth_hdrs" \ - -v lib_vquic_srcs="$$sorted_lib_vquic_srcs" \ - -v lib_vquic_hdrs="$$sorted_lib_vquic_hdrs" \ - -v lib_vssh_srcs="$$sorted_lib_vssh_srcs" \ - -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ - -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ - -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC8_LIBTMPL) > $(VC8_LIBVCPROJ) || { exit 1; }; \ - \ - echo "generating '$(VC8_SRCVCPROJ)'"; \ - awk -v proj_type=vcproj2 \ - -v src_srcs="$$sorted_src_srcs" \ - -v src_hdrs="$$sorted_src_hdrs" \ - -v src_rc="$$win32_src_rc" \ - -v src_x_srcs="$$sorted_src_x_srcs" \ - -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC8_SRCTMPL) > $(VC8_SRCVCPROJ) || { exit 1; }; \ - \ - echo "generating '$(VC9_LIBVCPROJ)'"; \ - awk -v proj_type=vcproj2 \ + echo "generating '$(VC10_LIBVCXPROJ)'"; \ + awk -v proj_type=vcxproj \ -v lib_srcs="$$sorted_lib_srcs" \ -v lib_hdrs="$$sorted_lib_hdrs" \ -v lib_rc="$$win32_lib_rc" \ @@ -2091,18 +1971,18 @@ function gen_element(type, dir, file)\ -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC9_LIBTMPL) > $(VC9_LIBVCPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC10_LIBTMPL) > $(VC10_LIBVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC9_SRCVCPROJ)'"; \ - awk -v proj_type=vcproj2 \ + echo "generating '$(VC10_SRCVCXPROJ)'"; \ + awk -v proj_type=vcxproj \ -v src_srcs="$$sorted_src_srcs" \ -v src_hdrs="$$sorted_src_hdrs" \ -v src_rc="$$win32_src_rc" \ -v src_x_srcs="$$sorted_src_x_srcs" \ -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC9_SRCTMPL) > $(VC9_SRCVCPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC10_SRCTMPL) > $(VC10_SRCVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC10_LIBVCXPROJ)'"; \ + echo "generating '$(VC11_LIBVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v lib_srcs="$$sorted_lib_srcs" \ -v lib_hdrs="$$sorted_lib_hdrs" \ @@ -2115,18 +1995,18 @@ function gen_element(type, dir, file)\ -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC10_LIBTMPL) > $(VC10_LIBVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC11_LIBTMPL) > $(VC11_LIBVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC10_SRCVCXPROJ)'"; \ + echo "generating '$(VC11_SRCVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v src_srcs="$$sorted_src_srcs" \ -v src_hdrs="$$sorted_src_hdrs" \ -v src_rc="$$win32_src_rc" \ -v src_x_srcs="$$sorted_src_x_srcs" \ -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC10_SRCTMPL) > $(VC10_SRCVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC11_SRCTMPL) > $(VC11_SRCVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC11_LIBVCXPROJ)'"; \ + echo "generating '$(VC12_LIBVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v lib_srcs="$$sorted_lib_srcs" \ -v lib_hdrs="$$sorted_lib_hdrs" \ @@ -2139,18 +2019,18 @@ function gen_element(type, dir, file)\ -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC11_LIBTMPL) > $(VC11_LIBVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC12_LIBTMPL) > $(VC12_LIBVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC11_SRCVCXPROJ)'"; \ + echo "generating '$(VC12_SRCVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v src_srcs="$$sorted_src_srcs" \ -v src_hdrs="$$sorted_src_hdrs" \ -v src_rc="$$win32_src_rc" \ -v src_x_srcs="$$sorted_src_x_srcs" \ -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC11_SRCTMPL) > $(VC11_SRCVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC12_SRCTMPL) > $(VC12_SRCVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC12_LIBVCXPROJ)'"; \ + echo "generating '$(VC14_LIBVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v lib_srcs="$$sorted_lib_srcs" \ -v lib_hdrs="$$sorted_lib_hdrs" \ @@ -2163,18 +2043,18 @@ function gen_element(type, dir, file)\ -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC12_LIBTMPL) > $(VC12_LIBVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC14_LIBTMPL) > $(VC14_LIBVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC12_SRCVCXPROJ)'"; \ + echo "generating '$(VC14_SRCVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v src_srcs="$$sorted_src_srcs" \ -v src_hdrs="$$sorted_src_hdrs" \ -v src_rc="$$win32_src_rc" \ -v src_x_srcs="$$sorted_src_x_srcs" \ -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC12_SRCTMPL) > $(VC12_SRCVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC14_SRCTMPL) > $(VC14_SRCVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC14_LIBVCXPROJ)'"; \ + echo "generating '$(VC14_10_LIBVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v lib_srcs="$$sorted_lib_srcs" \ -v lib_hdrs="$$sorted_lib_hdrs" \ @@ -2187,18 +2067,18 @@ function gen_element(type, dir, file)\ -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC14_LIBTMPL) > $(VC14_LIBVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC14_10_LIBTMPL) > $(VC14_10_LIBVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC14_SRCVCXPROJ)'"; \ + echo "generating '$(VC14_10_SRCVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v src_srcs="$$sorted_src_srcs" \ -v src_hdrs="$$sorted_src_hdrs" \ -v src_rc="$$win32_src_rc" \ -v src_x_srcs="$$sorted_src_x_srcs" \ -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC14_SRCTMPL) > $(VC14_SRCVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC14_10_SRCTMPL) > $(VC14_10_SRCVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC15_LIBVCXPROJ)'"; \ + echo "generating '$(VC14_30_LIBVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v lib_srcs="$$sorted_lib_srcs" \ -v lib_hdrs="$$sorted_lib_hdrs" \ @@ -2211,16 +2091,16 @@ function gen_element(type, dir, file)\ -v lib_vssh_hdrs="$$sorted_lib_vssh_hdrs" \ -v lib_vtls_srcs="$$sorted_lib_vtls_srcs" \ -v lib_vtls_hdrs="$$sorted_lib_vtls_hdrs" \ - "$$awk_code" $(srcdir)/$(VC15_LIBTMPL) > $(VC15_LIBVCXPROJ) || { exit 1; }; \ + "$$awk_code" $(srcdir)/$(VC14_30_LIBTMPL) > $(VC14_30_LIBVCXPROJ) || { exit 1; }; \ \ - echo "generating '$(VC15_SRCVCXPROJ)'"; \ + echo "generating '$(VC14_30_SRCVCXPROJ)'"; \ awk -v proj_type=vcxproj \ -v src_srcs="$$sorted_src_srcs" \ -v src_hdrs="$$sorted_src_hdrs" \ -v src_rc="$$win32_src_rc" \ -v src_x_srcs="$$sorted_src_x_srcs" \ -v src_x_hdrs="$$sorted_src_x_hdrs" \ - "$$awk_code" $(srcdir)/$(VC15_SRCTMPL) > $(VC15_SRCVCXPROJ) || { exit 1; };) + "$$awk_code" $(srcdir)/$(VC14_30_SRCTMPL) > $(VC14_30_SRCVCXPROJ) || { exit 1; };) tidy: (cd src && $(MAKE) tidy) diff --git a/trunk/libs/libcurl/curl-7.x/README b/trunk/libs/libcurl/curl-7.x/README new file mode 100644 index 00000000..9705f419 --- /dev/null +++ b/trunk/libs/libcurl/curl-7.x/README @@ -0,0 +1,55 @@ + _ _ ____ _ + ___| | | | _ \| | + / __| | | | |_) | | + | (__| |_| | _ <| |___ + \___|\___/|_| \_\_____| + +README + + Curl is a command line tool for transferring data specified with URL + syntax. Find out how to use curl by reading the curl.1 man page or the + MANUAL document. Find out how to install Curl by reading the INSTALL + document. + + libcurl is the library curl is using to do its job. It is readily + available to be used by your software. Read the libcurl.3 man page to + learn how! + + You find answers to the most frequent questions we get in the FAQ document. + + Study the COPYING file for distribution terms. + + Those documents and more can be found in the docs/ directory. + +CONTACT + + If you have problems, questions, ideas or suggestions, please contact us + by posting to a suitable mailing list. See https://curl.se/mail/ + + All contributors to the project are listed in the THANKS document. + +WEBSITE + + Visit the curl website for the latest news and downloads: + + https://curl.se/ + +GIT + + To download the very latest source off the GIT server do this: + + git clone https://github.com/curl/curl.git + + (you will get a directory named curl created, filled with the source code) + +SECURITY PROBLEMS + + Report suspected security problems via our HackerOne page and not in public! + + https://hackerone.com/curl + +NOTICE + + Curl contains pieces of source code that is Copyright (c) 1998, 1999 + Kungliga Tekniska Högskolan. This notice is included here to comply with the + distribution terms. diff --git a/trunk/libs/libcurl/curl-7.x/RELEASE-NOTES b/trunk/libs/libcurl/curl-7.x/RELEASE-NOTES new file mode 100644 index 00000000..30165420 --- /dev/null +++ b/trunk/libs/libcurl/curl-7.x/RELEASE-NOTES @@ -0,0 +1,379 @@ +curl and libcurl 7.85.0 + + Public curl releases: 210 + Command line options: 248 + curl_easy_setopt() options: 299 + Public functions in libcurl: 88 + Contributors: 2690 + +This release includes the following changes: + + o quic: add support via wolfSSL [142] + o schannel: Add TLS 1.3 support [96] + o setopt: add CURLOPT_PROTOCOLS_STR and CURLOPT_REDIR_PROTOCOLS_STR [30] + +This release includes the following bugfixes: + + o amigaos: fix threaded resolver on AmigaOS 4.x [133] + o amissl: allow AmiSSL to be used with AmigaOS 4.x builds [115] + o amissl: make AmiSSL v5 a minimum requirement [117] + o asyn-ares: make a single alloc out of hostname + async data [123] + o asyn-thread: fix socket leak on OOM [128] + o asyn-thread: make getaddrinfo_complete return CURLcode [53] + o base64: base64url encoding has no padding [41] + o BUGS.md: improve language [62] + o build: improve OS string in CMake and `config-win32.h` [15] + o cert.d: clarify that escape character works for file paths [161] + o cirrus.yml: replace py38-pip with py39-pip [63] + o cirrus/freebsd-ci: bootstrap the pip installer [104] + o cmake: add detection of threadsafe feature [163] + o cmake: do not force Windows target versions [28] + o cmake: fix build for mingw cross compile [33] + o cmake: link curl to its dependencies with PRIVATE [57] + o cmake: remove APPEND in export(TARGETS) [58] + o cmake: set feature PSL if present [168] + o cmake: support ngtcp2 boringssl backend [18] + o cmdline-opts/gen.pl: improve performance [97] + o config: remove the check for and use of SIZEOF_SHORT [129] + o configure: -pthread not available on AmigaOS 4.x [118] + o configure: check for the stdatomic.h header in configure [7] + o configure: fix --disable-headers-api [55] + o configure: fix broken m4 syntax in TLS options [145] + o configure: fixup bsdsocket detection code for AmigaOS 4.x [110] + o configure: if asked to use TLS, fail if no TLS lib was detected [156] + o configure: introduce CURL_SIZEOF [130] + o connect: add quic connection information [100] + o connect: close the happy eyeballs loser connection when using QUIC [109] + o connect: revert the use of IP*_RECVERR [102] + o connect: set socktype/protocol correctly [114] + o cookie: reject cookies with "control bytes" [152] + o cookie: treat a blank domain in Set-Cookie: as non-existing [40] + o cookie: use %zu to infof() for size_t values [26] + o curl-compilers.m4: make icc use -diag* options and disable two warnings [84] + o curl-config: quote directories with potential space [132] + o curl-confopts: remove leftover AC_REQUIREs [91] + o curl-functions.m4: check whether atomics can link [86] + o curl-wolfssl.m4: add options header when building test code [87] + o curl.h: CURLE_CONV_FAILED is obsoleted [4] + o curl.h: include on SunOS [151] + o curl: output warning when a cookie is dropped due to size [5] + o curl: writeout: fix repeated header outputs [47] + o Curl_close: call Curl_resolver_cancel to avoid memory-leak [124] + o curl_easy_header: Add CURLH_PSEUDO to sanity check [94] + o curl_mime_data.3: polish the wording [6] + o curl_multi_timeout.3: clarify usage [48] + o CURLINFO_SPEED_UPLOAD/DOWNLOAD.3: fix examples [121] + o CURLOPT_BUFFERSIZE.3: add upload buffersize to see also [159] + o CURLOPT_CONNECT_ONLY.3: clarify multi API use [64] + o CURLOPT_SERVER_RESPONSE_TIMEOUT: the new name [16] + o digest: fix memory leak, fix not quoted 'opaque' [66] + o digest: fix missing increment of 'nc' value for auth-int [39] + o digest: pass over leading spaces in qop values [119] + o digest: reject broken header with session protocol but without qop [120] + o docs/cmdline-opts/gen.pl: encode leading single and double quotes [138] + o docs/cmdline-opts: fix example and categories for --form-escape [125] + o docs/cmdline: mark fail and fail-with-body as mutually exclusive [98] + o docs: add dns category to --resolve [95] + o docs: explain curl_easy_escape/unescape curl handle is ignored [23] + o docs: remove him/her/he/she from documentation [103] + o doh: move doh related struct definitions to doh.h [45] + o doh: use https protocol by default [51] + o easy_lock.h: include sched.h if available to fix build [13] + o easy_lock.h: use __asm__ instead of asm to fix build [11] + o easy_lock: fix build for mingw [34] + o easy_lock: fix build with icc [54] + o easy_lock: fix the #ifdef conditional for ia32_pause [8] + o easy_lock: switch to using atomic_int instead of bool [9] + o easyoptions: fix icc warning [42] + o escape: remove outdated comment [25] + o examples/curlx.c: remove [150] + o file: add handling of native AmigaOS paths [108] + o file: fix icc enumerated type mixed with another type warning [92] + o ftp: use a correct expire ID for timer expiry [88] + o getinfo: return better error on NULL as first argument [21] + o GHA: add two Intel compiler CI jobs [85] + o GHA: move libressl CI from zuul to GitHub [144] + o gha: move over ngtcp2-gnutls CI job from zuul [162] + o GHA: mv CI torture test from Zuul [135] + o h2h3: fix overriding the 'TE: Trailers' header [43] + o hostip: resolve *.localhost to 127.0.0.1/::1 [127] + o HTTP3.md: update to msh3 v0.4.0 [126] + o http: typecast the httpreq assignment to avoid icc compiler warning [76] + o http_aws_sigv4.c: remove two unusued includes [36] + o http_chunks: remove an assign + typecast [82] + o hyper: customize test1274 to how hyper unfolds headers [131] + o hyper: enable obs-folded multiline headers [101] + o hyper: use wakers for curl pause/resume [2] + o imap: use ISALNUM() for alphanumeric checks [134] + o ldap: adapt to conn->port now being an 'int' [106] + o lib/curl_path.c: add ISC to license expression [1] + o lib3026: reduce the number of threads to 100 [44] + o libcurl-security.3: fix typo on macro "SH_" [12] + o libssh2: make atime/mtime date overflow return error [148] + o libssh2: provide symlink name in SFTP dir listing [155] + o libssh: ignore deprecation warnings [157] + o libssh: make atime/mtime date overflow return error [149] + o Makefile.m32: add `CURL_RC` and `CURL_STRIP` variables [ci skip] [17] + o Makefile.m32: add `NGTCP2_LIBS` option [ci skip] [38] + o makefile.m32: add support for custom ARCH [ci skip] [27] + o Makefile.m32: allow -nghttp3/-ngtcp2 without -ssl [ci skip] [141] + o Makefile.m32: do not set the libcurl.rc debug flag [ci skip] [3] + o Makefile.m32: stop trying to build libcares.a [ci skip] [46] + o memdebug: add annotation attributes [143] + o mprintf: fix *dyn_vprintf() when out-of-memory [90] + o mprintf: make dprintf_formatf never return negative [49] + o msh3: fix the QUIC disconnect function [107] + o multi: fix the return code from Curl_pgrsDone() [80] + o multi: have curl_multi_remove_handle close CONNECT_ONLY transfer [136] + o multi: use a pipe instead of a socketpair on apple platforms [154] + o multi: use larger dns hash table for multi interface [140] + o multi_wait: fix and improve Curl_poll error handling on Windows [146] + o multi_wait: fix skipping to populate revents for extra_fds [147] + o netrc.d: remove spurious quote [37] + o netrc: Use the password from lines without login [166] + o ngtcp2: Fix build error due to change in nghttp3 prototypes [61] + o ngtcp2: fix incompatible function pointer types [10] + o ngtcp2: Fix missing initialization of nghttp3_nv.flags [31] + o ngtcp2: fix stall or busy loop on STOP_SENDING with upload data [19] + o ngtcp2: implement cb_h3_stop_sending and cb_h3_reset_stream callbacks [59] + o openssl: add `CURL_BORINGSSL_VERSION` to identify BoringSSL [24] + o openssl: add cert path in error message [160] + o openssl: add details to "unable to set client certificate" error [116] + o openssl: fix BoringSSL symbol conflicts with LDAP and Schannel [52] + o quiche: fix build failure [99] + o select: do not return fatal error on EINTR from poll() [32] + o sendf: fix paused header writes since after the header API [89] + o sendf: make Curl_debug a void function [81] + o sendf: skip storing HTTP headers if HTTP disabled [73] + o sendf: store the header type in an usigned char to avoid icc warnings [79] + o splay: avoid using -1 in unsigned variable [78] + o test3026: add support for Windows using native Win32 threads [65] + o test3026: require 'threadsafe' [56] + o test44[2-4]: add '--resolve' to the keywords [122] + o tests/server/sockfilt.c: avoid race condition without a mutex [139] + o tests: fix http2 tests to use CRLF headers [153] + o tests: several enumerated type cleanups [67] + o THANKS: merged two entries for Evgeny Grin + o tidy-up: delete unused build configuration macros [93] + o tool: reintroduce set file comment code for AmigaOS [111] + o tool_cfgable: make 'synthetic_error' a plain bool [70] + o tool_formparse: fix variable may be used before its value is set [72] + o tool_getparam: make --doh-url "" switch it off [60] + o tool_getparam: repair cleanarg [22] + o tool_operate: better cleanup of easy handle in exit path [20] + o tool_paramhlp: fix "enumerated type mixed with another type" [68] + o tool_paramhlp: make check_protocol return ParameterError [71] + o tool_progress: avoid division by zero in parallel progress meter [35] + o tool_writeout: fix enumerated type mixed with another type [69] + o trace: 0x7F character is non-printable [50] + o unit1303: four tests should have TRUE for 'connecting' [158] + o url: enumerated type mixed with another type [74] + o url: really use the user provided in the url when netrc entry exists [165] + o url: reject URLs with hostnames longer than 65535 bytes [137] + o url: treat missing usernames in netrc as empty [167] + o urldata: change second proxytype field to unsigned char to match [75] + o urldata: make 'negnpn' use less storage [112] + o urldata: make state.httpreq an unsigned char [77] + o urldata: make three *_proto struct fields smaller [113] + o urldata: move smaller fields down in connectdata struct [105] + o urldata: reduce size of several struct fields [14] + o vtls: make Curl_ssl_backend() return the enum type curl_sslbackend [83] + o windows: improve random source [29] + +This release includes the following known bugs: + + o see docs/KNOWN_BUGS (https://curl.se/docs/knownbugs.html) + +This release would not have looked like this without help, code, reports and +advice from friends like these: + + Adam Sampson, Alessandro Ghedini, Alexandre Bury, Andreas Sommer, + Andrew Lambert, Axel Chong, Brad Forschinger, Brian Carpenter, + Cering on github, Chris Paulson-Ellis, Chris Young, Daniel Katz, + Daniel Stenberg, David Carlier, dEajL3kA on github, Domen Kožar, + Dominik Thalhammer, Don J Olmstead, Dustin Howett, Emanuele Torre, + Emil Engler, Érico Nogueira Rolim, Even Rouault, Evgeny Grin (Karlson2k), + Fabian Fischer, Fabian Keil, Gisle Vanem, Gwen Shapira, Harry Sintonen, + highmtworks on github, Ivan Tsybulin, Jacob Tolar, Jakub Zakrzewski, + Jilayne Lovejoy, Joshua Root, jurisuk on github, jvvprasad78 on github, + Kai Pastor, Litter White, lwthiker on github, Marcel Raad, Marc Hörsken, + Marco Kamner, MasterInQuestion on github, Matthew Thompson, Maxim Ivanov, + Michael Trebilcock, Michał Antoniak, Nao Yonashiro, Nick Banks, + Oliver Roberts, opensignature on github, Orgad Shaneh, Patrick Monnerat, + Philip H, privetryan on github, Ray Satiro, rcombs on github, Rosen Penev, + Ryan Schmidt, Ryan Sleevi, rzrymiak on github, Samuel Henrique, + Sean McArthur, Sergey Ogryzkov, Somnath Kundu, Stefan Eissing, + Sukanya Hanumanthu, Tatsuhiro Tsujikawa, Ted Lyngmo, TheKnarf on github, + Thomas Weißschuh, Tobias Nygren, Viktor Szakats, vlubart on github, Wu Zheng, + Wyatt O'Day, Xiaoke Wang, yiyuaner on github + (79 contributors) + +References to bug reports and discussions on issues: + + [1] = https://curl.se/bug/?i=9073 + [2] = https://curl.se/bug/?i=9070 + [3] = https://curl.se/bug/?i=9069 + [4] = https://curl.se/bug/?i=9067 + [5] = https://curl.se/bug/?i=9064 + [6] = https://curl.se/bug/?i=9063 + [7] = https://curl.se/bug/?i=9059 + [8] = https://curl.se/bug/?i=9058 + [9] = https://curl.se/bug/?i=9055 + [10] = https://curl.se/bug/?i=9056 + [11] = https://curl.se/bug/?i=9056 + [12] = https://curl.se/bug/?i=9057 + [13] = https://curl.se/bug/?i=9054 + [14] = https://curl.se/bug/?i=9106 + [15] = https://curl.se/bug/?i=9117 + [16] = https://curl.se/bug/?i=9104 + [17] = https://curl.se/bug/?i=9132 + [18] = https://curl.se/bug/?i=9065 + [19] = https://curl.se/bug/?i=9122 + [20] = https://curl.se/bug/?i=9114 + [21] = https://curl.se/bug/?i=9114 + [22] = https://curl.se/bug/?i=9128 + [23] = https://curl.se/bug/?i=9115 + [24] = https://curl.se/bug/?i=9113 + [25] = https://curl.se/bug/?i=9115 + [26] = https://curl.se/bug/?i=9095 + [27] = https://curl.se/bug/?i=9092 + [28] = https://curl.se/bug/?i=9046 + [29] = https://curl.se/bug/?i=9027 + [30] = https://curl.se/bug/?i=8992 + [31] = https://curl.se/bug/?i=9118 + [32] = https://bugs.archlinux.org/task/75201 + [33] = https://curl.se/bug/?i=9084 + [34] = https://curl.se/bug/?i=8997 + [35] = https://curl.se/bug/?i=9082 + [36] = https://curl.se/bug/?i=9080 + [37] = https://curl.se/bug/?i=9111 + [38] = https://curl.se/bug/?i=9109 + [39] = https://curl.se/bug/?i=9090 + [40] = https://curl.se/bug/?i=9164 + [41] = https://curl.se/bug/?i=9139 + [42] = https://curl.se/bug/?i=9176 + [43] = https://curl.se/bug/?i=9170 + [44] = https://curl.se/bug/?i=9172 + [45] = https://curl.se/bug/?i=9174 + [46] = https://curl.se/bug/?i=9169 + [47] = https://curl.se/bug/?i=9150 + [48] = https://curl.se/bug/?i=9155 + [49] = https://curl.se/bug/?i=9149 + [50] = https://curl.se/bug/?i=9162 + [51] = https://curl.se/bug/?i=9163 + [52] = https://curl.se/bug/?i=9110 + [53] = https://curl.se/bug/?i=9081 + [54] = https://curl.se/bug/?i=9081 + [55] = https://curl.se/bug/?i=9134 + [56] = https://curl.se/bug/?i=9141 + [57] = https://curl.se/bug/?i=9125 + [58] = https://curl.se/bug/?i=9124 + [59] = https://curl.se/bug/?i=9135 + [60] = https://curl.se/bug/?i=9207 + [61] = https://curl.se/bug/?i=9204 + [62] = https://curl.se/bug/?i=9205 + [63] = https://curl.se/bug/?i=9201 + [64] = https://curl.se/bug/?i=9244 + [65] = https://curl.se/bug/?i=9012 + [66] = https://curl.se/bug/?i=9199 + [67] = https://curl.se/bug/?i=9179 + [68] = https://curl.se/bug/?i=9179 + [69] = https://curl.se/bug/?i=9179 + [70] = https://curl.se/bug/?i=9179 + [71] = https://curl.se/bug/?i=9179 + [72] = https://curl.se/bug/?i=9179 + [73] = https://curl.se/bug/?i=9179 + [74] = https://curl.se/bug/?i=9179 + [75] = https://curl.se/bug/?i=9179 + [76] = https://curl.se/bug/?i=9179 + [77] = https://curl.se/bug/?i=9179 + [78] = https://curl.se/bug/?i=9179 + [79] = https://curl.se/bug/?i=9179 + [80] = https://curl.se/bug/?i=9179 + [81] = https://curl.se/bug/?i=9179 + [82] = https://curl.se/bug/?i=9179 + [83] = https://curl.se/bug/?i=9179 + [84] = https://curl.se/bug/?i=9179 + [85] = https://curl.se/bug/?i=9179 + [86] = https://curl.se/bug/?i=9190 + [87] = https://curl.se/bug/?i=9187 + [88] = https://curl.se/bug/?i=9184 + [89] = https://curl.se/bug/?i=9180 + [90] = https://curl.se/bug/?i=9185 + [91] = https://curl.se/bug/?i=9183 + [92] = https://curl.se/bug/?i=9181 + [93] = https://curl.se/bug/?i=9044 + [94] = https://curl.se/bug/?i=9235 + [95] = https://curl.se/bug/?i=9229 + [96] = https://curl.se/bug/?i=8419 + [97] = https://curl.se/bug/?i=9230 + [98] = https://curl.se/bug/?i=9221 + [99] = https://curl.se/bug/?i=9223 + [100] = https://curl.se/bug/?i=9286 + [101] = https://curl.se/bug/?i=9216 + [102] = https://curl.se/bug/?i=9209 + [103] = https://curl.se/bug/?i=9208 + [104] = https://curl.se/bug/?i=9213 + [105] = https://curl.se/bug/?i=9280 + [106] = https://curl.se/bug/?i=9281 + [107] = https://curl.se/bug/?i=8915 + [108] = https://curl.se/bug/?i=9259 + [109] = https://curl.se/bug/?i=9303 + [110] = https://curl.se/bug/?i=9268 + [111] = https://curl.se/bug/?i=9258 + [112] = https://curl.se/bug/?i=9279 + [113] = https://curl.se/bug/?i=9278 + [114] = https://curl.se/bug/?i=9274 + [115] = https://curl.se/bug/?i=9269 + [116] = https://curl.se/bug/?i=9228 + [117] = https://curl.se/bug/?i=9267 + [118] = https://curl.se/bug/?i=9266 + [119] = https://curl.se/bug/?i=9264 + [120] = https://curl.se/bug/?i=9077 + [121] = https://curl.se/bug/?i=9239 + [122] = https://curl.se/bug/?i=9250 + [123] = https://curl.se/bug/?i=9310 + [124] = https://curl.se/bug/?i=9310 + [125] = https://curl.se/bug/?i=9298 + [126] = https://curl.se/bug/?i=9297 + [127] = https://curl.se/bug/?i=9192 + [128] = https://curl.se/bug/?i=9310 + [129] = https://curl.se/bug/?i=9291 + [130] = https://curl.se/bug/?i=9291 + [131] = https://curl.se/bug/?i=9217 + [132] = https://curl.se/bug/?i=9253 + [133] = https://curl.se/bug/?i=9265 + [134] = https://curl.se/bug/?i=9289 + [135] = https://curl.se/bug/?i=9310 + [136] = https://curl.se/bug/?i=9335 + [137] = https://curl.se/bug/?i=9317 + [138] = https://curl.se/bug/?i=9352 + [139] = https://curl.se/bug/?i=9023 + [140] = https://curl.se/bug/?i=9376 + [141] = https://curl.se/bug/?i=9314 + [142] = https://curl.se/bug/?i=9290 + [143] = https://curl.se/bug/?i=9306 + [144] = https://curl.se/bug/?i=9309 + [145] = https://curl.se/bug/?i=9344 + [146] = https://curl.se/bug/?i=9372 + [147] = https://curl.se/bug/?i=9361 + [148] = https://curl.se/bug/?i=9328 + [149] = https://curl.se/bug/?i=9328 + [150] = https://curl.se/bug/?i=9330 + [151] = https://curl.se/bug/?i=9329 + [152] = https://curl.se/docs/CVE-2022-35252.html + [153] = https://curl.se/bug/?i=9364 + [154] = https://curl.se/bug/?i=6132 + [155] = https://curl.se/bug/?i=9369 + [156] = https://curl.se/bug/?i=9367 + [157] = https://curl.se/bug/?i=9382 + [158] = https://curl.se/bug/?i=9356 + [159] = https://curl.se/bug/?i=9354 + [160] = https://curl.se/bug/?i=9349 + [161] = https://curl.se/bug/?i=9349 + [162] = https://curl.se/bug/?i=9331 + [163] = https://curl.se/bug/?i=9312 + [165] = https://curl.se/bug/?i=9243 + [166] = https://curl.se/bug/?i=9248 + [167] = https://curl.se/bug/?i=8653 + [168] = https://curl.se/bug/?i=9391 diff --git a/trunk/libs/libcurl/curl-7.x/acinclude.m4 b/trunk/libs/libcurl/curl-7.x/acinclude.m4 index 277902da..cd26f430 100644 --- a/trunk/libs/libcurl/curl-7.x/acinclude.m4 +++ b/trunk/libs/libcurl/curl-7.x/acinclude.m4 @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# #*************************************************************************** dnl CURL_CHECK_DEF (SYMBOL, [INCLUDES], [SILENT]) @@ -235,43 +237,6 @@ AC_DEFUN([CURL_CHECK_NATIVE_WINDOWS], [ ]) -dnl CURL_CHECK_HEADER_WINSOCK -dnl ------------------------------------------------- -dnl Check for compilable and valid winsock.h header - -AC_DEFUN([CURL_CHECK_HEADER_WINSOCK], [ - AC_REQUIRE([CURL_CHECK_HEADER_WINDOWS])dnl - AC_CACHE_CHECK([for winsock.h], [curl_cv_header_winsock_h], [ - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([[ -#undef inline -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include -#include - ]],[[ -#if defined(__CYGWIN__) || defined(__CEGCC__) - HAVE_WINSOCK_H shall not be defined. -#else - int dummy=WSACleanup(); -#endif - ]]) - ],[ - curl_cv_header_winsock_h="yes" - ],[ - curl_cv_header_winsock_h="no" - ]) - ]) - case "$curl_cv_header_winsock_h" in - yes) - AC_DEFINE_UNQUOTED(HAVE_WINSOCK_H, 1, - [Define to 1 if you have the winsock.h header file.]) - ;; - esac -]) - - dnl CURL_CHECK_HEADER_WINSOCK2 dnl ------------------------------------------------- dnl Check for compilable and valid winsock2.h header @@ -420,48 +385,6 @@ AC_DEFUN([CURL_CHECK_HEADER_WINLDAP], [ ]) -dnl CURL_CHECK_HEADER_WINBER -dnl ------------------------------------------------- -dnl Check for compilable and valid winber.h header - -AC_DEFUN([CURL_CHECK_HEADER_WINBER], [ - AC_REQUIRE([CURL_CHECK_HEADER_WINLDAP])dnl - AC_CACHE_CHECK([for winber.h], [curl_cv_header_winber_h], [ - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([[ -#undef inline -#ifdef HAVE_WINDOWS_H -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include -#endif -#include -#include - ]],[[ -#if defined(__CYGWIN__) || defined(__CEGCC__) - HAVE_WINBER_H shall not be defined. -#else - BERVAL *bvp = NULL; - BerElement *bep = ber_init(bvp); - ber_free(bep, 1); -#endif - ]]) - ],[ - curl_cv_header_winber_h="yes" - ],[ - curl_cv_header_winber_h="no" - ]) - ]) - case "$curl_cv_header_winber_h" in - yes) - AC_DEFINE_UNQUOTED(HAVE_WINBER_H, 1, - [Define to 1 if you have the winber.h header file.]) - ;; - esac -]) - - dnl CURL_CHECK_HEADER_LBER dnl ------------------------------------------------- dnl Check for compilable and valid lber.h header, @@ -637,58 +560,6 @@ AC_DEFUN([CURL_CHECK_HEADER_LDAP_SSL], [ ]) -dnl CURL_CHECK_HEADER_LDAPSSL -dnl ------------------------------------------------- -dnl Check for compilable and valid ldapssl.h header - -AC_DEFUN([CURL_CHECK_HEADER_LDAPSSL], [ - AC_REQUIRE([CURL_CHECK_HEADER_LDAP])dnl - AC_CACHE_CHECK([for ldapssl.h], [curl_cv_header_ldapssl_h], [ - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([[ -#undef inline -#ifdef HAVE_WINDOWS_H -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include -#else -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#endif -#ifndef NULL -#define NULL (void *)0 -#endif -#ifndef LDAP_DEPRECATED -#define LDAP_DEPRECATED 1 -#endif -#ifdef NEED_LBER_H -#include -#endif -#ifdef HAVE_LDAP_H -#include -#endif -#include - ]],[[ - char *cert_label = NULL; - LDAP *ldp = ldap_ssl_init("dummy", LDAPS_PORT, cert_label); - ]]) - ],[ - curl_cv_header_ldapssl_h="yes" - ],[ - curl_cv_header_ldapssl_h="no" - ]) - ]) - case "$curl_cv_header_ldapssl_h" in - yes) - AC_DEFINE_UNQUOTED(HAVE_LDAPSSL_H, 1, - [Define to 1 if you have the ldapssl.h header file.]) - ;; - esac -]) - - dnl CURL_CHECK_LIBS_WINLDAP dnl ------------------------------------------------- dnl Check for libraries needed for WINLDAP support, @@ -893,108 +764,6 @@ AC_DEFUN([CURL_CHECK_LIBS_LDAP], [ ]) -dnl CURL_CHECK_HEADER_MALLOC -dnl ------------------------------------------------- -dnl Check for compilable and valid malloc.h header, -dnl and check if it is needed even with stdlib.h - -AC_DEFUN([CURL_CHECK_HEADER_MALLOC], [ - AC_CACHE_CHECK([for malloc.h], [curl_cv_header_malloc_h], [ - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([[ -#include - ]],[[ - void *p = malloc(10); - void *q = calloc(10,10); - free(p); - free(q); - ]]) - ],[ - curl_cv_header_malloc_h="yes" - ],[ - curl_cv_header_malloc_h="no" - ]) - ]) - if test "$curl_cv_header_malloc_h" = "yes"; then - AC_DEFINE_UNQUOTED(HAVE_MALLOC_H, 1, - [Define to 1 if you have the malloc.h header file.]) - # - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([[ -#include - ]],[[ - void *p = malloc(10); - void *q = calloc(10,10); - free(p); - free(q); - ]]) - ],[ - curl_cv_need_header_malloc_h="no" - ],[ - curl_cv_need_header_malloc_h="yes" - ]) - # - case "$curl_cv_need_header_malloc_h" in - yes) - AC_DEFINE_UNQUOTED(NEED_MALLOC_H, 1, - [Define to 1 if you need the malloc.h header file even with stdlib.h]) - ;; - esac - fi -]) - - -dnl CURL_CHECK_HEADER_MEMORY -dnl ------------------------------------------------- -dnl Check for compilable and valid memory.h header, -dnl and check if it is needed even with stdlib.h for -dnl memory related functions. - -AC_DEFUN([CURL_CHECK_HEADER_MEMORY], [ - AC_CACHE_CHECK([for memory.h], [curl_cv_header_memory_h], [ - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([[ -#include - ]],[[ - void *p = malloc(10); - void *q = calloc(10,10); - free(p); - free(q); - ]]) - ],[ - curl_cv_header_memory_h="yes" - ],[ - curl_cv_header_memory_h="no" - ]) - ]) - if test "$curl_cv_header_memory_h" = "yes"; then - AC_DEFINE_UNQUOTED(HAVE_MEMORY_H, 1, - [Define to 1 if you have the memory.h header file.]) - # - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([[ -#include - ]],[[ - void *p = malloc(10); - void *q = calloc(10,10); - free(p); - free(q); - ]]) - ],[ - curl_cv_need_header_memory_h="no" - ],[ - curl_cv_need_header_memory_h="yes" - ]) - # - case "$curl_cv_need_header_memory_h" in - yes) - AC_DEFINE_UNQUOTED(NEED_MEMORY_H, 1, - [Define to 1 if you need the memory.h header file even with stdlib.h]) - ;; - esac - fi -]) - dnl TYPE_SOCKADDR_STORAGE dnl ------------------------------------------------- dnl Check for struct sockaddr_storage. Most IPv6-enabled @@ -1043,8 +812,8 @@ dnl and RECV_TYPE_ARG4, defining the type of the function dnl return value in RECV_TYPE_RETV. AC_DEFUN([CURL_CHECK_FUNC_RECV], [ - AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK])dnl AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK2])dnl + AC_REQUIRE([CURL_INCLUDES_BSDSOCKET])dnl AC_CHECK_HEADERS(sys/types.h sys/socket.h) # AC_MSG_CHECKING([for recv]) @@ -1058,16 +827,9 @@ AC_DEFUN([CURL_CHECK_FUNC_RECV], [ #include #ifdef HAVE_WINSOCK2_H #include -#else -#ifdef HAVE_WINSOCK_H -#include -#endif #endif #else -#ifdef HAVE_PROTO_BSDSOCKET_H -#include -struct Library *SocketBase = NULL; -#endif +$curl_includes_bsdsocket #ifdef HAVE_SYS_TYPES_H #include #endif @@ -1106,17 +868,10 @@ struct Library *SocketBase = NULL; #include #ifdef HAVE_WINSOCK2_H #include -#else -#ifdef HAVE_WINSOCK_H -#include -#endif #endif #define RECVCALLCONV PASCAL #else -#ifdef HAVE_PROTO_BSDSOCKET_H -#include -struct Library *SocketBase = NULL; -#endif +$curl_includes_bsdsocket #ifdef HAVE_SYS_TYPES_H #include #endif @@ -1187,8 +942,8 @@ dnl return value in SEND_TYPE_RETV, and also defining the dnl type qualifier of second argument in SEND_QUAL_ARG2. AC_DEFUN([CURL_CHECK_FUNC_SEND], [ - AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK])dnl AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK2])dnl + AC_REQUIRE([CURL_INCLUDES_BSDSOCKET])dnl AC_CHECK_HEADERS(sys/types.h sys/socket.h) # AC_MSG_CHECKING([for send]) @@ -1202,16 +957,9 @@ AC_DEFUN([CURL_CHECK_FUNC_SEND], [ #include #ifdef HAVE_WINSOCK2_H #include -#else -#ifdef HAVE_WINSOCK_H -#include -#endif #endif #else -#ifdef HAVE_PROTO_BSDSOCKET_H -#include -struct Library *SocketBase = NULL; -#endif +$curl_includes_bsdsocket #ifdef HAVE_SYS_TYPES_H #include #endif @@ -1250,17 +998,10 @@ struct Library *SocketBase = NULL; #include #ifdef HAVE_WINSOCK2_H #include -#else -#ifdef HAVE_WINSOCK_H -#include -#endif #endif #define SENDCALLCONV PASCAL #else -#ifdef HAVE_PROTO_BSDSOCKET_H -#include -struct Library *SocketBase = NULL; -#endif +$curl_includes_bsdsocket #ifdef HAVE_SYS_TYPES_H #include #endif @@ -1368,16 +1109,8 @@ AC_DEFUN([CURL_CHECK_MSG_NOSIGNAL], [ #include #ifdef HAVE_WINSOCK2_H #include -#else -#ifdef HAVE_WINSOCK_H -#include -#endif #endif #else -#ifdef HAVE_PROTO_BSDSOCKET_H -#include -struct Library *SocketBase = NULL; -#endif #ifdef HAVE_SYS_TYPES_H #include #endif @@ -1408,7 +1141,6 @@ dnl ------------------------------------------------- dnl Check for timeval struct AC_DEFUN([CURL_CHECK_STRUCT_TIMEVAL], [ - AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK])dnl AC_REQUIRE([CURL_CHECK_HEADER_WINSOCK2])dnl AC_CHECK_HEADERS(sys/types.h sys/time.h sys/socket.h) AC_CACHE_CHECK([for struct timeval], [curl_cv_struct_timeval], [ @@ -1422,10 +1154,6 @@ AC_DEFUN([CURL_CHECK_STRUCT_TIMEVAL], [ #include #ifdef HAVE_WINSOCK2_H #include -#else -#ifdef HAVE_WINSOCK_H -#include -#endif #endif #endif #ifdef HAVE_SYS_TYPES_H @@ -1481,10 +1209,6 @@ AC_DEFUN([TYPE_IN_ADDR_T], [ #include #ifdef HAVE_WINSOCK2_H #include -#else -#ifdef HAVE_WINSOCK_H -#include -#endif #endif #else #ifdef HAVE_SYS_TYPES_H @@ -1527,10 +1251,6 @@ AC_DEFUN([TYPE_IN_ADDR_T], [ #include #ifdef HAVE_WINSOCK2_H #include -#else -#ifdef HAVE_WINSOCK_H -#include -#endif #endif #else #ifdef HAVE_SYS_TYPES_H @@ -1810,6 +1530,7 @@ dnl in SELECT_QUAL_ARG5. AC_DEFUN([CURL_CHECK_FUNC_SELECT], [ AC_REQUIRE([CURL_CHECK_STRUCT_TIMEVAL])dnl + AC_REQUIRE([CURL_INCLUDES_BSDSOCKET])dnl AC_CHECK_HEADERS(sys/select.h sys/socket.h) # AC_MSG_CHECKING([for select]) @@ -1823,10 +1544,6 @@ AC_DEFUN([CURL_CHECK_FUNC_SELECT], [ #include #ifdef HAVE_WINSOCK2_H #include -#else -#ifdef HAVE_WINSOCK_H -#include -#endif #endif #endif #ifdef HAVE_SYS_TYPES_H @@ -1845,11 +1562,7 @@ AC_DEFUN([CURL_CHECK_FUNC_SELECT], [ #ifdef HAVE_SYS_SOCKET_H #include #endif -#ifdef HAVE_PROTO_BSDSOCKET_H -#include -struct Library *SocketBase = NULL; -#define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0) -#endif +$curl_includes_bsdsocket #endif ]],[[ select(0, 0, 0, 0, 0); @@ -1881,10 +1594,6 @@ struct Library *SocketBase = NULL; #include #ifdef HAVE_WINSOCK2_H #include -#else -#ifdef HAVE_WINSOCK_H -#include -#endif #endif #define SELECTCALLCONV PASCAL #endif @@ -1904,11 +1613,7 @@ struct Library *SocketBase = NULL; #ifdef HAVE_SYS_SOCKET_H #include #endif -#ifdef HAVE_PROTO_BSDSOCKET_H -#include -struct Library *SocketBase = NULL; -#define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0) -#endif +$curl_includes_bsdsocket #define SELECTCALLCONV #endif #ifndef HAVE_STRUCT_TIMEVAL @@ -2107,8 +1812,8 @@ dnl regarding the paths this will scan: dnl /etc/ssl/certs/ca-certificates.crt Debian systems dnl /etc/pki/tls/certs/ca-bundle.crt Redhat and Mandriva dnl /usr/share/ssl/certs/ca-bundle.crt old(er) Redhat -dnl /usr/local/share/certs/ca-root-nss.crt FreeBSD -dnl /etc/ssl/cert.pem OpenBSD, FreeBSD (symlink) +dnl /usr/local/share/certs/ca-root-nss.crt FreeBSD, MidnightBSD +dnl /etc/ssl/cert.pem OpenBSD, FreeBSD, MidnightBSD (symlink) dnl /etc/ssl/certs/ (ca path) SUSE AC_DEFUN([CURL_CHECK_CA_BUNDLE], [ diff --git a/trunk/libs/libcurl/curl-7.x/aclocal.m4 b/trunk/libs/libcurl/curl-7.x/aclocal.m4 index fb523454..380bdb0b 100644 --- a/trunk/libs/libcurl/curl-7.x/aclocal.m4 +++ b/trunk/libs/libcurl/curl-7.x/aclocal.m4 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.16.4 -*- Autoconf -*- +# generated automatically by aclocal 1.16.5 -*- Autoconf -*- # Copyright (C) 1996-2021 Free Software Foundation, Inc. @@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version='1.16' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.16.4], [], +m4_if([$1], [1.16.5], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.16.4])dnl +[AM_AUTOMAKE_VERSION([1.16.5])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -428,6 +428,10 @@ m4_defn([AC_PROG_CC]) # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], [AC_PREREQ([2.65])dnl +m4_ifdef([_$0_ALREADY_INIT], + [m4_fatal([$0 expanded multiple times +]m4_defn([_$0_ALREADY_INIT]))], + [m4_define([_$0_ALREADY_INIT], m4_expansion_stack)])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -1180,7 +1184,6 @@ AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -m4_include([m4/ax_compile_check_sizeof.m4]) m4_include([m4/curl-amissl.m4]) m4_include([m4/curl-bearssl.m4]) m4_include([m4/curl-compilers.m4]) @@ -1188,7 +1191,6 @@ m4_include([m4/curl-confopts.m4]) m4_include([m4/curl-functions.m4]) m4_include([m4/curl-gnutls.m4]) m4_include([m4/curl-mbedtls.m4]) -m4_include([m4/curl-mesalink.m4]) m4_include([m4/curl-nss.m4]) m4_include([m4/curl-openssl.m4]) m4_include([m4/curl-override.m4]) diff --git a/trunk/libs/libcurl/curl-7.x/buildconf b/trunk/libs/libcurl/curl-7.x/buildconf index 4e4c17e9..16fc8a75 100755 --- a/trunk/libs/libcurl/curl-7.x/buildconf +++ b/trunk/libs/libcurl/curl-7.x/buildconf @@ -1,4 +1,8 @@ #!/bin/sh +# +# Copyright (C) 2000 - 2022 Daniel Stenberg, , et al. +# +# SPDX-License-Identifier: curl echo "*** Do not use buildconf. Instead, just use: autoreconf -fi" >&2 exec ${AUTORECONF:-autoreconf} -fi "${@}" diff --git a/trunk/libs/libcurl/curl-7.x/buildconf.bat b/trunk/libs/libcurl/curl-7.x/buildconf.bat index 475736ee..9af46275 100644 --- a/trunk/libs/libcurl/curl-7.x/buildconf.bat +++ b/trunk/libs/libcurl/curl-7.x/buildconf.bat @@ -6,7 +6,7 @@ rem * / __| | | | |_) | | rem * | (__| |_| | _ <| |___ rem * \___|\___/|_| \_\_____| rem * -rem * Copyright (C) 1998 - 2019, Daniel Stenberg, , et al. +rem * Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. rem * rem * This software is licensed as described in the file COPYING, which rem * you should have received as part of this distribution. The terms @@ -19,6 +19,8 @@ rem * rem * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY rem * KIND, either express or implied. rem * +rem * SPDX-License-Identifier: curl +rem * rem *************************************************************************** rem NOTES diff --git a/trunk/libs/libcurl/curl-7.x/config.guess b/trunk/libs/libcurl/curl-7.x/config.guess index f50dcdb6..7f76b622 100755 --- a/trunk/libs/libcurl/curl-7.x/config.guess +++ b/trunk/libs/libcurl/curl-7.x/config.guess @@ -1,12 +1,14 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2018 Free Software Foundation, Inc. +# Copyright 1992-2022 Free Software Foundation, Inc. -timestamp='2018-02-24' +# shellcheck disable=SC2006,SC2268 # see below for rationale + +timestamp='2022-01-09' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or +# the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -27,11 +29,19 @@ timestamp='2018-02-24' # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: -# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess +# https://git.savannah.gnu.org/cgit/config.git/plain/config.guess # # Please send patches to . +# The "shellcheck disable" line above the timestamp inhibits complaints +# about features and limitations of the classic Bourne shell that were +# superseded or lifted in POSIX. However, this script identifies a wide +# variety of pre-POSIX systems that do not have POSIX shells at all, and +# even some reasonably current systems (Solaris 10 as case-in-point) still +# have a pre-POSIX /bin/sh. + + me=`echo "$0" | sed -e 's,.*/,,'` usage="\ @@ -50,7 +60,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2018 Free Software Foundation, Inc. +Copyright 1992-2022 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -84,7 +94,8 @@ if test $# != 0; then exit 1 fi -trap 'exit 1' 1 2 15 +# Just in case it came from the environment. +GUESS= # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires @@ -96,73 +107,90 @@ trap 'exit 1' 1 2 15 # Portable tmp directory creation inspired by the Autoconf team. -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > "$dummy.c" ; - for c in cc gcc c89 c99 ; do - if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' +tmp= +# shellcheck disable=SC2172 +trap 'test -z "$tmp" || rm -fr "$tmp"' 0 1 2 13 15 + +set_cc_for_build() { + # prevent multiple calls if $tmp is already set + test "$tmp" && return 0 + : "${TMPDIR=/tmp}" + # shellcheck disable=SC2039,SC3028 + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } + dummy=$tmp/dummy + case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in + ,,) echo "int x;" > "$dummy.c" + for driver in cc gcc c89 c99 ; do + if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then + CC_FOR_BUILD=$driver + break + fi + done + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; + esac +} # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then +if test -f /.attbin/uname ; then PATH=$PATH:/.attbin ; export PATH fi UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown +UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -case "$UNAME_SYSTEM" in +case $UNAME_SYSTEM in Linux|GNU|GNU/*) - # If the system lacks a compiler, then just pick glibc. - # We could probably try harder. - LIBC=gnu + LIBC=unknown - eval "$set_cc_for_build" + set_cc_for_build cat <<-EOF > "$dummy.c" #include #if defined(__UCLIBC__) LIBC=uclibc #elif defined(__dietlibc__) LIBC=dietlibc - #else + #elif defined(__GLIBC__) LIBC=gnu + #else + #include + /* First heuristic to detect musl libc. */ + #ifdef __DEFINED_va_list + LIBC=musl + #endif #endif EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" + cc_set_libc=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` + eval "$cc_set_libc" - # If ldd exists, use it to detect musl libc. - if command -v ldd >/dev/null && \ - ldd --version 2>&1 | grep -q ^musl - then - LIBC=musl + # Second heuristic to detect musl libc. + if [ "$LIBC" = unknown ] && + command -v ldd >/dev/null && + ldd --version 2>&1 | grep -q ^musl; then + LIBC=musl + fi + + # If the system lacks a compiler, then just pick glibc. + # We could probably try harder. + if [ "$LIBC" = unknown ]; then + LIBC=gnu fi ;; esac # Note: order is significant - the case branches are not exclusive. -case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in +case $UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, @@ -174,12 +202,12 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ - "/sbin/$sysctl" 2>/dev/null || \ - "/usr/sbin/$sysctl" 2>/dev/null || \ + /sbin/sysctl -n hw.machine_arch 2>/dev/null || \ + /usr/sbin/sysctl -n hw.machine_arch 2>/dev/null || \ echo unknown)` - case "$UNAME_MACHINE_ARCH" in + case $UNAME_MACHINE_ARCH in + aarch64eb) machine=aarch64_be-unknown ;; armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; @@ -188,18 +216,18 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in earmv*) arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` - machine="${arch}${endian}"-unknown + machine=${arch}${endian}-unknown ;; - *) machine="$UNAME_MACHINE_ARCH"-unknown ;; + *) machine=$UNAME_MACHINE_ARCH-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently (or will in the future) and ABI. - case "$UNAME_MACHINE_ARCH" in + case $UNAME_MACHINE_ARCH in earm*) os=netbsdelf ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval "$set_cc_for_build" + set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -215,7 +243,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in ;; esac # Determine ABI tags. - case "$UNAME_MACHINE_ARCH" in + case $UNAME_MACHINE_ARCH in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` @@ -226,7 +254,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. - case "$UNAME_VERSION" in + case $UNAME_VERSION in Debian*) release='-gnu' ;; @@ -237,45 +265,57 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "$machine-${os}${release}${abi}" - exit ;; + GUESS=$machine-${os}${release}${abi-} + ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE_ARCH-unknown-bitrig$UNAME_RELEASE + ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE_ARCH-unknown-openbsd$UNAME_RELEASE + ;; + *:SecBSD:*:*) + UNAME_MACHINE_ARCH=`arch | sed 's/SecBSD.//'` + GUESS=$UNAME_MACHINE_ARCH-unknown-secbsd$UNAME_RELEASE + ;; *:LibertyBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` - echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE_ARCH-unknown-libertybsd$UNAME_RELEASE + ;; *:MidnightBSD:*:*) - echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-midnightbsd$UNAME_RELEASE + ;; *:ekkoBSD:*:*) - echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-ekkobsd$UNAME_RELEASE + ;; *:SolidBSD:*:*) - echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-solidbsd$UNAME_RELEASE + ;; + *:OS108:*:*) + GUESS=$UNAME_MACHINE-unknown-os108_$UNAME_RELEASE + ;; macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd"$UNAME_RELEASE" - exit ;; + GUESS=powerpc-unknown-mirbsd$UNAME_RELEASE + ;; *:MirBSD:*:*) - echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-mirbsd$UNAME_RELEASE + ;; *:Sortix:*:*) - echo "$UNAME_MACHINE"-unknown-sortix - exit ;; + GUESS=$UNAME_MACHINE-unknown-sortix + ;; + *:Twizzler:*:*) + GUESS=$UNAME_MACHINE-unknown-twizzler + ;; *:Redox:*:*) - echo "$UNAME_MACHINE"-unknown-redox - exit ;; + GUESS=$UNAME_MACHINE-unknown-redox + ;; mips:OSF1:*.*) - echo mips-dec-osf1 - exit ;; + GUESS=mips-dec-osf1 + ;; alpha:OSF1:*:*) + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + trap '' 0 case $UNAME_RELEASE in *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` @@ -289,7 +329,7 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # covers most systems running today. This code pipes the CPU # types through head -n 1, so we only detect the type of CPU 0. ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in + case $ALPHA_CPU_TYPE in "EV4 (21064)") UNAME_MACHINE=alpha ;; "EV4.5 (21064)") @@ -326,117 +366,121 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" - # Reset EXIT trap before exiting to avoid spurious non-zero exit code. - exitcode=$? - trap '' 0 - exit $exitcode ;; + OSF_REL=`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` + GUESS=$UNAME_MACHINE-dec-osf$OSF_REL + ;; Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; + GUESS=m68k-unknown-sysv4 + ;; *:[Aa]miga[Oo][Ss]:*:*) - echo "$UNAME_MACHINE"-unknown-amigaos - exit ;; + GUESS=$UNAME_MACHINE-unknown-amigaos + ;; *:[Mm]orph[Oo][Ss]:*:*) - echo "$UNAME_MACHINE"-unknown-morphos - exit ;; + GUESS=$UNAME_MACHINE-unknown-morphos + ;; *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; + GUESS=i370-ibm-openedition + ;; *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; + GUESS=s390-ibm-zvmoe + ;; *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; + GUESS=powerpc-ibm-os400 + ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix"$UNAME_RELEASE" - exit ;; + GUESS=arm-acorn-riscix$UNAME_RELEASE + ;; arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; + GUESS=arm-unknown-riscos + ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; + GUESS=hppa1.1-hitachi-hiuxmpp + ;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; + case `(/bin/universe) 2>/dev/null` in + att) GUESS=pyramid-pyramid-sysv3 ;; + *) GUESS=pyramid-pyramid-bsd ;; + esac + ;; NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; + GUESS=pyramid-pyramid-svr4 + ;; DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; + GUESS=sparc-icl-nx6 + ;; DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; + sparc) GUESS=sparc-icl-nx7 ;; + esac + ;; s390x:SunOS:*:*) - echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=$UNAME_MACHINE-ibm-solaris2$SUN_REL + ;; sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-hal-solaris2$SUN_REL + ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-sun-solaris2$SUN_REL + ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) - echo i386-pc-auroraux"$UNAME_RELEASE" - exit ;; + GUESS=i386-pc-auroraux$UNAME_RELEASE + ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval "$set_cc_for_build" + set_cc_for_build SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if test "$CC_FOR_BUILD" != no_compiler_found; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + (CCOPTS="" $CC_FOR_BUILD -m64 -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then SUN_ARCH=x86_64 fi fi - echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=$SUN_ARCH-pc-solaris2$SUN_REL + ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=sparc-sun-solaris3$SUN_REL + ;; sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in + case `/usr/bin/arch -k` in Series*|S4*) UNAME_RELEASE=`uname -v` ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/'` + GUESS=sparc-sun-sunos$SUN_REL + ;; sun3*:SunOS:*:*) - echo m68k-sun-sunos"$UNAME_RELEASE" - exit ;; + GUESS=m68k-sun-sunos$UNAME_RELEASE + ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 - case "`/bin/arch`" in + case `/bin/arch` in sun3) - echo m68k-sun-sunos"$UNAME_RELEASE" + GUESS=m68k-sun-sunos$UNAME_RELEASE ;; sun4) - echo sparc-sun-sunos"$UNAME_RELEASE" + GUESS=sparc-sun-sunos$UNAME_RELEASE ;; esac - exit ;; + ;; aushp:SunOS:*:*) - echo sparc-auspex-sunos"$UNAME_RELEASE" - exit ;; + GUESS=sparc-auspex-sunos$UNAME_RELEASE + ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -446,43 +490,43 @@ case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-atari-mint$UNAME_RELEASE + ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-milan-mint$UNAME_RELEASE + ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-hades-mint$UNAME_RELEASE + ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint"$UNAME_RELEASE" - exit ;; + GUESS=m68k-unknown-mint$UNAME_RELEASE + ;; m68k:machten:*:*) - echo m68k-apple-machten"$UNAME_RELEASE" - exit ;; + GUESS=m68k-apple-machten$UNAME_RELEASE + ;; powerpc:machten:*:*) - echo powerpc-apple-machten"$UNAME_RELEASE" - exit ;; + GUESS=powerpc-apple-machten$UNAME_RELEASE + ;; RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit ;; + GUESS=mips-dec-mach_bsd4.3 + ;; RISC*:ULTRIX:*:*) - echo mips-dec-ultrix"$UNAME_RELEASE" - exit ;; + GUESS=mips-dec-ultrix$UNAME_RELEASE + ;; VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix"$UNAME_RELEASE" - exit ;; + GUESS=vax-dec-ultrix$UNAME_RELEASE + ;; 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix"$UNAME_RELEASE" - exit ;; + GUESS=clipper-intergraph-clix$UNAME_RELEASE + ;; mips:*:*:UMIPS | mips:*:*:RISCos) - eval "$set_cc_for_build" + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include /* for printf() prototype */ @@ -508,78 +552,79 @@ EOF dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && SYSTEM_NAME=`"$dummy" "$dummyarg"` && { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos"$UNAME_RELEASE" - exit ;; + GUESS=mips-mips-riscos$UNAME_RELEASE + ;; Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit ;; + GUESS=powerpc-motorola-powermax + ;; Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; + GUESS=powerpc-harris-powermax + ;; Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; + GUESS=powerpc-harris-powermax + ;; Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit ;; + GUESS=powerpc-harris-powerunix + ;; m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit ;; + GUESS=m88k-harris-cxux7 + ;; m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit ;; + GUESS=m88k-motorola-sysv4 + ;; m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit ;; + GUESS=m88k-motorola-sysv3 + ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] + if test "$UNAME_PROCESSOR" = mc88100 || test "$UNAME_PROCESSOR" = mc88110 then - if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ - [ "$TARGET_BINARY_INTERFACE"x = x ] + if test "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx || \ + test "$TARGET_BINARY_INTERFACE"x = x then - echo m88k-dg-dgux"$UNAME_RELEASE" + GUESS=m88k-dg-dgux$UNAME_RELEASE else - echo m88k-dg-dguxbcs"$UNAME_RELEASE" + GUESS=m88k-dg-dguxbcs$UNAME_RELEASE fi else - echo i586-dg-dgux"$UNAME_RELEASE" + GUESS=i586-dg-dgux$UNAME_RELEASE fi - exit ;; + ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; + GUESS=m88k-dolphin-sysv3 + ;; M88*:*:R3*:*) # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit ;; + GUESS=m88k-motorola-sysv3 + ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit ;; + GUESS=m88k-tektronix-sysv3 + ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit ;; + GUESS=m68k-tektronix-bsd + ;; *:IRIX*:*:*) - echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" - exit ;; + IRIX_REL=`echo "$UNAME_RELEASE" | sed -e 's/-/_/g'` + GUESS=mips-sgi-irix$IRIX_REL + ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + GUESS=romp-ibm-aix # uname -m gives an 8 hex-code CPU id + ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) - echo i386-ibm-aix - exit ;; + GUESS=i386-ibm-aix + ;; ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then + if test -x /usr/bin/oslevel ; then IBM_REV=`/usr/bin/oslevel` else - IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" + IBM_REV=$UNAME_VERSION.$UNAME_RELEASE fi - echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" - exit ;; + GUESS=$UNAME_MACHINE-ibm-aix$IBM_REV + ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval "$set_cc_for_build" + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #include @@ -593,16 +638,16 @@ EOF EOF if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` then - echo "$SYSTEM_NAME" + GUESS=$SYSTEM_NAME else - echo rs6000-ibm-aix3.2.5 + GUESS=rs6000-ibm-aix3.2.5 fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 + GUESS=rs6000-ibm-aix3.2.4 else - echo rs6000-ibm-aix3.2 + GUESS=rs6000-ibm-aix3.2 fi - exit ;; + ;; *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then @@ -610,57 +655,57 @@ EOF else IBM_ARCH=powerpc fi - if [ -x /usr/bin/lslpp ] ; then - IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | + if test -x /usr/bin/lslpp ; then + IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | \ awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else - IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" + IBM_REV=$UNAME_VERSION.$UNAME_RELEASE fi - echo "$IBM_ARCH"-ibm-aix"$IBM_REV" - exit ;; + GUESS=$IBM_ARCH-ibm-aix$IBM_REV + ;; *:AIX:*:*) - echo rs6000-ibm-aix - exit ;; + GUESS=rs6000-ibm-aix + ;; ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) - echo romp-ibm-bsd4.4 - exit ;; + GUESS=romp-ibm-bsd4.4 + ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 + GUESS=romp-ibm-bsd$UNAME_RELEASE # 4.3 with uname added to + ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) - echo rs6000-bull-bosx - exit ;; + GUESS=rs6000-bull-bosx + ;; DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit ;; + GUESS=m68k-bull-sysv3 + ;; 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit ;; + GUESS=m68k-hp-bsd + ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit ;; + GUESS=m68k-hp-bsd4.4 + ;; 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` - case "$UNAME_MACHINE" in + HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` + case $UNAME_MACHINE in 9000/31?) HP_ARCH=m68000 ;; 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then + if test -x /usr/bin/getconf; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "$sc_cpu_version" in + case $sc_cpu_version in 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 - case "$sc_kernel_bits" in + case $sc_kernel_bits in 32) HP_ARCH=hppa2.0n ;; 64) HP_ARCH=hppa2.0w ;; '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi - if [ "$HP_ARCH" = "" ]; then - eval "$set_cc_for_build" + if test "$HP_ARCH" = ""; then + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #define _HPUX_SOURCE @@ -698,9 +743,9 @@ EOF test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac - if [ "$HP_ARCH" = hppa2.0w ] + if test "$HP_ARCH" = hppa2.0w then - eval "$set_cc_for_build" + set_cc_for_build # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -719,14 +764,14 @@ EOF HP_ARCH=hppa64 fi fi - echo "$HP_ARCH"-hp-hpux"$HPUX_REV" - exit ;; + GUESS=$HP_ARCH-hp-hpux$HPUX_REV + ;; ia64:HP-UX:*:*) - HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux"$HPUX_REV" - exit ;; + HPUX_REV=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*.[0B]*//'` + GUESS=ia64-hp-hpux$HPUX_REV + ;; 3050*:HI-UX:*:*) - eval "$set_cc_for_build" + set_cc_for_build sed 's/^ //' << EOF > "$dummy.c" #include int @@ -754,36 +799,36 @@ EOF EOF $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 - exit ;; + GUESS=unknown-hitachi-hiuxwe2 + ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) - echo hppa1.1-hp-bsd - exit ;; + GUESS=hppa1.1-hp-bsd + ;; 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit ;; + GUESS=hppa1.0-hp-bsd + ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit ;; + GUESS=hppa1.0-hp-mpeix + ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) - echo hppa1.1-hp-osf - exit ;; + GUESS=hppa1.1-hp-osf + ;; hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; + GUESS=hppa1.0-hp-osf + ;; i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo "$UNAME_MACHINE"-unknown-osf1mk + if test -x /usr/sbin/sysversion ; then + GUESS=$UNAME_MACHINE-unknown-osf1mk else - echo "$UNAME_MACHINE"-unknown-osf1 + GUESS=$UNAME_MACHINE-unknown-osf1 fi - exit ;; + ;; parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit ;; + GUESS=hppa1.1-hp-lites + ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit ;; + GUESS=c1-convex-bsd + ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd @@ -791,17 +836,18 @@ EOF fi exit ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit ;; + GUESS=c34-convex-bsd + ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit ;; + GUESS=c38-convex-bsd + ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit ;; + GUESS=c4-convex-bsd + ;; CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=ymp-cray-unicos$CRAY_REL + ;; CRAY*[A-Z]90:*:*:*) echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ @@ -809,103 +855,129 @@ EOF -e 's/\.[^.]*$/.X/' exit ;; CRAY*TS:*:*:*) - echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=t90-cray-unicos$CRAY_REL + ;; CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=alphaev5-cray-unicosmk$CRAY_REL + ;; CRAY*SV1:*:*:*) - echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=sv1-cray-unicos$CRAY_REL + ;; *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' - exit ;; + CRAY_REL=`echo "$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/'` + GUESS=craynv-cray-unicosmp$CRAY_REL + ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + GUESS=${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} + ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + GUESS=sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL} + ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-pc-bsdi$UNAME_RELEASE + ;; sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi"$UNAME_RELEASE" - exit ;; + GUESS=sparc-unknown-bsdi$UNAME_RELEASE + ;; *:BSD/OS:*:*) - echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-unknown-bsdi$UNAME_RELEASE + ;; + arm:FreeBSD:*:*) + UNAME_PROCESSOR=`uname -p` + set_cc_for_build + if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ + | grep -q __ARM_PCS_VFP + then + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabi + else + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL-gnueabihf + fi + ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` - case "$UNAME_PROCESSOR" in + case $UNAME_PROCESSOR in amd64) UNAME_PROCESSOR=x86_64 ;; i386) UNAME_PROCESSOR=i586 ;; esac - echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" - exit ;; + FREEBSD_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_PROCESSOR-unknown-freebsd$FREEBSD_REL + ;; i*:CYGWIN*:*) - echo "$UNAME_MACHINE"-pc-cygwin - exit ;; + GUESS=$UNAME_MACHINE-pc-cygwin + ;; *:MINGW64*:*) - echo "$UNAME_MACHINE"-pc-mingw64 - exit ;; + GUESS=$UNAME_MACHINE-pc-mingw64 + ;; *:MINGW*:*) - echo "$UNAME_MACHINE"-pc-mingw32 - exit ;; + GUESS=$UNAME_MACHINE-pc-mingw32 + ;; *:MSYS*:*) - echo "$UNAME_MACHINE"-pc-msys - exit ;; + GUESS=$UNAME_MACHINE-pc-msys + ;; i*:PW*:*) - echo "$UNAME_MACHINE"-pc-pw32 - exit ;; + GUESS=$UNAME_MACHINE-pc-pw32 + ;; + *:SerenityOS:*:*) + GUESS=$UNAME_MACHINE-pc-serenity + ;; *:Interix*:*) - case "$UNAME_MACHINE" in + case $UNAME_MACHINE in x86) - echo i586-pc-interix"$UNAME_RELEASE" - exit ;; + GUESS=i586-pc-interix$UNAME_RELEASE + ;; authenticamd | genuineintel | EM64T) - echo x86_64-unknown-interix"$UNAME_RELEASE" - exit ;; + GUESS=x86_64-unknown-interix$UNAME_RELEASE + ;; IA64) - echo ia64-unknown-interix"$UNAME_RELEASE" - exit ;; + GUESS=ia64-unknown-interix$UNAME_RELEASE + ;; esac ;; i*:UWIN*:*) - echo "$UNAME_MACHINE"-pc-uwin - exit ;; + GUESS=$UNAME_MACHINE-pc-uwin + ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; + GUESS=x86_64-pc-cygwin + ;; prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" - exit ;; + SUN_REL=`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'` + GUESS=powerpcle-unknown-solaris2$SUN_REL + ;; *:GNU:*:*) # the GNU system - echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" - exit ;; + GNU_ARCH=`echo "$UNAME_MACHINE" | sed -e 's,[-/].*$,,'` + GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's,/.*$,,'` + GUESS=$GNU_ARCH-unknown-$LIBC$GNU_REL + ;; *:GNU/*:*:*) # other systems with GNU libc and userland - echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" - exit ;; - i*86:Minix:*:*) - echo "$UNAME_MACHINE"-pc-minix - exit ;; + GNU_SYS=`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"` + GNU_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_MACHINE-unknown-$GNU_SYS$GNU_REL-$LIBC + ;; + *:Minix:*:*) + GUESS=$UNAME_MACHINE-unknown-minix + ;; aarch64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in + case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' /proc/cpuinfo 2>/dev/null` in EV5) UNAME_MACHINE=alphaev5 ;; EV56) UNAME_MACHINE=alphaev56 ;; PCA56) UNAME_MACHINE=alphapca56 ;; @@ -916,187 +988,225 @@ EOF esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; - arc:Linux:*:* | arceb:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + arc:Linux:*:* | arceb:Linux:*:* | arc32:Linux:*:* | arc64:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; arm*:Linux:*:*) - eval "$set_cc_for_build" + set_cc_for_build if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi + GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabi else - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf + GUESS=$UNAME_MACHINE-unknown-linux-${LIBC}eabihf fi fi - exit ;; + ;; avr32*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; cris:Linux:*:*) - echo "$UNAME_MACHINE"-axis-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-axis-linux-$LIBC + ;; crisv32:Linux:*:*) - echo "$UNAME_MACHINE"-axis-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-axis-linux-$LIBC + ;; e2k:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; frv:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; hexagon:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; i*86:Linux:*:*) - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-pc-linux-$LIBC + ;; ia64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; k1om:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; + loongarch32:Linux:*:* | loongarch64:Linux:*:* | loongarchx32:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; m32r*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; m68*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; mips:Linux:*:* | mips64:Linux:*:*) - eval "$set_cc_for_build" + set_cc_for_build + IS_GLIBC=0 + test x"${LIBC}" = xgnu && IS_GLIBC=1 sed 's/^ //' << EOF > "$dummy.c" #undef CPU - #undef ${UNAME_MACHINE} - #undef ${UNAME_MACHINE}el + #undef mips + #undef mipsel + #undef mips64 + #undef mips64el + #if ${IS_GLIBC} && defined(_ABI64) + LIBCABI=gnuabi64 + #else + #if ${IS_GLIBC} && defined(_ABIN32) + LIBCABI=gnuabin32 + #else + LIBCABI=${LIBC} + #endif + #endif + + #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 + CPU=mipsisa64r6 + #else + #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && __mips_isa_rev>=6 + CPU=mipsisa32r6 + #else + #if defined(__mips64) + CPU=mips64 + #else + CPU=mips + #endif + #endif + #endif + #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=${UNAME_MACHINE}el + MIPS_ENDIAN=el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=${UNAME_MACHINE} + MIPS_ENDIAN= #else - CPU= + MIPS_ENDIAN= #endif #endif EOF - eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`" - test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; } + cc_set_vars=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU\|^MIPS_ENDIAN\|^LIBCABI'` + eval "$cc_set_vars" + test "x$CPU" != x && { echo "$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; } ;; mips64el:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; openrisc*:Linux:*:*) - echo or1k-unknown-linux-"$LIBC" - exit ;; + GUESS=or1k-unknown-linux-$LIBC + ;; or32:Linux:*:* | or1k*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; padre:Linux:*:*) - echo sparc-unknown-linux-"$LIBC" - exit ;; + GUESS=sparc-unknown-linux-$LIBC + ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-"$LIBC" - exit ;; + GUESS=hppa64-unknown-linux-$LIBC + ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; - PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; - *) echo hppa-unknown-linux-"$LIBC" ;; + PA7*) GUESS=hppa1.1-unknown-linux-$LIBC ;; + PA8*) GUESS=hppa2.0-unknown-linux-$LIBC ;; + *) GUESS=hppa-unknown-linux-$LIBC ;; esac - exit ;; + ;; ppc64:Linux:*:*) - echo powerpc64-unknown-linux-"$LIBC" - exit ;; + GUESS=powerpc64-unknown-linux-$LIBC + ;; ppc:Linux:*:*) - echo powerpc-unknown-linux-"$LIBC" - exit ;; + GUESS=powerpc-unknown-linux-$LIBC + ;; ppc64le:Linux:*:*) - echo powerpc64le-unknown-linux-"$LIBC" - exit ;; + GUESS=powerpc64le-unknown-linux-$LIBC + ;; ppcle:Linux:*:*) - echo powerpcle-unknown-linux-"$LIBC" - exit ;; - riscv32:Linux:*:* | riscv64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=powerpcle-unknown-linux-$LIBC + ;; + riscv32:Linux:*:* | riscv32be:Linux:*:* | riscv64:Linux:*:* | riscv64be:Linux:*:*) + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; s390:Linux:*:* | s390x:Linux:*:*) - echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-ibm-linux-$LIBC + ;; sh64*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; sh*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; sparc:Linux:*:* | sparc64:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; tile*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; vax:Linux:*:*) - echo "$UNAME_MACHINE"-dec-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-dec-linux-$LIBC + ;; x86_64:Linux:*:*) - if objdump -f /bin/sh | grep -q elf32-x86-64; then - echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32 - else - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" + set_cc_for_build + LIBCABI=$LIBC + if test "$CC_FOR_BUILD" != no_compiler_found; then + if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_X32 >/dev/null + then + LIBCABI=${LIBC}x32 + fi fi - exit ;; + GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI + ;; xtensa*:Linux:*:*) - echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" - exit ;; + GUESS=$UNAME_MACHINE-unknown-linux-$LIBC + ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. - echo i386-sequent-sysv4 - exit ;; + GUESS=i386-sequent-sysv4 + ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. - echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" - exit ;; + GUESS=$UNAME_MACHINE-pc-sysv4.2uw$UNAME_VERSION + ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. - echo "$UNAME_MACHINE"-pc-os2-emx - exit ;; + GUESS=$UNAME_MACHINE-pc-os2-emx + ;; i*86:XTS-300:*:STOP) - echo "$UNAME_MACHINE"-unknown-stop - exit ;; + GUESS=$UNAME_MACHINE-unknown-stop + ;; i*86:atheos:*:*) - echo "$UNAME_MACHINE"-unknown-atheos - exit ;; + GUESS=$UNAME_MACHINE-unknown-atheos + ;; i*86:syllable:*:*) - echo "$UNAME_MACHINE"-pc-syllable - exit ;; + GUESS=$UNAME_MACHINE-pc-syllable + ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) - echo i386-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=i386-unknown-lynxos$UNAME_RELEASE + ;; i*86:*DOS:*:*) - echo "$UNAME_MACHINE"-pc-msdosdjgpp - exit ;; + GUESS=$UNAME_MACHINE-pc-msdosdjgpp + ;; i*86:*:4.*:*) UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" + GUESS=$UNAME_MACHINE-univel-sysv$UNAME_REL else - echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" + GUESS=$UNAME_MACHINE-pc-sysv$UNAME_REL fi - exit ;; + ;; i*86:*:5:[678]*) # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in @@ -1104,12 +1214,12 @@ EOF *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac - echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" - exit ;; + GUESS=$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} + ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 @@ -1119,11 +1229,11 @@ EOF && UNAME_MACHINE=i686 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 - echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" + GUESS=$UNAME_MACHINE-pc-sco$UNAME_REL else - echo "$UNAME_MACHINE"-pc-sysv32 + GUESS=$UNAME_MACHINE-pc-sysv32 fi - exit ;; + ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about @@ -1131,31 +1241,31 @@ EOF # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. - echo i586-pc-msdosdjgpp - exit ;; + GUESS=i586-pc-msdosdjgpp + ;; Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; + GUESS=i386-pc-mach3 + ;; paragon:*:*:*) - echo i860-intel-osf1 - exit ;; + GUESS=i860-intel-osf1 + ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 + GUESS=i860-stardent-sysv$UNAME_RELEASE # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 + GUESS=i860-unknown-sysv$UNAME_RELEASE # Unknown i860-SVR4 fi - exit ;; + ;; mini*:CTIX:SYS*5:*) # "miniframe" - echo m68010-convergent-sysv - exit ;; + GUESS=m68010-convergent-sysv + ;; mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; + GUESS=m68k-convergent-sysv + ;; M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; + GUESS=m68k-diab-dnix + ;; M68*:*:R3V[5678]*:*) test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) @@ -1180,249 +1290,404 @@ EOF /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=m68k-unknown-lynxos$UNAME_RELEASE + ;; mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; + GUESS=m68k-atari-sysv4 + ;; TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=sparc-unknown-lynxos$UNAME_RELEASE + ;; rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=rs6000-unknown-lynxos$UNAME_RELEASE + ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) - echo powerpc-unknown-lynxos"$UNAME_RELEASE" - exit ;; + GUESS=powerpc-unknown-lynxos$UNAME_RELEASE + ;; SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv"$UNAME_RELEASE" - exit ;; + GUESS=mips-dde-sysv$UNAME_RELEASE + ;; RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; + GUESS=mips-sni-sysv4 + ;; RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; + GUESS=mips-sni-sysv4 + ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo "$UNAME_MACHINE"-sni-sysv4 + GUESS=$UNAME_MACHINE-sni-sysv4 else - echo ns32k-sni-sysv + GUESS=ns32k-sni-sysv fi - exit ;; + ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says - echo i586-unisys-sysv4 - exit ;; + GUESS=i586-unisys-sysv4 + ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit ;; + GUESS=hppa1.1-stratus-sysv4 + ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit ;; + GUESS=i860-stratus-sysv4 + ;; i*86:VOS:*:*) # From Paul.Green@stratus.com. - echo "$UNAME_MACHINE"-stratus-vos - exit ;; + GUESS=$UNAME_MACHINE-stratus-vos + ;; *:VOS:*:*) # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit ;; + GUESS=hppa1.1-stratus-vos + ;; mc68*:A/UX:*:*) - echo m68k-apple-aux"$UNAME_RELEASE" - exit ;; + GUESS=m68k-apple-aux$UNAME_RELEASE + ;; news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit ;; + GUESS=mips-sony-newsos6 + ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv"$UNAME_RELEASE" + if test -d /usr/nec; then + GUESS=mips-nec-sysv$UNAME_RELEASE else - echo mips-unknown-sysv"$UNAME_RELEASE" + GUESS=mips-unknown-sysv$UNAME_RELEASE fi - exit ;; + ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; + GUESS=powerpc-be-beos + ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit ;; + GUESS=powerpc-apple-beos + ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; + GUESS=i586-pc-beos + ;; BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; + GUESS=i586-pc-haiku + ;; x86_64:Haiku:*:*) - echo x86_64-unknown-haiku - exit ;; + GUESS=x86_64-unknown-haiku + ;; SX-4:SUPER-UX:*:*) - echo sx4-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx4-nec-superux$UNAME_RELEASE + ;; SX-5:SUPER-UX:*:*) - echo sx5-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx5-nec-superux$UNAME_RELEASE + ;; SX-6:SUPER-UX:*:*) - echo sx6-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx6-nec-superux$UNAME_RELEASE + ;; SX-7:SUPER-UX:*:*) - echo sx7-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx7-nec-superux$UNAME_RELEASE + ;; SX-8:SUPER-UX:*:*) - echo sx8-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx8-nec-superux$UNAME_RELEASE + ;; SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sx8r-nec-superux$UNAME_RELEASE + ;; SX-ACE:SUPER-UX:*:*) - echo sxace-nec-superux"$UNAME_RELEASE" - exit ;; + GUESS=sxace-nec-superux$UNAME_RELEASE + ;; Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody"$UNAME_RELEASE" - exit ;; + GUESS=powerpc-apple-rhapsody$UNAME_RELEASE + ;; *:Rhapsody:*:*) - echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-apple-rhapsody$UNAME_RELEASE + ;; + arm64:Darwin:*:*) + GUESS=aarch64-apple-darwin$UNAME_RELEASE + ;; *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - eval "$set_cc_for_build" - if test "$UNAME_PROCESSOR" = unknown ; then - UNAME_PROCESSOR=powerpc + UNAME_PROCESSOR=`uname -p` + case $UNAME_PROCESSOR in + unknown) UNAME_PROCESSOR=powerpc ;; + esac + if command -v xcode-select > /dev/null 2> /dev/null && \ + ! xcode-select --print-path > /dev/null 2> /dev/null ; then + # Avoid executing cc if there is no toolchain installed as + # cc will be a stub that puts up a graphical alert + # prompting the user to install developer tools. + CC_FOR_BUILD=no_compiler_found + else + set_cc_for_build fi - if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then - if [ "$CC_FOR_BUILD" != no_compiler_found ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac - fi - # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc - if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_PPC >/dev/null - then - UNAME_PROCESSOR=powerpc - fi + if test "$CC_FOR_BUILD" != no_compiler_found; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi + # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc + if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_PPC >/dev/null + then + UNAME_PROCESSOR=powerpc fi elif test "$UNAME_PROCESSOR" = i386 ; then - # Avoid executing cc on OS X 10.9, as it ships with a stub - # that puts up a graphical alert prompting to install - # developer tools. Any system running Mac OS X 10.7 or - # later (Darwin 11 and later) is required to have a 64-bit - # processor. This is not true of the ARM version of Darwin - # that Apple uses in portable devices. - UNAME_PROCESSOR=x86_64 + # uname -m returns i386 or x86_64 + UNAME_PROCESSOR=$UNAME_MACHINE fi - echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_PROCESSOR-apple-darwin$UNAME_RELEASE + ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi - echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_PROCESSOR-$UNAME_MACHINE-nto-qnx$UNAME_RELEASE + ;; *:QNX:*:4*) - echo i386-pc-qnx - exit ;; + GUESS=i386-pc-qnx + ;; NEO-*:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=neo-tandem-nsk$UNAME_RELEASE + ;; NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=nse-tandem-nsk$UNAME_RELEASE + ;; NSR-*:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=nsr-tandem-nsk$UNAME_RELEASE + ;; NSV-*:NONSTOP_KERNEL:*:*) - echo nsv-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=nsv-tandem-nsk$UNAME_RELEASE + ;; NSX-*:NONSTOP_KERNEL:*:*) - echo nsx-tandem-nsk"$UNAME_RELEASE" - exit ;; + GUESS=nsx-tandem-nsk$UNAME_RELEASE + ;; *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit ;; + GUESS=mips-compaq-nonstopux + ;; BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit ;; + GUESS=bs2000-siemens-sysv + ;; DS/*:UNIX_System_V:*:*) - echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" - exit ;; + GUESS=$UNAME_MACHINE-$UNAME_SYSTEM-$UNAME_RELEASE + ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - if test "$cputype" = 386; then + if test "${cputype-}" = 386; then UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" + elif test "x${cputype-}" != x; then + UNAME_MACHINE=$cputype fi - echo "$UNAME_MACHINE"-unknown-plan9 - exit ;; + GUESS=$UNAME_MACHINE-unknown-plan9 + ;; *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit ;; + GUESS=pdp10-unknown-tops10 + ;; *:TENEX:*:*) - echo pdp10-unknown-tenex - exit ;; + GUESS=pdp10-unknown-tenex + ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit ;; + GUESS=pdp10-dec-tops20 + ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit ;; + GUESS=pdp10-xkl-tops20 + ;; *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit ;; + GUESS=pdp10-unknown-tops20 + ;; *:ITS:*:*) - echo pdp10-unknown-its - exit ;; + GUESS=pdp10-unknown-its + ;; SEI:*:*:SEIUX) - echo mips-sei-seiux"$UNAME_RELEASE" - exit ;; + GUESS=mips-sei-seiux$UNAME_RELEASE + ;; *:DragonFly:*:*) - echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" - exit ;; + DRAGONFLY_REL=`echo "$UNAME_RELEASE" | sed -e 's/[-(].*//'` + GUESS=$UNAME_MACHINE-unknown-dragonfly$DRAGONFLY_REL + ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "$UNAME_MACHINE" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; + case $UNAME_MACHINE in + A*) GUESS=alpha-dec-vms ;; + I*) GUESS=ia64-dec-vms ;; + V*) GUESS=vax-dec-vms ;; esac ;; *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; + GUESS=i386-pc-xenix + ;; i*86:skyos:*:*) - echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" - exit ;; + SKYOS_REL=`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'` + GUESS=$UNAME_MACHINE-pc-skyos$SKYOS_REL + ;; i*86:rdos:*:*) - echo "$UNAME_MACHINE"-pc-rdos - exit ;; - i*86:AROS:*:*) - echo "$UNAME_MACHINE"-pc-aros - exit ;; + GUESS=$UNAME_MACHINE-pc-rdos + ;; + i*86:Fiwix:*:*) + GUESS=$UNAME_MACHINE-pc-fiwix + ;; + *:AROS:*:*) + GUESS=$UNAME_MACHINE-unknown-aros + ;; x86_64:VMkernel:*:*) - echo "$UNAME_MACHINE"-unknown-esx - exit ;; + GUESS=$UNAME_MACHINE-unknown-esx + ;; amd64:Isilon\ OneFS:*:*) - echo x86_64-unknown-onefs - exit ;; + GUESS=x86_64-unknown-onefs + ;; + *:Unleashed:*:*) + GUESS=$UNAME_MACHINE-unknown-unleashed$UNAME_RELEASE + ;; esac +# Do we have a guess based on uname results? +if test "x$GUESS" != x; then + echo "$GUESS" + exit +fi + +# No uname command or uname output not recognized. +set_cc_for_build +cat > "$dummy.c" < +#include +#endif +#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) +#if defined (vax) || defined (__vax) || defined (__vax__) || defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) +#include +#if defined(_SIZE_T_) || defined(SIGLOST) +#include +#endif +#endif +#endif +main () +{ +#if defined (sony) +#if defined (MIPSEB) + /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, + I don't know.... */ + printf ("mips-sony-bsd\n"); exit (0); +#else +#include + printf ("m68k-sony-newsos%s\n", +#ifdef NEWSOS4 + "4" +#else + "" +#endif + ); exit (0); +#endif +#endif + +#if defined (NeXT) +#if !defined (__ARCHITECTURE__) +#define __ARCHITECTURE__ "m68k" +#endif + int version; + version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); + exit (0); +#endif + +#if defined (MULTIMAX) || defined (n16) +#if defined (UMAXV) + printf ("ns32k-encore-sysv\n"); exit (0); +#else +#if defined (CMU) + printf ("ns32k-encore-mach\n"); exit (0); +#else + printf ("ns32k-encore-bsd\n"); exit (0); +#endif +#endif +#endif + +#if defined (__386BSD__) + printf ("i386-pc-bsd\n"); exit (0); +#endif + +#if defined (sequent) +#if defined (i386) + printf ("i386-sequent-dynix\n"); exit (0); +#endif +#if defined (ns32000) + printf ("ns32k-sequent-dynix\n"); exit (0); +#endif +#endif + +#if defined (_SEQUENT_) + struct utsname un; + + uname(&un); + if (strncmp(un.version, "V2", 2) == 0) { + printf ("i386-sequent-ptx2\n"); exit (0); + } + if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ + printf ("i386-sequent-ptx1\n"); exit (0); + } + printf ("i386-sequent-ptx\n"); exit (0); +#endif + +#if defined (vax) +#if !defined (ultrix) +#include +#if defined (BSD) +#if BSD == 43 + printf ("vax-dec-bsd4.3\n"); exit (0); +#else +#if BSD == 199006 + printf ("vax-dec-bsd4.3reno\n"); exit (0); +#else + printf ("vax-dec-bsd\n"); exit (0); +#endif +#endif +#else + printf ("vax-dec-bsd\n"); exit (0); +#endif +#else +#if defined(_SIZE_T_) || defined(SIGLOST) + struct utsname un; + uname (&un); + printf ("vax-dec-ultrix%s\n", un.release); exit (0); +#else + printf ("vax-dec-ultrix\n"); exit (0); +#endif +#endif +#endif +#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || defined(__ultrix__) +#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || defined(__MIPS__) +#if defined(_SIZE_T_) || defined(SIGLOST) + struct utsname *un; + uname (&un); + printf ("mips-dec-ultrix%s\n", un.release); exit (0); +#else + printf ("mips-dec-ultrix\n"); exit (0); +#endif +#endif +#endif + +#if defined (alliant) && defined (i860) + printf ("i860-alliant-bsd\n"); exit (0); +#endif + + exit (1); +} +EOF + +$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`"$dummy"` && + { echo "$SYSTEM_NAME"; exit; } + +# Apollos put the system type in the environment. +test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; } + echo "$0: unable to guess system type" >&2 -case "$UNAME_MACHINE:$UNAME_SYSTEM" in +case $UNAME_MACHINE:$UNAME_SYSTEM in mips:Linux | mips64:Linux) # If we got here on MIPS GNU/Linux, output extra information. cat >&2 <&2 <&2 exit 1 ;; *local*) @@ -110,1223 +119,1186 @@ case $# in exit 1;; esac -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ - linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ - kopensolaris*-gnu* | cloudabi*-eabi* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - android-linux) - os=-linux-android - basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown - ;; - *) - basic_machine=`echo "$1" | sed 's/-[^-]*$//'` - if [ "$basic_machine" != "$1" ] - then os=`echo "$1" | sed 's/.*-/-/'` - else os=; fi - ;; -esac +# Split fields of configuration type +# shellcheck disable=SC2162 +saved_IFS=$IFS +IFS="-" read field1 field2 field3 field4 <&2 + exit 1 ;; - -lynx*) - os=-lynxos + *-*-*-*) + basic_machine=$field1-$field2 + basic_os=$field3-$field4 ;; - -ptx*) - basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` + *-*-*) + # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two + # parts + maybe_os=$field2-$field3 + case $maybe_os in + nto-qnx* | linux-* | uclinux-uclibc* \ + | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ + | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ + | storm-chaos* | os2-emx* | rtmk-nova*) + basic_machine=$field1 + basic_os=$maybe_os + ;; + android-linux) + basic_machine=$field1-unknown + basic_os=linux-android + ;; + *) + basic_machine=$field1-$field2 + basic_os=$field3 + ;; + esac ;; - -psos*) - os=-psos + *-*) + # A lone config we happen to match not fitting any pattern + case $field1-$field2 in + decstation-3100) + basic_machine=mips-dec + basic_os= + ;; + *-*) + # Second component is usually, but not always the OS + case $field2 in + # Prevent following clause from handling this valid os + sun*os*) + basic_machine=$field1 + basic_os=$field2 + ;; + zephyr*) + basic_machine=$field1-unknown + basic_os=$field2 + ;; + # Manufacturers + dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ + | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ + | unicom* | ibm* | next | hp | isi* | apollo | altos* \ + | convergent* | ncr* | news | 32* | 3600* | 3100* \ + | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \ + | ultra | tti* | harris | dolphin | highlevel | gould \ + | cbm | ns | masscomp | apple | axis | knuth | cray \ + | microblaze* | sim | cisco \ + | oki | wec | wrs | winbond) + basic_machine=$field1-$field2 + basic_os= + ;; + *) + basic_machine=$field1 + basic_os=$field2 + ;; + esac + ;; + esac ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint + *) + # Convert single-component short-hands not valid as part of + # multi-component configurations. + case $field1 in + 386bsd) + basic_machine=i386-pc + basic_os=bsd + ;; + a29khif) + basic_machine=a29k-amd + basic_os=udi + ;; + adobe68k) + basic_machine=m68010-adobe + basic_os=scout + ;; + alliant) + basic_machine=fx80-alliant + basic_os= + ;; + altos | altos3068) + basic_machine=m68k-altos + basic_os= + ;; + am29k) + basic_machine=a29k-none + basic_os=bsd + ;; + amdahl) + basic_machine=580-amdahl + basic_os=sysv + ;; + amiga) + basic_machine=m68k-unknown + basic_os= + ;; + amigaos | amigados) + basic_machine=m68k-unknown + basic_os=amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + basic_os=sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + basic_os=sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + basic_os=bsd + ;; + aros) + basic_machine=i386-pc + basic_os=aros + ;; + aux) + basic_machine=m68k-apple + basic_os=aux + ;; + balance) + basic_machine=ns32k-sequent + basic_os=dynix + ;; + blackfin) + basic_machine=bfin-unknown + basic_os=linux + ;; + cegcc) + basic_machine=arm-unknown + basic_os=cegcc + ;; + convex-c1) + basic_machine=c1-convex + basic_os=bsd + ;; + convex-c2) + basic_machine=c2-convex + basic_os=bsd + ;; + convex-c32) + basic_machine=c32-convex + basic_os=bsd + ;; + convex-c34) + basic_machine=c34-convex + basic_os=bsd + ;; + convex-c38) + basic_machine=c38-convex + basic_os=bsd + ;; + cray) + basic_machine=j90-cray + basic_os=unicos + ;; + crds | unos) + basic_machine=m68k-crds + basic_os= + ;; + da30) + basic_machine=m68k-da30 + basic_os= + ;; + decstation | pmax | pmin | dec3100 | decstatn) + basic_machine=mips-dec + basic_os= + ;; + delta88) + basic_machine=m88k-motorola + basic_os=sysv3 + ;; + dicos) + basic_machine=i686-pc + basic_os=dicos + ;; + djgpp) + basic_machine=i586-pc + basic_os=msdosdjgpp + ;; + ebmon29k) + basic_machine=a29k-amd + basic_os=ebmon + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + basic_os=ose + ;; + gmicro) + basic_machine=tron-gmicro + basic_os=sysv + ;; + go32) + basic_machine=i386-pc + basic_os=go32 + ;; + h8300hms) + basic_machine=h8300-hitachi + basic_os=hms + ;; + h8300xray) + basic_machine=h8300-hitachi + basic_os=xray + ;; + h8500hms) + basic_machine=h8500-hitachi + basic_os=hms + ;; + harris) + basic_machine=m88k-harris + basic_os=sysv3 + ;; + hp300 | hp300hpux) + basic_machine=m68k-hp + basic_os=hpux + ;; + hp300bsd) + basic_machine=m68k-hp + basic_os=bsd + ;; + hppaosf) + basic_machine=hppa1.1-hp + basic_os=osf + ;; + hppro) + basic_machine=hppa1.1-hp + basic_os=proelf + ;; + i386mach) + basic_machine=i386-mach + basic_os=mach + ;; + isi68 | isi) + basic_machine=m68k-isi + basic_os=sysv + ;; + m68knommu) + basic_machine=m68k-unknown + basic_os=linux + ;; + magnum | m3230) + basic_machine=mips-mips + basic_os=sysv + ;; + merlin) + basic_machine=ns32k-utek + basic_os=sysv + ;; + mingw64) + basic_machine=x86_64-pc + basic_os=mingw64 + ;; + mingw32) + basic_machine=i686-pc + basic_os=mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + basic_os=mingw32ce + ;; + monitor) + basic_machine=m68k-rom68k + basic_os=coff + ;; + morphos) + basic_machine=powerpc-unknown + basic_os=morphos + ;; + moxiebox) + basic_machine=moxie-unknown + basic_os=moxiebox + ;; + msdos) + basic_machine=i386-pc + basic_os=msdos + ;; + msys) + basic_machine=i686-pc + basic_os=msys + ;; + mvs) + basic_machine=i370-ibm + basic_os=mvs + ;; + nacl) + basic_machine=le32-unknown + basic_os=nacl + ;; + ncr3000) + basic_machine=i486-ncr + basic_os=sysv4 + ;; + netbsd386) + basic_machine=i386-pc + basic_os=netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + basic_os=linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + basic_os=newsos + ;; + news1000) + basic_machine=m68030-sony + basic_os=newsos + ;; + necv70) + basic_machine=v70-nec + basic_os=sysv + ;; + nh3000) + basic_machine=m68k-harris + basic_os=cxux + ;; + nh[45]000) + basic_machine=m88k-harris + basic_os=cxux + ;; + nindy960) + basic_machine=i960-intel + basic_os=nindy + ;; + mon960) + basic_machine=i960-intel + basic_os=mon960 + ;; + nonstopux) + basic_machine=mips-compaq + basic_os=nonstopux + ;; + os400) + basic_machine=powerpc-ibm + basic_os=os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + basic_os=ose + ;; + os68k) + basic_machine=m68k-none + basic_os=os68k + ;; + paragon) + basic_machine=i860-intel + basic_os=osf + ;; + parisc) + basic_machine=hppa-unknown + basic_os=linux + ;; + psp) + basic_machine=mipsallegrexel-sony + basic_os=psp + ;; + pw32) + basic_machine=i586-unknown + basic_os=pw32 + ;; + rdos | rdos64) + basic_machine=x86_64-pc + basic_os=rdos + ;; + rdos32) + basic_machine=i386-pc + basic_os=rdos + ;; + rom68k) + basic_machine=m68k-rom68k + basic_os=coff + ;; + sa29200) + basic_machine=a29k-amd + basic_os=udi + ;; + sei) + basic_machine=mips-sei + basic_os=seiux + ;; + sequent) + basic_machine=i386-sequent + basic_os= + ;; + sps7) + basic_machine=m68k-bull + basic_os=sysv2 + ;; + st2000) + basic_machine=m68k-tandem + basic_os= + ;; + stratus) + basic_machine=i860-stratus + basic_os=sysv4 + ;; + sun2) + basic_machine=m68000-sun + basic_os= + ;; + sun2os3) + basic_machine=m68000-sun + basic_os=sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + basic_os=sunos4 + ;; + sun3) + basic_machine=m68k-sun + basic_os= + ;; + sun3os3) + basic_machine=m68k-sun + basic_os=sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + basic_os=sunos4 + ;; + sun4) + basic_machine=sparc-sun + basic_os= + ;; + sun4os3) + basic_machine=sparc-sun + basic_os=sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + basic_os=sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + basic_os=solaris2 + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + basic_os= + ;; + sv1) + basic_machine=sv1-cray + basic_os=unicos + ;; + symmetry) + basic_machine=i386-sequent + basic_os=dynix + ;; + t3e) + basic_machine=alphaev5-cray + basic_os=unicos + ;; + t90) + basic_machine=t90-cray + basic_os=unicos + ;; + toad1) + basic_machine=pdp10-xkl + basic_os=tops20 + ;; + tpf) + basic_machine=s390x-ibm + basic_os=tpf + ;; + udi29k) + basic_machine=a29k-amd + basic_os=udi + ;; + ultra3) + basic_machine=a29k-nyu + basic_os=sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + basic_os=none + ;; + vaxv) + basic_machine=vax-dec + basic_os=sysv + ;; + vms) + basic_machine=vax-dec + basic_os=vms + ;; + vsta) + basic_machine=i386-pc + basic_os=vsta + ;; + vxworks960) + basic_machine=i960-wrs + basic_os=vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + basic_os=vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + basic_os=vxworks + ;; + xbox) + basic_machine=i686-pc + basic_os=mingw32 + ;; + ymp) + basic_machine=ymp-cray + basic_os=unicos + ;; + *) + basic_machine=$1 + basic_os= + ;; + esac ;; esac -# Decode aliases for certain CPU-COMPANY combinations. +# Decode 1-component or ad-hoc basic machines case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arceb \ - | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ - | avr | avr32 \ - | ba \ - | be32 | be64 \ - | bfin \ - | c4x | c8051 | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | e2k | epiphany \ - | fido | fr30 | frv | ft32 \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | hexagon \ - | i370 | i860 | i960 | ia16 | ia64 \ - | ip2k | iq2000 \ - | k1om \ - | le32 | le64 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ - | mips64r5900 | mips64r5900el \ - | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa32r6 | mipsisa32r6el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64r6 | mipsisa64r6el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipsr5900 | mipsr5900el \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | moxie \ - | mt \ - | msp430 \ - | nds32 | nds32le | nds32be \ - | nios | nios2 | nios2eb | nios2el \ - | ns16k | ns32k \ - | open8 | or1k | or1knd | or32 \ - | pdp10 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle \ - | pru \ - | pyramid \ - | riscv32 | riscv64 \ - | rl78 | rx \ - | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu \ - | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ - | ubicom32 \ - | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ - | visium \ - | wasm32 \ - | x86 | xc16x | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; - c54x) - basic_machine=tic54x-unknown - ;; - c55x) - basic_machine=tic55x-unknown - ;; - c6x) - basic_machine=tic6x-unknown - ;; - leon|leon[3-9]) - basic_machine=sparc-$basic_machine - ;; - m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) - basic_machine=$basic_machine-unknown - os=-none + # Here we handle the default manufacturer of certain CPU types. It is in + # some cases the only manufacturer, in others, it is the most popular. + w89k) + cpu=hppa1.1 + vendor=winbond ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) + op50n) + cpu=hppa1.1 + vendor=oki ;; - ms1) - basic_machine=mt-unknown + op60c) + cpu=hppa1.1 + vendor=oki ;; - - strongarm | thumb | xscale) - basic_machine=arm-unknown + ibm*) + cpu=i370 + vendor=ibm ;; - xgate) - basic_machine=$basic_machine-unknown - os=-none + orion105) + cpu=clipper + vendor=highlevel ;; - xscaleeb) - basic_machine=armeb-unknown + mac | mpw | mac-mpw) + cpu=m68k + vendor=apple ;; - - xscaleel) - basic_machine=armel-unknown + pmac | pmac-mpw) + cpu=powerpc + vendor=apple ;; - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | ba-* \ - | be32-* | be64-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* \ - | c8051-* | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | e2k-* | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | hexagon-* \ - | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ - | ip2k-* | iq2000-* \ - | k1om-* \ - | le32-* | le64-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ - | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa32r6-* | mipsisa32r6el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64r6-* | mipsisa64r6el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipsr5900-* | mipsr5900el-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nds32-* | nds32le-* | nds32be-* \ - | nios-* | nios2-* | nios2eb-* | nios2el-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | open8-* \ - | or1k*-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ - | pru-* \ - | pyramid-* \ - | riscv32-* | riscv64-* \ - | rl78-* | romp-* | rs6000-* | rx-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ - | tahoe-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tile*-* \ - | tron-* \ - | ubicom32-* \ - | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ - | vax-* \ - | visium-* \ - | wasm32-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) - ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) - basic_machine=$basic_machine-unknown - ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-pc - os=-bsd - ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att + cpu=m68000 + vendor=att ;; 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aros) - basic_machine=i386-pc - os=-aros - ;; - asmjs) - basic_machine=asmjs-unknown - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=-linux - ;; - blackfin-*) - basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux + cpu=we32k + vendor=att ;; bluegene*) - basic_machine=powerpc-ibm - os=-cnk - ;; - c54x-*) - basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - c55x-*) - basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - c6x-*) - basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16 | cr16-*) - basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec + cpu=powerpc + vendor=ibm + basic_os=cnk ;; decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 + cpu=pdp10 + vendor=dec + basic_os=tops10 ;; decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 + cpu=pdp10 + vendor=dec + basic_os=tops20 ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dicos) - basic_machine=i686-pc - os=-dicos - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx + cpu=m68k + vendor=motorola ;; dpx2*) - basic_machine=m68k-bull - os=-sysv3 - ;; - e500v[12]) - basic_machine=powerpc-unknown - os=$os"spe" - ;; - e500v[12]-*) - basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=$os"spe" - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd + cpu=m68k + vendor=bull + basic_os=sysv3 ;; encore | umax | mmax) - basic_machine=ns32k-encore + cpu=ns32k + vendor=encore ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose + elxsi) + cpu=elxsi + vendor=elxsi + basic_os=${basic_os:-bsd} ;; fx2800) - basic_machine=i860-alliant + cpu=i860 + vendor=alliant ;; genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 + cpu=ns32k + vendor=ns ;; h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux + cpu=hppa1.1 + vendor=hitachi + basic_os=hiuxwe2 ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp + cpu=hppa1.0 + vendor=hp ;; hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp + cpu=m68000 + vendor=hp ;; hp9k3[2-9][0-9]) - basic_machine=m68k-hp + cpu=m68k + vendor=hp ;; hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp + cpu=hppa1.0 + vendor=hp ;; hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k78[0-9] | hp78[0-9]) # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp + cpu=hppa1.1 + vendor=hp ;; hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm + cpu=hppa1.0 + vendor=hp ;; i*86v32) - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv32 + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=sysv32 ;; i*86v4*) - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv4 + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=sysv4 ;; i*86v) - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-sysv + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=sysv ;; i*86sol2) - basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach + cpu=`echo "$1" | sed -e 's/86.*/86/'` + vendor=pc + basic_os=solaris2 ;; - vsta) - basic_machine=i386-unknown - os=-vsta + j90 | j90-cray) + cpu=j90 + vendor=cray + basic_os=${basic_os:-unicos} ;; iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) + cpu=mips + vendor=sgi + case $basic_os in + irix*) ;; *) - os=-irix4 + basic_os=irix4 ;; esac ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - leon-*|leon[3-9]-*) - basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` - ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux - ;; - m68knommu-*) - basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - microblaze*) - basic_machine=microblaze-xilinx - ;; - mingw64) - basic_machine=x86_64-pc - os=-mingw64 - ;; - mingw32) - basic_machine=i686-pc - os=-mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - moxiebox) - basic_machine=moxie-unknown - os=-moxiebox + cpu=m68000 + vendor=convergent ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` - ;; - msys) - basic_machine=i686-pc - os=-msys - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - nacl) - basic_machine=le32-unknown - os=-nacl - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos + *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) + cpu=m68k + vendor=atari + basic_os=mint ;; news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv + cpu=mips + vendor=sony + basic_os=newsos ;; next | m*-next) - basic_machine=m68k-next - case $os in - -nextstep* ) + cpu=m68k + vendor=next + case $basic_os in + openstep*) + ;; + nextstep*) ;; - -ns2*) - os=-nextstep2 + ns2*) + basic_os=nextstep2 ;; *) - os=-nextstep3 + basic_os=nextstep3 ;; esac ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; np1) - basic_machine=np1-gould - ;; - neo-tandem) - basic_machine=neo-tandem - ;; - nse-tandem) - basic_machine=nse-tandem - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - nsv-tandem) - basic_machine=nsv-tandem - ;; - nsx-tandem) - basic_machine=nsx-tandem + cpu=np1 + vendor=gould ;; op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k + cpu=hppa1.1 + vendor=oki + basic_os=proelf ;; pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - parisc) - basic_machine=hppa-unknown - os=-linux - ;; - parisc-*) - basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` - os=-linux + cpu=hppa1.1 + vendor=hitachi + basic_os=hiuxwe2 ;; pbd) - basic_machine=sparc-tti + cpu=sparc + vendor=tti ;; pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pc98) - basic_machine=i386-pc + cpu=m68k + vendor=tti ;; - pc98-*) - basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; - pentium4) - basic_machine=i786-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - pentium4-*) - basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` + pc532) + cpu=ns32k + vendor=pc532 ;; pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc | ppcbe) basic_machine=powerpc-unknown + cpu=pn + vendor=gould ;; - ppc-* | ppcbe-*) - basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle) - basic_machine=powerpcle-unknown + power) + cpu=power + vendor=ibm ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ps2) + cpu=i386 + vendor=ibm ;; - ppc64) basic_machine=powerpc64-unknown + rm[46]00) + cpu=mips + vendor=siemens ;; - ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'` + rtpc | rtpc-*) + cpu=romp + vendor=ibm ;; - ppc64le | powerpc64little) - basic_machine=powerpc64le-unknown + sde) + cpu=mipsisa32 + vendor=sde + basic_os=${basic_os:-elf} ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'` + simso-wrs) + cpu=sparclite + vendor=wrs + basic_os=vxworks ;; - ps2) - basic_machine=i386-ibm + tower | tower-32) + cpu=m68k + vendor=ncr ;; - pw32) - basic_machine=i586-unknown - os=-pw32 + vpp*|vx|vx-*) + cpu=f301 + vendor=fujitsu ;; - rdos | rdos64) - basic_machine=x86_64-pc - os=-rdos + w65) + cpu=w65 + vendor=wdc ;; - rdos32) - basic_machine=i386-pc - os=-rdos + w89k-*) + cpu=hppa1.1 + vendor=winbond + basic_os=proelf ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff + none) + cpu=none + vendor=none ;; - rm[46]00) - basic_machine=mips-siemens + leon|leon[3-9]) + cpu=sparc + vendor=$basic_machine ;; - rtpc | rtpc-*) - basic_machine=romp-ibm + leon-*|leon[3-9]-*) + cpu=sparc + vendor=`echo "$basic_machine" | sed 's/-.*//'` ;; - s390 | s390-*) - basic_machine=s390-ibm + + *-*) + # shellcheck disable=SC2162 + saved_IFS=$IFS + IFS="-" read cpu vendor <&2 - exit 1 + # Recognize the canonical CPU types that are allowed with any + # company name. + case $cpu in + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be \ + | abacus \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] \ + | alphapca5[67] | alpha64pca5[67] \ + | am33_2.0 \ + | amdgcn \ + | arc | arceb | arc32 | arc64 \ + | arm | arm[lb]e | arme[lb] | armv* \ + | avr | avr32 \ + | asmjs \ + | ba \ + | be32 | be64 \ + | bfin | bpf | bs2000 \ + | c[123]* | c30 | [cjt]90 | c4x \ + | c8051 | clipper | craynv | csky | cydra \ + | d10v | d30v | dlx | dsp16xx \ + | e2k | elxsi | epiphany \ + | f30[01] | f700 | fido | fr30 | frv | ft32 | fx80 \ + | h8300 | h8500 \ + | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i*86 | i860 | i960 | ia16 | ia64 \ + | ip2k | iq2000 \ + | k1om \ + | le32 | le64 \ + | lm32 \ + | loongarch32 | loongarch64 | loongarchx32 \ + | m32c | m32r | m32rle \ + | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ + | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ + | m88110 | m88k | maxq | mb | mcore | mep | metag \ + | microblaze | microblazeel \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64eb | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r3 | mipsisa32r3el \ + | mipsisa32r5 | mipsisa32r5el \ + | mipsisa32r6 | mipsisa32r6el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r3 | mipsisa64r3el \ + | mipsisa64r5 | mipsisa64r5el \ + | mipsisa64r6 | mipsisa64r6el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ + | mipstx39 | mipstx39el \ + | mmix \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nfp \ + | nios | nios2 | nios2eb | nios2el \ + | none | np1 | ns16k | ns32k | nvptx \ + | open8 \ + | or1k* \ + | or32 \ + | orion \ + | picochip \ + | pdp10 | pdp11 | pj | pjl | pn | power \ + | powerpc | powerpc64 | powerpc64le | powerpcle | powerpcspe \ + | pru \ + | pyramid \ + | riscv | riscv32 | riscv32be | riscv64 | riscv64be \ + | rl78 | romp | rs6000 | rx \ + | s390 | s390x \ + | score \ + | sh | shl \ + | sh[1234] | sh[24]a | sh[24]ae[lb] | sh[23]e | she[lb] | sh[lb]e \ + | sh[1234]e[lb] | sh[12345][lb]e | sh[23]ele | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet \ + | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v | sv1 | sx* \ + | spu \ + | tahoe \ + | thumbv7* \ + | tic30 | tic4x | tic54x | tic55x | tic6x | tic80 \ + | tron \ + | ubicom32 \ + | v70 | v850 | v850e | v850e1 | v850es | v850e2 | v850e2v3 \ + | vax \ + | visium \ + | w65 \ + | wasm32 | wasm64 \ + | we32k \ + | x86 | x86_64 | xc16x | xgate | xps100 \ + | xstormy16 | xtensa* \ + | ymp \ + | z8k | z80) + ;; + + *) + echo Invalid configuration \`"$1"\': machine \`"$cpu-$vendor"\' not recognized 1>&2 + exit 1 + ;; + esac ;; esac # Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` +case $vendor in + digital*) + vendor=dec ;; - *-commodore*) - basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` + commodore*) + vendor=cbm ;; *) ;; @@ -1334,203 +1306,215 @@ esac # Decode manufacturer-specific aliases for certain operating systems. -if [ x"$os" != x"" ] +if test x$basic_os != x then + +# First recognize some ad-hoc cases, or perhaps split kernel-os, or else just +# set os. +case $basic_os in + gnu/linux*) + kernel=linux + os=`echo "$basic_os" | sed -e 's|gnu/linux|gnu|'` + ;; + os2-emx) + kernel=os2 + os=`echo "$basic_os" | sed -e 's|os2-emx|emx|'` + ;; + nto-qnx*) + kernel=nto + os=`echo "$basic_os" | sed -e 's|nto-qnx|qnx|'` + ;; + *-*) + # shellcheck disable=SC2162 + saved_IFS=$IFS + IFS="-" read kernel os <&2 - exit 1 + # No normalization, but not necessarily accepted, that comes below. ;; esac + else # Here we handle the default operating systems that come with various machines. @@ -1543,258 +1527,363 @@ else # will signal an error saying that MANUFACTURER isn't an operating # system, and we'll never get to this point. -case $basic_machine in +kernel= +case $cpu-$vendor in score-*) - os=-elf + os=elf ;; spu-*) - os=-elf + os=elf ;; *-acorn) - os=-riscix1.2 + os=riscix1.2 ;; arm*-rebel) - os=-linux + kernel=linux + os=gnu ;; arm*-semi) - os=-aout + os=aout ;; c4x-* | tic4x-*) - os=-coff + os=coff ;; c8051-*) - os=-elf + os=elf + ;; + clipper-intergraph) + os=clix ;; hexagon-*) - os=-elf + os=elf ;; tic54x-*) - os=-coff + os=coff ;; tic55x-*) - os=-coff + os=coff ;; tic6x-*) - os=-coff + os=coff ;; # This must come before the *-dec entry. pdp10-*) - os=-tops20 + os=tops20 ;; pdp11-*) - os=-none + os=none ;; *-dec | vax-*) - os=-ultrix4.2 + os=ultrix4.2 ;; m68*-apollo) - os=-domain + os=domain ;; i386-sun) - os=-sunos4.0.2 + os=sunos4.0.2 ;; m68000-sun) - os=-sunos3 + os=sunos3 ;; m68*-cisco) - os=-aout + os=aout ;; mep-*) - os=-elf + os=elf ;; mips*-cisco) - os=-elf + os=elf ;; mips*-*) - os=-elf + os=elf ;; or32-*) - os=-coff + os=coff ;; *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 + os=sysv3 ;; sparc-* | *-sun) - os=-sunos4.1.1 + os=sunos4.1.1 ;; pru-*) - os=-elf + os=elf ;; *-be) - os=-beos + os=beos ;; *-ibm) - os=-aix + os=aix ;; *-knuth) - os=-mmixware + os=mmixware ;; *-wec) - os=-proelf + os=proelf ;; *-winbond) - os=-proelf + os=proelf ;; *-oki) - os=-proelf + os=proelf ;; *-hp) - os=-hpux + os=hpux ;; *-hitachi) - os=-hiux + os=hiux ;; i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv + os=sysv ;; *-cbm) - os=-amigaos + os=amigaos ;; *-dg) - os=-dgux + os=dgux ;; *-dolphin) - os=-sysv3 + os=sysv3 ;; m68k-ccur) - os=-rtu + os=rtu ;; m88k-omron*) - os=-luna + os=luna ;; *-next) - os=-nextstep + os=nextstep ;; *-sequent) - os=-ptx + os=ptx ;; *-crds) - os=-unos + os=unos ;; *-ns) - os=-genix + os=genix ;; i370-*) - os=-mvs + os=mvs ;; *-gould) - os=-sysv + os=sysv ;; *-highlevel) - os=-bsd + os=bsd ;; *-encore) - os=-bsd + os=bsd ;; *-sgi) - os=-irix + os=irix ;; *-siemens) - os=-sysv4 + os=sysv4 ;; *-masscomp) - os=-rtu + os=rtu ;; f30[01]-fujitsu | f700-fujitsu) - os=-uxpv + os=uxpv ;; *-rom68k) - os=-coff + os=coff ;; *-*bug) - os=-coff + os=coff ;; *-apple) - os=-macos + os=macos ;; *-atari*) - os=-mint + os=mint + ;; + *-wrs) + os=vxworks ;; *) - os=-none + os=none ;; esac + fi +# Now, validate our (potentially fixed-up) OS. +case $os in + # Sometimes we do "kernel-libc", so those need to count as OSes. + musl* | newlib* | relibc* | uclibc*) + ;; + # Likewise for "kernel-abi" + eabi* | gnueabi*) + ;; + # VxWorks passes extra cpu info in the 4th filed. + simlinux | simwindows | spe) + ;; + # Now accept the basic system types. + # The portable systems comes first. + # Each alternative MUST end in a * to match a version number. + gnu* | android* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ + | *vms* | esix* | aix* | cnk* | sunos | sunos[34]* \ + | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ + | sym* | plan9* | psp* | sim* | xray* | os68k* | v88r* \ + | hiux* | abug | nacl* | netware* | windows* \ + | os9* | macos* | osx* | ios* \ + | mpw* | magic* | mmixware* | mon960* | lnews* \ + | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ + | aos* | aros* | cloudabi* | sortix* | twizzler* \ + | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ + | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ + | mirbsd* | netbsd* | dicos* | openedition* | ose* \ + | bitrig* | openbsd* | secbsd* | solidbsd* | libertybsd* | os108* \ + | ekkobsd* | freebsd* | riscix* | lynxos* | os400* \ + | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ + | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ + | udi* | lites* | ieee* | go32* | aux* | hcos* \ + | chorusrdb* | cegcc* | glidix* | serenity* \ + | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ + | midipix* | mingw32* | mingw64* | mint* \ + | uxpv* | beos* | mpeix* | udk* | moxiebox* \ + | interix* | uwin* | mks* | rhapsody* | darwin* \ + | openstep* | oskit* | conix* | pw32* | nonstopux* \ + | storm-chaos* | tops10* | tenex* | tops20* | its* \ + | os2* | vos* | palmos* | uclinux* | nucleus* | morphos* \ + | scout* | superux* | sysv* | rtmk* | tpf* | windiss* \ + | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ + | skyos* | haiku* | rdos* | toppers* | drops* | es* \ + | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ + | midnightbsd* | amdhsa* | unleashed* | emscripten* | wasi* \ + | nsk* | powerunix* | genode* | zvmoe* | qnx* | emx* | zephyr* \ + | fiwix* ) + ;; + # This one is extra strict with allowed versions + sco3.2v2 | sco3.2v[4-9]* | sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + ;; + none) + ;; + *) + echo Invalid configuration \`"$1"\': OS \`"$os"\' not recognized 1>&2 + exit 1 + ;; +esac + +# As a final step for OS-related things, validate the OS-kernel combination +# (given a valid OS), if there is a kernel. +case $kernel-$os in + linux-gnu* | linux-dietlibc* | linux-android* | linux-newlib* \ + | linux-musl* | linux-relibc* | linux-uclibc* ) + ;; + uclinux-uclibc* ) + ;; + -dietlibc* | -newlib* | -musl* | -relibc* | -uclibc* ) + # These are just libc implementations, not actual OSes, and thus + # require a kernel. + echo "Invalid configuration \`$1': libc \`$os' needs explicit kernel." 1>&2 + exit 1 + ;; + kfreebsd*-gnu* | kopensolaris*-gnu*) + ;; + vxworks-simlinux | vxworks-simwindows | vxworks-spe) + ;; + nto-qnx*) + ;; + os2-emx) + ;; + *-eabi* | *-gnueabi*) + ;; + -*) + # Blank kernel with real OS is always fine. + ;; + *-*) + echo "Invalid configuration \`$1': Kernel \`$kernel' not known to work with OS \`$os'." 1>&2 + exit 1 + ;; +esac + # Here we handle the case where we know the os, and the CPU type, but not the # manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) +case $vendor in + unknown) + case $cpu-$os in + *-riscix*) vendor=acorn ;; - -sunos*) + *-sunos*) vendor=sun ;; - -cnk*|-aix*) + *-cnk* | *-aix*) vendor=ibm ;; - -beos*) + *-beos*) vendor=be ;; - -hpux*) + *-hpux*) vendor=hp ;; - -mpeix*) + *-mpeix*) vendor=hp ;; - -hiux*) + *-hiux*) vendor=hitachi ;; - -unos*) + *-unos*) vendor=crds ;; - -dgux*) + *-dgux*) vendor=dg ;; - -luna*) + *-luna*) vendor=omron ;; - -genix*) + *-genix*) vendor=ns ;; - -mvs* | -opened*) + *-clix*) + vendor=intergraph + ;; + *-mvs* | *-opened*) + vendor=ibm + ;; + *-os400*) vendor=ibm ;; - -os400*) + s390-* | s390x-*) vendor=ibm ;; - -ptx*) + *-ptx*) vendor=sequent ;; - -tpf*) + *-tpf*) vendor=ibm ;; - -vxsim* | -vxworks* | -windiss*) + *-vxsim* | *-vxworks* | *-windiss*) vendor=wrs ;; - -aux*) + *-aux*) vendor=apple ;; - -hms*) + *-hms*) vendor=hitachi ;; - -mpw* | -macos*) + *-mpw* | *-macos*) vendor=apple ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + *-*mint | *-mint[0-9]* | *-*MiNT | *-MiNT[0-9]*) vendor=atari ;; - -vos*) + *-vos*) vendor=stratus ;; esac - basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` ;; esac -echo "$basic_machine$os" +echo "$cpu-$vendor-${kernel:+$kernel-}$os" exit # Local variables: -# eval: (add-hook 'write-file-functions 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff --git a/trunk/libs/libcurl/curl-7.x/configure b/trunk/libs/libcurl/curl-7.x/configure index 611c6fc1..20f59409 100755 --- a/trunk/libs/libcurl/curl-7.x/configure +++ b/trunk/libs/libcurl/curl-7.x/configure @@ -12,7 +12,7 @@ # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. # -# Copyright (c) 1998 - 2021 Daniel Stenberg, +# Copyright (c) 1998 - 2022 Daniel Stenberg, # This configure script may be copied, distributed and modified under the # terms of the curl license; see COPYING for more details @@ -898,7 +898,6 @@ ac_includes_default="\ #endif" ac_header_c_list= -enable_option_checking=no ac_subst_vars='am__EXEEXT_FALSE am__EXEEXT_TRUE LTLIBOBJS @@ -921,10 +920,7 @@ DOING_CURL_SYMBOL_HIDING_TRUE USE_UNIX_SOCKETS BUILD_LIBHOSTNAME_FALSE BUILD_LIBHOSTNAME_TRUE -USE_EMBEDDED_ARES_FALSE -USE_EMBEDDED_ARES_TRUE USE_ARES -subdirs USE_MANUAL_FALSE USE_MANUAL_TRUE MANOPT @@ -932,13 +928,16 @@ NROFF PERL FISH_FUNCTIONS_DIR ZSH_FUNCTIONS_DIR +USE_MSH3 USE_QUICHE USE_NGHTTP3 +USE_NGTCP2_CRYPTO_WOLFSSL USE_NGTCP2_CRYPTO_GNUTLS USE_NGTCP2_CRYPTO_OPENSSL USE_NGTCP2 USE_NGHTTP2 IDN_ENABLED +CURL_PLIST_VERSION CURL_LT_SHLIB_USE_VERSIONED_SYMBOLS_FALSE CURL_LT_SHLIB_USE_VERSIONED_SYMBOLS_TRUE CURL_LT_SHLIB_VERSIONED_FLAVOUR @@ -957,7 +956,6 @@ NSS_LIBS USE_NSS USE_RUSTLS USE_BEARSSL -USE_MESALINK USE_WOLFSSL USE_MBEDTLS HAVE_GNUTLS_SRP @@ -1030,6 +1028,7 @@ DSYMUTIL MANIFEST_TOOL RANLIB ac_ct_AR +FILECMD LN_S NM ac_ct_DUMPBIN @@ -1163,7 +1162,6 @@ enable_warnings enable_werror enable_curldebug enable_symbol_hiding -enable_hidden_symbols enable_ares enable_rt enable_ech @@ -1177,9 +1175,9 @@ with_openssl with_gnutls with_mbedtls with_wolfssl -with_mesalink with_bearssl with_rustls +with_nss_deprecated with_nss with_darwinssl enable_largefile @@ -1241,6 +1239,7 @@ with_nghttp2 with_ngtcp2 with_nghttp3 with_quiche +with_msh3 with_zsh_functions_dir with_fish_functions_dir enable_threaded_resolver @@ -1263,6 +1262,7 @@ enable_progress_meter enable_dnsshuffle enable_get_easy_options enable_alt_svc +enable_headers_api enable_hsts ' ac_precious_vars='build_alias @@ -1275,7 +1275,7 @@ LIBS CPPFLAGS CPP LT_SYS_LIBRARY_PATH' -ac_subdirs_all='ares' + # Initialize some variables set by options. ac_init_help= @@ -1919,9 +1919,6 @@ Optional Features: --disable-curldebug Disable curl debug memory tracking --enable-symbol-hiding Enable hiding of library internal symbols --disable-symbol-hiding Disable hiding of library internal symbols - --enable-hidden-symbols To be deprecated, use --enable-symbol-hiding - --disable-hidden-symbols - To be deprecated, use --disable-symbol-hiding --enable-ares[=PATH] Enable c-ares for DNS lookups --disable-ares Disable c-ares for DNS lookups --disable-rt disable dependency on -lrt @@ -2034,6 +2031,8 @@ Optional Features: Disable curl_easy_options --enable-alt-svc Enable alt-svc support --disable-alt-svc Disable alt-svc support + --enable-headers-api Enable headers-api support + --disable-headers-api Disable headers-api support --enable-hsts Enable HSTS support --disable-hsts Disable HSTS support @@ -2055,12 +2054,11 @@ Optional Packages: installation root --with-wolfssl=PATH where to look for WolfSSL, PATH points to the installation root (default: system lib default) - --with-mesalink=PATH where to look for MesaLink, PATH points to the - installation root --with-bearssl=PATH where to look for BearSSL, PATH points to the installation root --with-rustls=PATH where to look for rustls, PATH points to the installation root + --with-nss-deprecated confirm you realize NSS is going away --with-nss=PATH where to look for NSS, PATH points to the installation root @@ -2142,6 +2140,8 @@ Optional Packages: --without-nghttp3 Disable nghttp3 usage --with-quiche=PATH Enable quiche usage --without-quiche Disable quiche usage + --with-msh3=PATH Enable msh3 usage + --without-msh3 Disable msh3 usage --with-zsh-functions-dir=PATH Install zsh completions to PATH --without-zsh-functions-dir @@ -2237,7 +2237,7 @@ Copyright (C) 2021 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -Copyright (c) 1998 - 2021 Daniel Stenberg, +Copyright (c) 1998 - 2022 Daniel Stenberg, This configure script may be copied, distributed and modified under the terms of the curl license; see COPYING for more details _ACEOF @@ -2325,6 +2325,39 @@ fi } # ac_fn_c_try_cpp +# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES +# ------------------------------------------------------- +# Tests whether HEADER exists and can be compiled using the include files in +# INCLUDES, setting the cache variable VAR accordingly. +ac_fn_c_check_header_compile () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +printf %s "checking for $2... " >&6; } +if eval test \${$3+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +#include <$2> +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + eval "$3=yes" +else $as_nop + eval "$3=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +eval ac_res=\$$3 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_header_compile + # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -2372,39 +2405,6 @@ fi } # ac_fn_c_try_link -# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists and can be compiled using the include files in -# INCLUDES, setting the cache variable VAR accordingly. -ac_fn_c_check_header_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -printf %s "checking for $2... " >&6; } -if eval test \${$3+y} -then : - printf %s "(cached) " >&6 -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - eval "$3=yes" -else $as_nop - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi -eval ac_res=\$$3 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -printf "%s\n" "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_header_compile - # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly @@ -2501,8 +2501,8 @@ fi } # ac_fn_c_try_run -# ac_fn_c_check_type LINENO TYPE VAR INCLUDES -# ------------------------------------------- +# ac_fn_c_check_type LINENO SIZEOF_LONG_LONG VAR INCLUDES +# ------------------------------------------------------- # Tests whether TYPE exists after having included INCLUDES, setting cache # variable VAR accordingly. ac_fn_c_check_type () @@ -3682,12 +3682,6 @@ then : enableval=$enable_symbol_hiding; OPT_SYMBOL_HIDING=$enableval fi - # Check whether --enable-hidden-symbols was given. -if test ${enable_hidden_symbols+y} -then : - enableval=$enable_hidden_symbols; OPT_SYMBOL_HIDING=$enableval -fi - case "$OPT_SYMBOL_HIDING" in no) want_symbol_hiding="no" @@ -5592,6 +5586,87 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_header= ac_cache= +for ac_item in $ac_header_c_list +do + if test $ac_cache; then + ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" + if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then + printf "%s\n" "#define $ac_item 1" >> confdefs.h + fi + ac_header= ac_cache= + elif test $ac_header; then + ac_cache=$ac_item + else + ac_header=$ac_item + fi +done + + + + + + + + +if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes +then : + +printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h + +fi + + for ac_header in stdatomic.h +do : + ac_fn_c_check_header_compile "$LINENO" "stdatomic.h" "ac_cv_header_stdatomic_h" "$ac_includes_default" +if test "x$ac_cv_header_stdatomic_h" = xyes +then : + printf "%s\n" "#define HAVE_STDATOMIC_H 1" >>confdefs.h + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if _Atomic is available" >&5 +printf %s "checking if _Atomic is available... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + $curl_includes_unistd + +int main (void) +{ + + _Atomic int i = 0; + i = 4; // Force an atomic-write operation. + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +printf "%s\n" "#define HAVE_ATOMIC 1" >>confdefs.h + + tst_atomic="yes" + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + tst_atomic="no" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext + +fi + +done + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5 printf %s "checking for a sed that does not truncate output... " >&6; } if test ${ac_cv_path_SED+y} @@ -5844,7 +5919,7 @@ fi fi CPPFLAGS="$CPPFLAGS -DNDEBUG" - CFLAGS="$CLAGS -O0 -g -fprofile-arcs -ftest-coverage" + CFLAGS="$CFLAGS -O0 -g -fprofile-arcs -ftest-coverage" LIBS="$LIBS -lgcov" fi @@ -6540,7 +6615,7 @@ PKGADD_VENDOR="curl.se" - curl_ssl_msg="no (--with-{openssl,gnutls,nss,mbedtls,wolfssl,schannel,secure-transport,mesalink,amissl,bearssl,rustls} )" + curl_ssl_msg="no (--with-{openssl,gnutls,nss,mbedtls,wolfssl,schannel,secure-transport,amissl,bearssl,rustls} )" curl_ssh_msg="no (--with-{libssh,libssh2})" curl_zlib_msg="no (--with-zlib)" curl_brotli_msg="no (--with-brotli)" @@ -6562,11 +6637,12 @@ curl_verbose_msg="enabled (--disable-verbose)" curl_rtmp_msg="no (--with-librtmp)" curl_psl_msg="no (--with-libpsl)" curl_altsvc_msg="enabled (--disable-alt-svc)" +curl_headers_msg="enabled (--disable-headers-api)" curl_hsts_msg="enabled (--disable-hsts)" ssl_backends= curl_h1_msg="enabled (internal)" curl_h2_msg="no (--with-nghttp2, --with-hyper)" - curl_h3_msg="no (--with-ngtcp2, --with-quiche)" + curl_h3_msg="no (--with-ngtcp2, --with-quiche --with-msh3)" enable_altsvc="yes" hsts="yes" @@ -6589,10 +6665,9 @@ OPT_SECURETRANSPORT=no # Check whether --with-secure-transport was given. if test ${with_secure_transport+y} then : - withval=$with_secure_transport; OPT_SECURETRANSPORT=$withval - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE -else $as_nop - }Secure-Transport" + withval=$with_secure_transport; + OPT_SECURETRANSPORT=$withval + TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }Secure-Transport" fi @@ -6602,10 +6677,10 @@ OPT_AMISSL=no # Check whether --with-amissl was given. if test ${with_amissl+y} then : - withval=$with_amissl; OPT_AMISSL=$withval - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE -else $as_nop - }AmiSSL" + withval=$with_amissl; + OPT_AMISSL=$withval + TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }AmiSSL" + fi @@ -6615,11 +6690,15 @@ ca="no" # Check whether --with-ssl was given. if test ${with_ssl+y} then : - withval=$with_ssl; OPT_SSL=$withval + withval=$with_ssl; + OPT_SSL=$withval OPT_OPENSSL=$withval - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE -else $as_nop - }OpenSSL" + if test X"$withval" != Xno; then + TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }OpenSSL" + else + SSL_DISABLED="D" + fi + fi @@ -6627,10 +6706,12 @@ fi # Check whether --with-openssl was given. if test ${with_openssl+y} then : - withval=$with_openssl; OPT_OPENSSL=$withval - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE -else $as_nop - }OpenSSL" + withval=$with_openssl; + OPT_OPENSSL=$withval + if test X"$withval" != Xno; then + TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }OpenSSL" + fi + fi @@ -6639,10 +6720,12 @@ OPT_GNUTLS=no # Check whether --with-gnutls was given. if test ${with_gnutls+y} then : - withval=$with_gnutls; OPT_GNUTLS=$withval - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE -else $as_nop - }GnuTLS" + withval=$with_gnutls; + OPT_GNUTLS=$withval + if test X"$withval" != Xno; then + TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }GnuTLS" + fi + fi @@ -6651,10 +6734,12 @@ OPT_MBEDTLS=no # Check whether --with-mbedtls was given. if test ${with_mbedtls+y} then : - withval=$with_mbedtls; OPT_MBEDTLS=$withval - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE -else $as_nop - }mbedTLS" + withval=$with_mbedtls; + OPT_MBEDTLS=$withval + if test X"$withval" != Xno; then + TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }mbedTLS" + fi + fi @@ -6663,22 +6748,12 @@ OPT_WOLFSSL=no # Check whether --with-wolfssl was given. if test ${with_wolfssl+y} then : - withval=$with_wolfssl; OPT_WOLFSSL=$withval - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE -else $as_nop - }wolfSSL" -fi - - -OPT_MESALINK=no + withval=$with_wolfssl; + OPT_WOLFSSL=$withval + if test X"$withval" != Xno; then + TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }wolfSSL" + fi -# Check whether --with-mesalink was given. -if test ${with_mesalink+y} -then : - withval=$with_mesalink; OPT_MESALINK=$withval - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE -else $as_nop - }MesaLink" fi @@ -6687,10 +6762,12 @@ OPT_BEARSSL=no # Check whether --with-bearssl was given. if test ${with_bearssl+y} then : - withval=$with_bearssl; OPT_BEARSSL=$withval - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE -else $as_nop - }BearSSL" + withval=$with_bearssl; + OPT_BEARSSL=$withval + if test X"$withval" != Xno; then + TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }BearSSL" + fi + fi @@ -6699,10 +6776,25 @@ OPT_RUSTLS=no # Check whether --with-rustls was given. if test ${with_rustls+y} then : - withval=$with_rustls; OPT_RUSTLS=$withval - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE -else $as_nop - }rustls" + withval=$with_rustls; + OPT_RUSTLS=$withval + if test X"$withval" != Xno; then + TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }rustls" + experimental="$experimental rustls" + fi + +fi + + +OPT_NSS_AWARE=no + +# Check whether --with-nss-deprecated was given. +if test ${with_nss_deprecated+y} +then : + withval=$with_nss_deprecated; if test X"$withval" != Xno; then + OPT_NSS_AWARE=$withval + fi + fi @@ -6712,9 +6804,15 @@ OPT_NSS=no if test ${with_nss+y} then : withval=$with_nss; OPT_NSS=$withval - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE -else $as_nop - }NSS" + if test X"$withval" != Xno; then + + if test X"$OPT_NSS_AWARE" = "Xno" ; then + as_fn_error $? "NSS use must be confirmed using --with-nss-deprecated. NSS support will be dropped from curl in August 2022. See docs/DEPRECATE.md" "$LINENO" 5 + fi + + TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }NSS" + fi + fi @@ -6728,7 +6826,6 @@ Select from these: --with-bearssl --with-gnutls --with-mbedtls - --with-mesalink --with-nss --with-openssl (also works for BoringSSL and libressl) --with-rustls @@ -6832,7 +6929,6 @@ AR_FLAGS=cr - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 printf %s "checking for grep that handles long lines and -e... " >&6; } if test ${ac_cv_path_GREP+y} @@ -7973,8 +8069,8 @@ esac -macro_version='2.4.6' -macro_revision='2.4.6' +macro_version='2.4.7' +macro_revision='2.4.7' @@ -8385,13 +8481,13 @@ else mingw*) lt_bad_file=conftest.nm/nofile ;; *) lt_bad_file=/dev/null ;; esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" break 2 ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" break 2 @@ -8529,7 +8625,7 @@ esac fi fi - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in *COFF*) DUMPBIN="$DUMPBIN -symbols -headers" ;; @@ -8633,7 +8729,7 @@ else $as_nop lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -8676,7 +8772,7 @@ else $as_nop sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` + lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[ ]//'` else lt_cv_sys_max_cmd_len=32768 fi @@ -8881,6 +8977,114 @@ esac +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}file", so it can be a program name with args. +set dummy ${ac_tool_prefix}file; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_FILECMD+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$FILECMD"; then + ac_cv_prog_FILECMD="$FILECMD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_FILECMD="${ac_tool_prefix}file" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +FILECMD=$ac_cv_prog_FILECMD +if test -n "$FILECMD"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5 +printf "%s\n" "$FILECMD" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_FILECMD"; then + ac_ct_FILECMD=$FILECMD + # Extract the first word of "file", so it can be a program name with args. +set dummy file; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_FILECMD+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_FILECMD"; then + ac_cv_prog_ac_ct_FILECMD="$ac_ct_FILECMD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_FILECMD="file" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_FILECMD=$ac_cv_prog_ac_ct_FILECMD +if test -n "$ac_ct_FILECMD"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FILECMD" >&5 +printf "%s\n" "$ac_ct_FILECMD" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_FILECMD" = x; then + FILECMD=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + FILECMD=$ac_ct_FILECMD + fi +else + FILECMD="$ac_cv_prog_FILECMD" +fi + + + + + + + if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 @@ -9021,7 +9225,7 @@ beos*) bsdi[45]*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_cmd='$FILECMD -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -9055,14 +9259,14 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; esac @@ -9076,7 +9280,7 @@ haiku*) ;; hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' @@ -9123,7 +9327,7 @@ netbsd* | netbsdelf*-gnu) newos6*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; @@ -9493,13 +9697,29 @@ esac fi : ${AR=ar} -: ${AR_FLAGS=cr} +# Use ARFLAGS variable as AR's operation code to sync the variable naming with +# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have +# higher priority because thats what people were doing historically (setting +# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS +# variable obsoleted/removed. + +test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} +lt_ar_flags=$AR_FLAGS + + + + + + +# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override +# by AR_FLAGS because that was never working and AR_FLAGS is about to die. + @@ -9915,7 +10135,7 @@ esac if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'" # Adjust the below global symbol transforms to fixup imported variables. lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" @@ -9933,20 +10153,20 @@ fi # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ $lt_cdecl_hook\ " -e 's/^T .* \(.*\)$/extern int \1();/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ $lt_c_name_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" # Transform an extracted symbol line into symbol name with lib prefix and # symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ $lt_c_name_lib_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ @@ -9970,7 +10190,7 @@ for ac_symprfx in "" "_"; do if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Fake it for dumpbin and say T for any non-static function, # D for any global variable and I for any imported variable. - # Also find C++ and __fastcall symbols from MSVC++, + # Also find C++ and __fastcall symbols from MSVC++ or ICC, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ @@ -9988,9 +10208,9 @@ for ac_symprfx in "" "_"; do " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx" else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -10190,7 +10410,7 @@ case $with_sysroot in #( fi ;; #( /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` ;; #( no|'') ;; #( @@ -10315,7 +10535,7 @@ ia64-*-hpux*) ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE=32 ;; @@ -10336,7 +10556,7 @@ ia64-*-hpux*) printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then if test yes = "$lt_cv_prog_gnu_ld"; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" ;; @@ -10348,7 +10568,7 @@ ia64-*-hpux*) ;; esac else - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -10374,7 +10594,7 @@ mips64*-*linux*) printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then emul=elf - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) emul="${emul}32" ;; @@ -10382,7 +10602,7 @@ mips64*-*linux*) emul="${emul}64" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *MSB*) emul="${emul}btsmip" ;; @@ -10390,7 +10610,7 @@ mips64*-*linux*) emul="${emul}ltsmip" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *N32*) emul="${emul}n32" ;; @@ -10414,14 +10634,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *32-bit*) case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *x86-64*) LD="${LD-ld} -m elf32_x86_64" ;; @@ -10528,7 +10748,7 @@ printf "%s\n" "$lt_cv_cc_needs_belf" >&6; } ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in yes*) @@ -11310,8 +11530,8 @@ int forced_loaded() { return 2;} _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cr libconftest.a conftest.o" >&5 - $AR cr libconftest.a conftest.o 2>&5 + echo "$AR $AR_FLAGS libconftest.a conftest.o" >&5 + $AR $AR_FLAGS libconftest.a conftest.o 2>&5 echo "$RANLIB libconftest.a" >&5 $RANLIB libconftest.a 2>&5 cat > conftest.c << _LT_EOF @@ -11338,17 +11558,12 @@ printf "%s\n" "$lt_cv_ld_force_load" >&6; } _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[912]*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - 10.[012][,.]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*|11.*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + darwin*) + case $MACOSX_DEPLOYMENT_TARGET,$host in + 10.[012],*|,*powerpc*-darwin[5-8]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + *) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -11403,35 +11618,6 @@ func_munge_path_list () esac } -ac_header= ac_cache= -for ac_item in $ac_header_c_list -do - if test $ac_cache; then - ac_fn_c_check_header_compile "$LINENO" $ac_header ac_cv_header_$ac_cache "$ac_includes_default" - if eval test \"x\$ac_cv_header_$ac_cache\" = xyes; then - printf "%s\n" "#define $ac_item 1" >> confdefs.h - fi - ac_header= ac_cache= - elif test $ac_header; then - ac_cache=$ac_item - else - ac_header=$ac_item - fi -done - - - - - - - - -if test $ac_cv_header_stdlib_h = yes && test $ac_cv_header_string_h = yes -then : - -printf "%s\n" "#define STDC_HEADERS 1" >>confdefs.h - -fi ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default " if test "x$ac_cv_header_dlfcn_h" = xyes @@ -11528,7 +11714,7 @@ if test "x$xc_lt_want_with_pic" = 'xdefault'; then case $host_cpu in # ( x86_64 | amd64 | ia64) case $host_os in # ( - linux* | freebsd*) + linux* | freebsd* | midnightbsd*) xc_lt_want_with_pic='yes' ;; esac @@ -12171,8 +12357,8 @@ esac ofile=libtool can_build_shared=yes -# All known linkers require a '.a' archive for static linking (except MSVC, -# which needs '.lib'). +# All known linkers require a '.a' archive for static linking (except MSVC and +# ICC, which need '.lib'). libext=a with_gnu_ld=$lt_cv_prog_gnu_ld @@ -12690,7 +12876,7 @@ lt_prog_compiler_static= lt_prog_compiler_static='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' @@ -13113,15 +13299,15 @@ printf %s "checking whether the $compiler linker ($LD) supports shared libraries case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time + # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. if test yes != "$GCC"; then with_gnu_ld=no fi ;; interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) + # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) with_gnu_ld=yes ;; openbsd* | bitrig*) @@ -13176,7 +13362,7 @@ printf %s "checking whether the $compiler linker ($LD) supports shared libraries whole_archive_flag_spec= fi supports_anon_versioning=no - case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -13288,6 +13474,7 @@ _LT_EOF emximp -o $lib $output_objdir/$libname.def' old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' enable_shared_with_static_runtimes=yes + file_list_spec='@' ;; interix[3-9]*) @@ -13302,7 +13489,7 @@ _LT_EOF # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) @@ -13345,7 +13532,7 @@ _LT_EOF compiler_needs_object=yes ;; esac - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C 5.9 whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes @@ -13357,13 +13544,14 @@ _LT_EOF if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in tcc*) + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' export_dynamic_flag_spec='-rdynamic' ;; xlf* | bgf* | bgxlf* | mpixlf*) @@ -13373,7 +13561,7 @@ _LT_EOF archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi @@ -13505,7 +13693,7 @@ _LT_EOF if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no @@ -13774,12 +13962,12 @@ fi cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. case $cc_basename in - cl*) - # Native MSVC + cl* | icl*) + # Native MSVC or ICC hardcode_libdir_flag_spec=' ' allow_undefined_flag=unsupported always_export_symbols=yes @@ -13820,7 +14008,7 @@ fi fi' ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper hardcode_libdir_flag_spec=' ' allow_undefined_flag=unsupported # Tell ltmain to make .lib files, not .a files. @@ -13861,8 +14049,8 @@ fi output_verbose_link_cmd=func_echo_all archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + archive_expsym_cmds="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" else ld_shlibs=no @@ -13896,7 +14084,7 @@ fi ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -14077,6 +14265,7 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } # Fabrice Bellard et al's Tiny C Compiler ld_shlibs=yes archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' ;; esac ;; @@ -14148,6 +14337,7 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } emximp -o $lib $output_objdir/$libname.def' old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' enable_shared_with_static_runtimes=yes + file_list_spec='@' ;; osf3*) @@ -14840,7 +15030,7 @@ cygwin* | mingw* | pw32* | cegcc*) case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; @@ -14850,14 +15040,14 @@ cygwin* | mingw* | pw32* | cegcc*) ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl*) - # Native MSVC + *,cl* | *,icl*) + # Native MSVC or ICC libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -14876,7 +15066,7 @@ cygwin* | mingw* | pw32* | cegcc*) done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -14913,7 +15103,7 @@ cygwin* | mingw* | pw32* | cegcc*) ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; @@ -14946,7 +15136,7 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -16110,30 +16300,41 @@ striplib= old_striplib= { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 printf %s "checking whether stripping libraries is possible... " >&6; } -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } +if test -z "$STRIP"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP"; then + if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + else + case $host_os in + darwin*) + # FIXME - insert some real tests, host_os isn't really good enough striplib="$STRIP -x" old_striplib="$STRIP -S" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + ;; + freebsd*) + if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - fi - ;; - *) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + fi + ;; + *) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - ;; - esac + ;; + esac + fi fi @@ -17611,120 +17812,6 @@ printf "%s\n" "yes" >&6; } printf "%s\n" "no" >&6; } fi - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if compiler is Watcom C" >&5 -printf %s "checking if compiler is Watcom C... " >&6; } - - OLDCPPFLAGS=$CPPFLAGS - # CPPPFLAG comes from CURL_CPP_P - CPPFLAGS="$CPPFLAGS $CPPPFLAG" - if test -z "$SED"; then - as_fn_error $? "SED not set. Cannot continue without SED being set." "$LINENO" 5 - fi - if test -z "$GREP"; then - as_fn_error $? "GREP not set. Cannot continue without GREP being set." "$LINENO" 5 - fi - - tmp_exp="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#ifdef __WATCOMC__ -CURL_DEF_TOKEN __WATCOMC__ -#endif - - -_ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : - - tmp_exp=`eval "$ac_cpp conftest.$ac_ext" 2>/dev/null | \ - "$GREP" CURL_DEF_TOKEN 2>/dev/null | \ - "$SED" 's/.*CURL_DEF_TOKEN[ ][ ]*//' 2>/dev/null | \ - "$SED" 's/["][ ]*["]//g' 2>/dev/null` - if test -z "$tmp_exp" || test "$tmp_exp" = "__WATCOMC__"; then - tmp_exp="" - fi - -fi -rm -f conftest.err conftest.i conftest.$ac_ext - if test -z "$tmp_exp"; then - curl_cv_have_def___WATCOMC__=no - - else - curl_cv_have_def___WATCOMC__=yes - curl_cv_def___WATCOMC__=$tmp_exp - - fi - CPPFLAGS=$OLDCPPFLAGS - - if test "$curl_cv_have_def___WATCOMC__" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - - OLDCPPFLAGS=$CPPFLAGS - # CPPPFLAG comes from CURL_CPP_P - CPPFLAGS="$CPPFLAGS $CPPPFLAG" - if test -z "$SED"; then - as_fn_error $? "SED not set. Cannot continue without SED being set." "$LINENO" 5 - fi - if test -z "$GREP"; then - as_fn_error $? "GREP not set. Cannot continue without GREP being set." "$LINENO" 5 - fi - - tmp_exp="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#ifdef __UNIX__ -CURL_DEF_TOKEN __UNIX__ -#endif - - -_ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : - - tmp_exp=`eval "$ac_cpp conftest.$ac_ext" 2>/dev/null | \ - "$GREP" CURL_DEF_TOKEN 2>/dev/null | \ - "$SED" 's/.*CURL_DEF_TOKEN[ ][ ]*//' 2>/dev/null | \ - "$SED" 's/["][ ]*["]//g' 2>/dev/null` - if test -z "$tmp_exp" || test "$tmp_exp" = "__UNIX__"; then - tmp_exp="" - fi - -fi -rm -f conftest.err conftest.i conftest.$ac_ext - if test -z "$tmp_exp"; then - curl_cv_have_def___UNIX__=no - - else - curl_cv_have_def___UNIX__=yes - curl_cv_def___UNIX__=$tmp_exp - - fi - CPPFLAGS=$OLDCPPFLAGS - - if test "$curl_cv_have_def___UNIX__" = "yes"; then - compiler_id="WATCOM_UNIX_C" - flags_dbg_yes="-g2" - flags_opt_all="-O0 -O1 -O2 -O3" - flags_opt_yes="-O2" - flags_opt_off="-O0" - else - compiler_id="WATCOM_WINDOWS_C" - flags_dbg_yes="" - flags_opt_all="" - flags_opt_yes="" - flags_opt_off="" - fi - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - fi - # if test "$compiler_id" = "unknown"; then cat <<_EOF 1>&2 @@ -17771,6 +17858,7 @@ squeeze() { CLANG) # tmp_CFLAGS="$tmp_CFLAGS -Qunused-arguments" + tmp_CFLAGS="$tmp_CFLAGS -Wno-pointer-bool-conversion" ;; # DEC_C) @@ -17804,8 +17892,8 @@ squeeze() { INTEL_UNIX_C) # tmp_CFLAGS="$tmp_CFLAGS -std=gnu89" - tmp_CPPFLAGS="$tmp_CPPFLAGS -we140,147,165,266" - tmp_CPPFLAGS="$tmp_CPPFLAGS -wd279,981,1469" + tmp_CPPFLAGS="$tmp_CPPFLAGS -diag-error 140,147,165,266" + tmp_CPPFLAGS="$tmp_CPPFLAGS -diag-disable 279,981,1025,1469,2259" ;; # INTEL_WINDOWS_C) @@ -17838,16 +17926,6 @@ squeeze() { tmp_CFLAGS="$tmp_CFLAGS" ;; # - WATCOM_UNIX_C) - # - tmp_CFLAGS="$tmp_CFLAGS" - ;; - # - WATCOM_WINDOWS_C) - # - tmp_CFLAGS="$tmp_CFLAGS" - ;; - # esac # squeeze tmp_CPPFLAGS @@ -17928,10 +18006,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ if test "x$cross_compiling" != "xyes" && test "$tmp_compiler_works" = "yes"; then - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes + case $host_os in + darwin*) + if test "$cross_compiling" = yes then : { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -17972,7 +18049,55 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - LD_LIBRARY_PATH=$old # restore + ;; + *) + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes +then : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +# ifdef __STDC__ +# include +# endif + +int main (void) +{ + + int i = 0; + exit(i); + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + tmp_compiler_works="yes" + +else $as_nop + tmp_compiler_works="no" + echo " " >&6 + echo "run-fail: test program exited with status $ac_status" >&6 + echo " " >&6 + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + LD_LIBRARY_PATH=$old # restore + ;; + esac fi if test "$tmp_compiler_works" = "yes"; then @@ -18210,10 +18335,55 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ if test "x$cross_compiling" != "xyes" && test "$tmp_compiler_works" = "yes"; then - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes + case $host_os in + darwin*) + if test "$cross_compiling" = yes +then : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +# ifdef __STDC__ +# include +# endif + +int main (void) +{ + + int i = 0; + exit(i); + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + tmp_compiler_works="yes" + +else $as_nop + tmp_compiler_works="no" + echo " " >&6 + echo "run-fail: test program exited with status $ac_status" >&6 + echo " " >&6 + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + ;; + *) + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes then : { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -18254,7 +18424,9 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - LD_LIBRARY_PATH=$old # restore + LD_LIBRARY_PATH=$old # restore + ;; + esac fi if test "$tmp_compiler_works" = "yes"; then @@ -19385,22 +19557,27 @@ printf "%s\n" "$as_me: WARNING: compiler options rejected: $tmp_options" >&2;} fi fi # - fi - # - if test "$compiler_num" -ge "300"; then - tmp_CFLAGS="$tmp_CFLAGS -Wno-system-headers" - else - if test "x$cross_compiling" = "xyes"; then - if test "$compiler_num" -ge "104"; then - tmp_CFLAGS="$tmp_CFLAGS -Wno-unused -Wno-shadow" - fi - if test "$compiler_num" -ge "207"; then - tmp_CFLAGS="$tmp_CFLAGS -Wno-missing-declarations" - tmp_CFLAGS="$tmp_CFLAGS -Wno-missing-prototypes" - fi - fi - fi - if test "$compiler_num" -ge "1000"; then + if test "$compiler_num" -ge "1000"; then + + ac_var_added_warnings="" + for warning in arith-conversion; do + + ac_var_match_word="no" + for word1 in $CFLAGS; do + for word2 in -Wno-$warning -W$warning; do + if test "$word1" = "$word2"; then + ac_var_match_word="yes" + fi + done + done + + if test "$ac_var_match_word" = "no"; then + ac_var_added_warnings="$ac_var_added_warnings -W$warning" + fi + done + tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" + squeeze tmp_CFLAGS + ac_var_added_warnings="" for warning in enum-conversion; do @@ -19421,6 +19598,22 @@ printf "%s\n" "$as_me: WARNING: compiler options rejected: $tmp_options" >&2;} tmp_CFLAGS="$tmp_CFLAGS $ac_var_added_warnings" squeeze tmp_CFLAGS + fi + # + fi + # + if test "$compiler_num" -ge "300"; then + tmp_CFLAGS="$tmp_CFLAGS -Wno-system-headers" + else + if test "x$cross_compiling" = "xyes"; then + if test "$compiler_num" -ge "104"; then + tmp_CFLAGS="$tmp_CFLAGS -Wno-unused -Wno-shadow" + fi + if test "$compiler_num" -ge "207"; then + tmp_CFLAGS="$tmp_CFLAGS -Wno-missing-declarations" + tmp_CFLAGS="$tmp_CFLAGS -Wno-missing-prototypes" + fi + fi fi ;; # @@ -19558,18 +19751,6 @@ printf "%s\n" "$as_me: WARNING: compiler options rejected: $tmp_options" >&2;} fi ;; # - WATCOM_UNIX_C) - # - if test "$want_warnings" = "yes"; then - tmp_CFLAGS="$tmp_CFLAGS -Wall -Wextra" - fi - ;; - # - WATCOM_WINDOWS_C) - # - tmp_CFLAGS="$tmp_CFLAGS" - ;; - # esac # squeeze tmp_CPPFLAGS @@ -19650,10 +19831,55 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ if test "x$cross_compiling" != "xyes" && test "$tmp_compiler_works" = "yes"; then - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes + case $host_os in + darwin*) + if test "$cross_compiling" = yes +then : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +# ifdef __STDC__ +# include +# endif + +int main (void) +{ + + int i = 0; + exit(i); + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + tmp_compiler_works="yes" + +else $as_nop + tmp_compiler_works="no" + echo " " >&6 + echo "run-fail: test program exited with status $ac_status" >&6 + echo " " >&6 + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + ;; + *) + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes then : { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -19694,7 +19920,9 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - LD_LIBRARY_PATH=$old # restore + LD_LIBRARY_PATH=$old # restore + ;; + esac fi if test "$tmp_compiler_works" = "yes"; then @@ -20119,6 +20347,47 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext ;; esac +# Detect original MinGW (not MinGW-w64) +curl_mingw_original=no +case $host in + *-*-mingw32*) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking using original MinGW (not MinGW-w64)" >&5 +printf %s "checking using original MinGW (not MinGW-w64)... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +#include <_mingw.h> + +int main (void) +{ + +#if defined(__MINGW64_VERSION_MAJOR) +#error +#endif + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + + curl_mingw_original=yes + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext + ;; +esac + @@ -20235,62 +20504,6 @@ fi case X-"$curl_cv_native_windows" in X-yes) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for winsock.h" >&5 -printf %s "checking for winsock.h... " >&6; } -if test ${curl_cv_header_winsock_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#undef inline -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include -#include - -int main (void) -{ - -#if defined(__CYGWIN__) || defined(__CEGCC__) - HAVE_WINSOCK_H shall not be defined. -#else - int dummy=WSACleanup(); -#endif - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - - curl_cv_header_winsock_h="yes" - -else $as_nop - - curl_cv_header_winsock_h="no" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $curl_cv_header_winsock_h" >&5 -printf "%s\n" "$curl_cv_header_winsock_h" >&6; } - case "$curl_cv_header_winsock_h" in - yes) - -printf "%s\n" "#define HAVE_WINSOCK_H 1" >>confdefs.h - - ;; - esac - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for winsock2.h" >&5 printf %s "checking for winsock2.h... " >&6; } if test ${curl_cv_header_winsock2_h+y} @@ -20514,75 +20727,12 @@ printf "%s\n" "#define HAVE_WINLDAP_H 1" >>confdefs.h ;; esac - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for winber.h" >&5 -printf %s "checking for winber.h... " >&6; } -if test ${curl_cv_header_winber_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#undef inline -#ifdef HAVE_WINDOWS_H -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include -#endif -#include -#include - -int main (void) -{ - -#if defined(__CYGWIN__) || defined(__CEGCC__) - HAVE_WINBER_H shall not be defined. -#else - BERVAL *bvp = NULL; - BerElement *bep = ber_init(bvp); - ber_free(bep, 1); -#endif - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - - curl_cv_header_winber_h="yes" - -else $as_nop - - curl_cv_header_winber_h="no" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $curl_cv_header_winber_h" >&5 -printf "%s\n" "$curl_cv_header_winber_h" >&6; } - case "$curl_cv_header_winber_h" in - yes) - -printf "%s\n" "#define HAVE_WINBER_H 1" >>confdefs.h - - ;; - esac - ;; *) - curl_cv_header_winsock_h="no" curl_cv_header_winsock2_h="no" curl_cv_header_ws2tcpip_h="no" curl_cv_header_wincrypt_h="no" curl_cv_header_winldap_h="no" - curl_cv_header_winber_h="no" ;; esac @@ -21237,7 +21387,7 @@ printf "%s\n" "found" >&6; } LIB_HYPER="-lhyper -ldl -lpthread -lm" if test X"$want_hyper" != Xdefault; then CPP_HYPER=-I"$want_hyper_path/capi/include" - LD_HYPER="-L$want_hyper_path/target/debug" + LD_HYPER="-L$want_hyper_path/target/release -L$want_hyper_path/target/debug" fi fi if test -n "$LIB_HYPER"; then @@ -21253,7 +21403,7 @@ printf "%s\n" "$as_me: -L is $LD_HYPER" >&6;} LIBS="$LIB_HYPER $LIBS" if test "x$cross_compiling" != "xyes"; then - DIR_HYPER=`echo $LD_HYPER | $SED -e 's/^-L//'` + DIR_HYPER=`echo $LD_HYPER | $SED -e 's/^-L//' -e 's/ -L/:/g'` fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for hyper_io_new in -lhyper" >&5 @@ -21320,7 +21470,12 @@ fi done else $as_nop - as_fn_error $? "--with-hyper but hyper was not found. See docs/HYPER.md." "$LINENO" 5 + for d in `echo $DIR_HYPER | $SED -e 's/:/ /'`; do + if test -f "$d/libhyper.a"; then + as_fn_error $? "hyper was found in $d but was probably built with wrong flags. See docs/HYPER.md." "$LINENO" 5 + fi + done + as_fn_error $? "--with-hyper but hyper was not found. See docs/HYPER.md." "$LINENO" 5 fi @@ -21931,16 +22086,6 @@ fi if test "$HAVE_GETHOSTBYNAME" != "1" then if test "$curl_cv_header_windows_h" = "yes"; then - if test "$curl_cv_header_winsock_h" = "yes"; then - case $host in - *-*-mingw32ce*) - winsock_LIB="-lwinsock" - ;; - *) - winsock_LIB="-lwsock32" - ;; - esac - fi if test "$curl_cv_header_winsock2_h" = "yes"; then winsock_LIB="-lws2_32" fi @@ -21960,10 +22105,6 @@ printf %s "checking for gethostbyname in $winsock_LIB... " >&6; } #include #ifdef HAVE_WINSOCK2_H #include -#else -#ifdef HAVE_WINSOCK_H -#include -#endif #endif #endif @@ -22082,8 +22223,13 @@ printf %s "checking for gethostbyname for AmigaOS bsdsocket.library... " >&6; } /* end confdefs.h. */ + #define __USE_INLINE__ #include + #ifdef __amigaos4__ + struct SocketIFace *ISocket = NULL; + #else struct Library *SocketBase = NULL; + #endif int main (void) { @@ -22164,53 +22310,6 @@ fi fi -if test "$HAVE_GETHOSTBYNAME" != "1" -then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnet" >&5 -printf %s "checking for gethostbyname in -lnet... " >&6; } -if test ${ac_cv_lib_net_gethostbyname+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS -LIBS="-lnet $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#ifdef __cplusplus -extern "C" -#endif -char gethostbyname (); -int main (void) -{ -return gethostbyname (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_lib_net_gethostbyname=yes -else $as_nop - ac_cv_lib_net_gethostbyname=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_net_gethostbyname" >&5 -printf "%s\n" "$ac_cv_lib_net_gethostbyname" >&6; } -if test "x$ac_cv_lib_net_gethostbyname" = xyes -then : - HAVE_GETHOSTBYNAME="1" - LIBS="-lnet $LIBS" - -fi - -fi - - if test "$HAVE_GETHOSTBYNAME" != "1"; then as_fn_error $? "couldn't find libraries for gethostbyname()" "$LINENO" 5 fi @@ -22225,10 +22324,6 @@ curl_includes_winsock2="\ # include # ifdef HAVE_WINSOCK2_H # include -# else -# ifdef HAVE_WINSOCK_H -# include -# endif # endif #endif /* includes end */" @@ -22288,62 +22383,6 @@ printf "%s\n" "#define HAVE_WINDOWS_H 1" >>confdefs.h esac - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for winsock.h" >&5 -printf %s "checking for winsock.h... " >&6; } -if test ${curl_cv_header_winsock_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#undef inline -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include -#include - -int main (void) -{ - -#if defined(__CYGWIN__) || defined(__CEGCC__) - HAVE_WINSOCK_H shall not be defined. -#else - int dummy=WSACleanup(); -#endif - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - - curl_cv_header_winsock_h="yes" - -else $as_nop - - curl_cv_header_winsock_h="no" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $curl_cv_header_winsock_h" >&5 -printf "%s\n" "$curl_cv_header_winsock_h" >&6; } - case "$curl_cv_header_winsock_h" in - yes) - -printf "%s\n" "#define HAVE_WINSOCK_H 1" >>confdefs.h - - ;; - esac - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for winsock2.h" >&5 printf %s "checking for winsock2.h... " >&6; } if test ${curl_cv_header_winsock2_h+y} @@ -22403,12 +22442,22 @@ printf "%s\n" "#define HAVE_WINSOCK2_H 1" >>confdefs.h curl_includes_bsdsocket="\ /* includes start */ -#ifdef HAVE_PROTO_BSDSOCKET_H +#if defined(HAVE_PROTO_BSDSOCKET_H) +# define __NO_NET_API +# define __USE_INLINE__ # include - struct Library *SocketBase = NULL; +# ifdef HAVE_SYS_IOCTL_H +# include +# endif +# ifdef __amigaos4__ +struct SocketIFace *ISocket = NULL; +# else +struct Library *SocketBase = NULL; +# endif +# define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0) #endif /* includes end */" - ac_fn_c_check_header_compile "$LINENO" "proto/bsdsocket.h" "ac_cv_header_proto_bsdsocket_h" " $curl_includes_bsdsocket + ac_fn_c_check_header_compile "$LINENO" "proto/bsdsocket.h" "ac_cv_header_proto_bsdsocket_h" "$curl_includes_bsdsocket " if test "x$ac_cv_header_proto_bsdsocket_h" = xyes then : @@ -22619,10 +22668,9 @@ printf "%s\n" "$curl_cv_gclk_LIBS" >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if monotonic clock_gettime works" >&5 printf %s "checking if monotonic clock_gettime works... " >&6; } - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes + case $host_os in + darwin*) + if test "$cross_compiling" = yes then : { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -22676,7 +22724,68 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - LD_LIBRARY_PATH=$old # restore + ;; + *) + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes +then : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +#ifdef HAVE_STDLIB_H +#include +#endif +#ifdef HAVE_SYS_TYPES_H +#include +#endif +#ifdef HAVE_SYS_TIME_H +#include +#endif +#include + +int main (void) +{ + + struct timespec ts; + if (0 == clock_gettime(CLOCK_MONOTONIC, &ts)) + exit(0); + else + exit(1); + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: HAVE_CLOCK_GETTIME_MONOTONIC will not be defined" >&5 +printf "%s\n" "$as_me: WARNING: HAVE_CLOCK_GETTIME_MONOTONIC will not be defined" >&2;} + curl_func_clock_gettime="no" + LIBS="$curl_cv_save_LIBS" + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + LD_LIBRARY_PATH=$old # restore + ;; + esac fi # @@ -23757,77 +23866,6 @@ printf "%s\n" "#define HAVE_LDAP_H 1" >>confdefs.h esac - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ldapssl.h" >&5 -printf %s "checking for ldapssl.h... " >&6; } -if test ${curl_cv_header_ldapssl_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#undef inline -#ifdef HAVE_WINDOWS_H -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif -#include -#else -#ifdef HAVE_SYS_TYPES_H -#include -#endif -#endif -#ifndef NULL -#define NULL (void *)0 -#endif -#ifndef LDAP_DEPRECATED -#define LDAP_DEPRECATED 1 -#endif -#ifdef NEED_LBER_H -#include -#endif -#ifdef HAVE_LDAP_H -#include -#endif -#include - -int main (void) -{ - - char *cert_label = NULL; - LDAP *ldp = ldap_ssl_init("dummy", LDAPS_PORT, cert_label); - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - - curl_cv_header_ldapssl_h="yes" - -else $as_nop - - curl_cv_header_ldapssl_h="no" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $curl_cv_header_ldapssl_h" >&5 -printf "%s\n" "$curl_cv_header_ldapssl_h" >&6; } - case "$curl_cv_header_ldapssl_h" in - yes) - -printf "%s\n" "#define HAVE_LDAPSSL_H 1" >>confdefs.h - - ;; - esac - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ldap_ssl.h" >&5 printf %s "checking for ldap_ssl.h... " >&6; } if test ${curl_cv_header_ldap_ssl_h+y} @@ -24167,12 +24205,6 @@ if test "x$ac_cv_func_ldap_url_parse" = xyes then : printf "%s\n" "#define HAVE_LDAP_URL_PARSE 1" >>confdefs.h -fi -ac_fn_c_check_func "$LINENO" "ldap_init_fd" "ac_cv_func_ldap_init_fd" -if test "x$ac_cv_func_ldap_init_fd" = xyes -then : - printf "%s\n" "#define HAVE_LDAP_INIT_FD 1" >>confdefs.h - fi @@ -24323,10 +24355,42 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if argv can be written to" >&5 printf %s "checking if argv can be written to... " >&6; } - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes + case $host_os in + darwin*) + if test "$cross_compiling" = yes +then : + curl_cv_writable_argv=cross + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int main(int argc, char **argv) +{ + (void)argc; + argv[0][0] = ' '; + return (argv[0][0] == ' ')?0:1; +} + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + curl_cv_writable_argv=yes + +else $as_nop + curl_cv_writable_argv=no + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + ;; + *) + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes then : curl_cv_writable_argv=cross @@ -24354,7 +24418,9 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - LD_LIBRARY_PATH=$old # restore + LD_LIBRARY_PATH=$old # restore + ;; + esac case $curl_cv_writable_argv in yes) @@ -24424,9 +24490,286 @@ if test x"$want_gss" = xyes; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } + if test $GSSAPI_ROOT != "/usr"; then + + if test -n "$PKG_CONFIG"; then + PKGCONFIG="$PKG_CONFIG" + else + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PKGCONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $PKGCONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKGCONFIG="$PKGCONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$PATH:/usr/bin:/usr/local/bin" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PKGCONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PKGCONFIG=$ac_cv_path_PKGCONFIG +if test -n "$PKGCONFIG"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5 +printf "%s\n" "$PKGCONFIG" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKGCONFIG"; then + ac_pt_PKGCONFIG=$PKGCONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_PKGCONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $ac_pt_PKGCONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKGCONFIG="$ac_pt_PKGCONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$PATH:/usr/bin:/usr/local/bin" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKGCONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKGCONFIG=$ac_cv_path_ac_pt_PKGCONFIG +if test -n "$ac_pt_PKGCONFIG"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKGCONFIG" >&5 +printf "%s\n" "$ac_pt_PKGCONFIG" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_pt_PKGCONFIG" = x; then + PKGCONFIG="no" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKGCONFIG=$ac_pt_PKGCONFIG + fi +else + PKGCONFIG="$ac_cv_path_PKGCONFIG" +fi + + fi + + if test "x$PKGCONFIG" != "xno"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mit-krb5-gssapi options with pkg-config" >&5 +printf %s "checking for mit-krb5-gssapi options with pkg-config... " >&6; } + itexists=` + if test -n "$GSSAPI_ROOT/lib/pkgconfig"; then + PKG_CONFIG_LIBDIR="$GSSAPI_ROOT/lib/pkgconfig" + export PKG_CONFIG_LIBDIR + fi + $PKGCONFIG --exists mit-krb5-gssapi >/dev/null 2>&1 && echo 1` + + if test -z "$itexists"; then + PKGCONFIG="no" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found" >&5 +printf "%s\n" "found" >&6; } + fi + fi + + else + + if test -n "$PKG_CONFIG"; then + PKGCONFIG="$PKG_CONFIG" + else + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PKGCONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $PKGCONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKGCONFIG="$PKGCONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$PATH:/usr/bin:/usr/local/bin" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PKGCONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PKGCONFIG=$ac_cv_path_PKGCONFIG +if test -n "$PKGCONFIG"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5 +printf "%s\n" "$PKGCONFIG" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKGCONFIG"; then + ac_pt_PKGCONFIG=$PKGCONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_PKGCONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $ac_pt_PKGCONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKGCONFIG="$ac_pt_PKGCONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$PATH:/usr/bin:/usr/local/bin" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKGCONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKGCONFIG=$ac_cv_path_ac_pt_PKGCONFIG +if test -n "$ac_pt_PKGCONFIG"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKGCONFIG" >&5 +printf "%s\n" "$ac_pt_PKGCONFIG" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_pt_PKGCONFIG" = x; then + PKGCONFIG="no" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKGCONFIG=$ac_pt_PKGCONFIG + fi +else + PKGCONFIG="$ac_cv_path_PKGCONFIG" +fi + + fi + + if test "x$PKGCONFIG" != "xno"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mit-krb5-gssapi options with pkg-config" >&5 +printf %s "checking for mit-krb5-gssapi options with pkg-config... " >&6; } + itexists=` + if test -n ""; then + PKG_CONFIG_LIBDIR="" + export PKG_CONFIG_LIBDIR + fi + $PKGCONFIG --exists mit-krb5-gssapi >/dev/null 2>&1 && echo 1` + + if test -z "$itexists"; then + PKGCONFIG="no" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found" >&5 +printf "%s\n" "found" >&6; } + fi + fi + + fi if test -z "$GSSAPI_INCS"; then if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi` + elif test "$PKGCONFIG" != "no" ; then + GSSAPI_INCS=`$PKGCONFIG --cflags mit-krb5-gssapi` elif test -f "$KRB5CONFIG"; then GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi` elif test "$GSSAPI_ROOT" != "yes"; then @@ -24568,9 +24911,287 @@ printf "%s\n" "#define HAVE_GSSAPI 1" >>confdefs.h LIBS="-lgssapi_krb5 -lresolv $LIBS" ;; *) + if test $GSSAPI_ROOT != "/usr"; then + + if test -n "$PKG_CONFIG"; then + PKGCONFIG="$PKG_CONFIG" + else + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PKGCONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $PKGCONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKGCONFIG="$PKGCONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$PATH:/usr/bin:/usr/local/bin" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PKGCONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PKGCONFIG=$ac_cv_path_PKGCONFIG +if test -n "$PKGCONFIG"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5 +printf "%s\n" "$PKGCONFIG" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKGCONFIG"; then + ac_pt_PKGCONFIG=$PKGCONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_PKGCONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $ac_pt_PKGCONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKGCONFIG="$ac_pt_PKGCONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$PATH:/usr/bin:/usr/local/bin" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKGCONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKGCONFIG=$ac_cv_path_ac_pt_PKGCONFIG +if test -n "$ac_pt_PKGCONFIG"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKGCONFIG" >&5 +printf "%s\n" "$ac_pt_PKGCONFIG" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_pt_PKGCONFIG" = x; then + PKGCONFIG="no" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKGCONFIG=$ac_pt_PKGCONFIG + fi +else + PKGCONFIG="$ac_cv_path_PKGCONFIG" +fi + + fi + + if test "x$PKGCONFIG" != "xno"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mit-krb5-gssapi options with pkg-config" >&5 +printf %s "checking for mit-krb5-gssapi options with pkg-config... " >&6; } + itexists=` + if test -n "$GSSAPI_ROOT/lib/pkgconfig"; then + PKG_CONFIG_LIBDIR="$GSSAPI_ROOT/lib/pkgconfig" + export PKG_CONFIG_LIBDIR + fi + $PKGCONFIG --exists mit-krb5-gssapi >/dev/null 2>&1 && echo 1` + + if test -z "$itexists"; then + PKGCONFIG="no" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found" >&5 +printf "%s\n" "found" >&6; } + fi + fi + + else + + if test -n "$PKG_CONFIG"; then + PKGCONFIG="$PKG_CONFIG" + else + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PKGCONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $PKGCONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKGCONFIG="$PKGCONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$PATH:/usr/bin:/usr/local/bin" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PKGCONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PKGCONFIG=$ac_cv_path_PKGCONFIG +if test -n "$PKGCONFIG"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5 +printf "%s\n" "$PKGCONFIG" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKGCONFIG"; then + ac_pt_PKGCONFIG=$PKGCONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_PKGCONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $ac_pt_PKGCONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKGCONFIG="$ac_pt_PKGCONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$PATH:/usr/bin:/usr/local/bin" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKGCONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKGCONFIG=$ac_cv_path_ac_pt_PKGCONFIG +if test -n "$ac_pt_PKGCONFIG"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKGCONFIG" >&5 +printf "%s\n" "$ac_pt_PKGCONFIG" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_pt_PKGCONFIG" = x; then + PKGCONFIG="no" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKGCONFIG=$ac_pt_PKGCONFIG + fi +else + PKGCONFIG="$ac_cv_path_PKGCONFIG" +fi + + fi + + if test "x$PKGCONFIG" != "xno"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mit-krb5-gssapi options with pkg-config" >&5 +printf %s "checking for mit-krb5-gssapi options with pkg-config... " >&6; } + itexists=` + if test -n ""; then + PKG_CONFIG_LIBDIR="" + export PKG_CONFIG_LIBDIR + fi + $PKGCONFIG --exists mit-krb5-gssapi >/dev/null 2>&1 && echo 1` + + if test -z "$itexists"; then + PKGCONFIG="no" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found" >&5 +printf "%s\n" "found" >&6; } + fi + fi + + fi if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then gss_libs=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --libs gssapi` LIBS="$gss_libs $LIBS" + elif test "$PKGCONFIG" != "no" ; then + gss_libs=`$PKGCONFIG --libs mit-krb5-gssapi` + LIBS="$gss_libs $LIBS" elif test -f "$KRB5CONFIG"; then gss_libs=`$KRB5CONFIG --libs gssapi` LIBS="$gss_libs $LIBS" @@ -24608,6 +25229,53 @@ else CPPFLAGS="$save_CPPFLAGS" fi +if test x"$want_gss" = xyes; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if we can link against GSS-API library" >&5 +printf %s "checking if we can link against GSS-API library... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +#define gss_init_sec_context innocuous_gss_init_sec_context +#ifdef __STDC__ +# include +#else +# include +#endif +#undef gss_init_sec_context +#ifdef __cplusplus +extern "C" +#endif +char gss_init_sec_context (); +#if defined __stub_gss_init_sec_context || defined __stub___gss_init_sec_context +choke me +#endif + +int main (void) +{ +return gss_init_sec_context (); + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + as_fn_error $? "--with-gssapi was specified, but a GSS-API library was not found." "$LINENO" 5 + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +fi + build_libstubgss=no if test x"$want_gss" = "xyes"; then build_libstubgss=yes @@ -24707,28 +25375,102 @@ fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable Amiga native SSL/TLS (AmiSSL)" >&5 -printf %s "checking whether to enable Amiga native SSL/TLS (AmiSSL)... " >&6; } +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable Amiga native SSL/TLS (AmiSSL v5)" >&5 +printf %s "checking whether to enable Amiga native SSL/TLS (AmiSSL v5)... " >&6; } if test "$HAVE_PROTO_BSDSOCKET_H" = "1"; then if test "x$OPT_AMISSL" != xno; then ssl_msg= - if test "x$OPT_AMISSL" != "xno"; then + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + #include + #include + +int main (void) +{ + + #if defined(AMISSL_CURRENT_VERSION) && (AMISSL_CURRENT_VERSION >= AMISSL_V303) && \ + defined(OPENSSL_VERSION_MAJOR) && (OPENSSL_VERSION_MAJOR >= 3) && \ + defined(PROTO_AMISSL_H) + return 0; + #else + #error not AmiSSL v5 / OpenSSL 3 + #endif + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } ssl_msg="AmiSSL" test amissl != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes AMISSL_ENABLED=1 - LIBS="-lamisslauto $LIBS" + OPENSSL_ENABLED=1 + # Use AmiSSL's built-in ca bundle + check_for_ca_bundle=1 + with_ca_fallback=yes + LIBS="-lamisslstubs -lamisslauto $LIBS" printf "%s\n" "#define USE_AMISSL 1" >>confdefs.h printf "%s\n" "#define USE_OPENSSL 1" >>confdefs.h - else + +printf "%s\n" "#define HAVE_OPENSSL3 1" >>confdefs.h + + ac_fn_c_check_header_compile "$LINENO" "openssl/x509.h" "ac_cv_header_openssl_x509_h" "$ac_includes_default" +if test "x$ac_cv_header_openssl_x509_h" = xyes +then : + printf "%s\n" "#define HAVE_OPENSSL_X509_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "openssl/rsa.h" "ac_cv_header_openssl_rsa_h" "$ac_includes_default" +if test "x$ac_cv_header_openssl_rsa_h" = xyes +then : + printf "%s\n" "#define HAVE_OPENSSL_RSA_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "openssl/crypto.h" "ac_cv_header_openssl_crypto_h" "$ac_includes_default" +if test "x$ac_cv_header_openssl_crypto_h" = xyes +then : + printf "%s\n" "#define HAVE_OPENSSL_CRYPTO_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "openssl/pem.h" "ac_cv_header_openssl_pem_h" "$ac_includes_default" +if test "x$ac_cv_header_openssl_pem_h" = xyes +then : + printf "%s\n" "#define HAVE_OPENSSL_PEM_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default" +if test "x$ac_cv_header_openssl_ssl_h" = xyes +then : + printf "%s\n" "#define HAVE_OPENSSL_SSL_H 1" >>confdefs.h + +fi +ac_fn_c_check_header_compile "$LINENO" "openssl/err.h" "ac_cv_header_openssl_err_h" "$ac_includes_default" +if test "x$ac_cv_header_openssl_err_h" = xyes +then : + printf "%s\n" "#define HAVE_OPENSSL_ERR_H 1" >>confdefs.h + +fi + + CPPFLAGS="$CPPFLAGS -DOPENSSL_SUPPRESS_DEPRECATED" + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - fi + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext test -z "$ssl_msg" || ssl_backends="${ssl_backends:+$ssl_backends, }$ssl_msg" else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 @@ -25101,7 +25843,7 @@ else $as_nop { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking OpenSSL linking with -ldl" >&5 printf %s "checking OpenSSL linking with -ldl... " >&6; } - LIBS="$CLEANLIBS -lcrypto -ldl" + LIBS="-lcrypto $CLEANLIBS -ldl" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -25130,7 +25872,7 @@ printf "%s\n" "no" >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking OpenSSL linking with -ldl and -lpthread" >&5 printf %s "checking OpenSSL linking with -ldl and -lpthread... " >&6; } - LIBS="$CLEANLIBS -lcrypto -ldl -lpthread" + LIBS="-lcrypto $CLEANLIBS -ldl -lpthread" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -25367,18 +26109,6 @@ if test "x$ac_cv_func_RAND_egd" = xyes then : printf "%s\n" "#define HAVE_RAND_EGD 1" >>confdefs.h -fi -ac_fn_c_check_func "$LINENO" "SSLv2_client_method" "ac_cv_func_SSLv2_client_method" -if test "x$ac_cv_func_SSLv2_client_method" = xyes -then : - printf "%s\n" "#define HAVE_SSLV2_CLIENT_METHOD 1" >>confdefs.h - -fi -ac_fn_c_check_func "$LINENO" "OpenSSL_version" "ac_cv_func_OpenSSL_version" -if test "x$ac_cv_func_OpenSSL_version" = xyes -then : - printf "%s\n" "#define HAVE_OPENSSL_VERSION 1" >>confdefs.h - fi @@ -25507,778 +26237,6 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext printf "%s\n" "$as_me: Added $LIB_OPENSSL to CURL_LIBRARY_PATH" >&6;} fi fi - - # - - # - tst_api="unknown" - # - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OpenSSL headers version" >&5 -printf %s "checking for OpenSSL headers version... " >&6; } - - OLDCPPFLAGS=$CPPFLAGS - # CPPPFLAG comes from CURL_CPP_P - CPPFLAGS="$CPPFLAGS $CPPPFLAG" - if test -z "$SED"; then - as_fn_error $? "SED not set. Cannot continue without SED being set." "$LINENO" 5 - fi - if test -z "$GREP"; then - as_fn_error $? "GREP not set. Cannot continue without GREP being set." "$LINENO" 5 - fi - - tmp_exp="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -# ifdef USE_OPENSSL -# include -# else -# include -# endif - -#ifdef OPENSSL_VERSION_NUMBER -CURL_DEF_TOKEN OPENSSL_VERSION_NUMBER -#endif - - -_ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : - - tmp_exp=`eval "$ac_cpp conftest.$ac_ext" 2>/dev/null | \ - "$GREP" CURL_DEF_TOKEN 2>/dev/null | \ - "$SED" 's/.*CURL_DEF_TOKEN[ ][ ]*//' 2>/dev/null | \ - "$SED" 's/["][ ]*["]//g' 2>/dev/null` - if test -z "$tmp_exp" || test "$tmp_exp" = "OPENSSL_VERSION_NUMBER"; then - tmp_exp="" - fi - -fi -rm -f conftest.err conftest.i conftest.$ac_ext - if test -z "$tmp_exp"; then - curl_cv_have_def_OPENSSL_VERSION_NUMBER=no - - else - curl_cv_have_def_OPENSSL_VERSION_NUMBER=yes - curl_cv_def_OPENSSL_VERSION_NUMBER=$tmp_exp - - fi - CPPFLAGS=$OLDCPPFLAGS - - - OLDCPPFLAGS=$CPPFLAGS - # CPPPFLAG comes from CURL_CPP_P - CPPFLAGS="$CPPFLAGS $CPPPFLAG" - if test -z "$SED"; then - as_fn_error $? "SED not set. Cannot continue without SED being set." "$LINENO" 5 - fi - if test -z "$GREP"; then - as_fn_error $? "GREP not set. Cannot continue without GREP being set." "$LINENO" 5 - fi - - tmp_exp="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -# include - -#ifdef OPENSSL_VERSION_STR -CURL_DEF_TOKEN OPENSSL_VERSION_STR -#endif - - -_ACEOF -if ac_fn_c_try_cpp "$LINENO" -then : - - tmp_exp=`eval "$ac_cpp conftest.$ac_ext" 2>/dev/null | \ - "$GREP" CURL_DEF_TOKEN 2>/dev/null | \ - "$SED" 's/.*CURL_DEF_TOKEN[ ][ ]*//' 2>/dev/null | \ - "$SED" 's/["][ ]*["]//g' 2>/dev/null` - if test -z "$tmp_exp" || test "$tmp_exp" = "OPENSSL_VERSION_STR"; then - tmp_exp="" - fi - -fi -rm -f conftest.err conftest.i conftest.$ac_ext - if test -z "$tmp_exp"; then - curl_cv_have_def_OPENSSL_VERSION_STR=no - - else - curl_cv_have_def_OPENSSL_VERSION_STR=yes - curl_cv_def_OPENSSL_VERSION_STR=$tmp_exp - - fi - CPPFLAGS=$OLDCPPFLAGS - - if test "$curl_cv_have_def_OPENSSL_VERSION_NUMBER" = "yes"; then - tst_verlen=`expr "$curl_cv_def_OPENSSL_VERSION_NUMBER" : '.*'` - case "x$tst_verlen" in - x6) - tst_vermaj=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 3` - tst_vermin=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 4` - tst_verfix=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 5` - tst_api=0x$tst_vermaj$tst_vermin$tst_verfix - ;; - x11|x10) - tst_vermaj=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 3` - tst_vermin=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 5` - tst_verfix=`echo $curl_cv_def_OPENSSL_VERSION_NUMBER | cut -c 7` - tst_api=0x$tst_vermaj$tst_vermin$tst_verfix - ;; - *) - if test "$curl_cv_have_def_OPENSSL_VERSION_STR" = "yes"; then - ver=`echo $curl_cv_def_OPENSSL_VERSION_STR | sed s/\"//g`; - tst_vermaj=`echo $ver | cut -d. -f1` - tst_vermin=`echo $ver | cut -d. -f2` - tst_verfix=`echo $ver | cut -d. -f3` - tst_show="$ver" - tst_api=0x$tst_vermaj$tst_vermin$tst_verfix - else - tst_api="unknown" - fi - ;; - esac - case $tst_api in - 0x111) tst_show="1.1.1" ;; - 0x110) tst_show="1.1.0" ;; - 0x102) tst_show="1.0.2" ;; - 0x101) tst_show="1.0.1" ;; - 0x100) tst_show="1.0.0" ;; - 0x099) tst_show="0.9.9" ;; - 0x098) tst_show="0.9.8" ;; - 0x097) tst_show="0.9.7" ;; - 0x096) tst_show="0.9.6" ;; - 0x095) tst_show="0.9.5" ;; - 0x094) tst_show="0.9.4" ;; - 0x093) tst_show="0.9.3" ;; - 0x092) tst_show="0.9.2" ;; - 0x091) tst_show="0.9.1" ;; - *) - if test -z "$tst_show"; then - tst_show="unknown" - fi - ;; - esac - tst_show="$tst_show - $tst_api" - else - tst_show="unknown" - fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $tst_show" >&5 -printf "%s\n" "$tst_show" >&6; } - # - curl_openssl_api_headers=$tst_api - - - # - tst_api="unknown" - # - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OpenSSL library version" >&5 -printf %s "checking for OpenSSL library version... " >&6; } - if test "$tst_api" = "unknown"; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#define SSL_CTX_load_verify_dir innocuous_SSL_CTX_load_verify_dir -#ifdef __STDC__ -# include -#else -# include -#endif -#undef SSL_CTX_load_verify_dir -#ifdef __cplusplus -extern "C" -#endif -char SSL_CTX_load_verify_dir (); -#if defined __stub_SSL_CTX_load_verify_dir || defined __stub___SSL_CTX_load_verify_dir -choke me -#endif - -int main (void) -{ -return SSL_CTX_load_verify_dir (); - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - - tst_api="0x300" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - fi - if test "$tst_api" = "unknown"; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#define ERR_clear_last_mark innocuous_ERR_clear_last_mark -#ifdef __STDC__ -# include -#else -# include -#endif -#undef ERR_clear_last_mark -#ifdef __cplusplus -extern "C" -#endif -char ERR_clear_last_mark (); -#if defined __stub_ERR_clear_last_mark || defined __stub___ERR_clear_last_mark -choke me -#endif - -int main (void) -{ -return ERR_clear_last_mark (); - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - - tst_api="0x111" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - fi - if test "$tst_api" = "unknown"; then - case $host in - *-*-vms*) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#define SSL_CTX_set_not_resumbl_sess_cb innocuous_SSL_CTX_set_not_resumbl_sess_cb -#ifdef __STDC__ -# include -#else -# include -#endif -#undef SSL_CTX_set_not_resumbl_sess_cb -#ifdef __cplusplus -extern "C" -#endif -char SSL_CTX_set_not_resumbl_sess_cb (); -#if defined __stub_SSL_CTX_set_not_resumbl_sess_cb || defined __stub___SSL_CTX_set_not_resumbl_sess_cb -choke me -#endif - -int main (void) -{ -return SSL_CTX_set_not_resumbl_sess_cb (); - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - - tst_api="0x110" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - ;; - *) - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#define SSL_CTX_set_not_resumable_session_callback innocuous_SSL_CTX_set_not_resumable_session_callback -#ifdef __STDC__ -# include -#else -# include -#endif -#undef SSL_CTX_set_not_resumable_session_callback -#ifdef __cplusplus -extern "C" -#endif -char SSL_CTX_set_not_resumable_session_callback (); -#if defined __stub_SSL_CTX_set_not_resumable_session_callback || defined __stub___SSL_CTX_set_not_resumable_session_callback -choke me -#endif - -int main (void) -{ -return SSL_CTX_set_not_resumable_session_callback (); - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - - tst_api="0x110" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - ;; - esac - fi - if test "$tst_api" = "unknown"; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#define SSL_CONF_CTX_new innocuous_SSL_CONF_CTX_new -#ifdef __STDC__ -# include -#else -# include -#endif -#undef SSL_CONF_CTX_new -#ifdef __cplusplus -extern "C" -#endif -char SSL_CONF_CTX_new (); -#if defined __stub_SSL_CONF_CTX_new || defined __stub___SSL_CONF_CTX_new -choke me -#endif - -int main (void) -{ -return SSL_CONF_CTX_new (); - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - - tst_api="0x102" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - fi - if test "$tst_api" = "unknown"; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#define SSL_renegotiate_abbreviated innocuous_SSL_renegotiate_abbreviated -#ifdef __STDC__ -# include -#else -# include -#endif -#undef SSL_renegotiate_abbreviated -#ifdef __cplusplus -extern "C" -#endif -char SSL_renegotiate_abbreviated (); -#if defined __stub_SSL_renegotiate_abbreviated || defined __stub___SSL_renegotiate_abbreviated -choke me -#endif - -int main (void) -{ -return SSL_renegotiate_abbreviated (); - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - - tst_api="0x101" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - fi - if test "$tst_api" = "unknown"; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#define OBJ_add_sigid innocuous_OBJ_add_sigid -#ifdef __STDC__ -# include -#else -# include -#endif -#undef OBJ_add_sigid -#ifdef __cplusplus -extern "C" -#endif -char OBJ_add_sigid (); -#if defined __stub_OBJ_add_sigid || defined __stub___OBJ_add_sigid -choke me -#endif - -int main (void) -{ -return OBJ_add_sigid (); - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - - tst_api="0x100" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - fi - if test "$tst_api" = "unknown"; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#define ERR_set_mark innocuous_ERR_set_mark -#ifdef __STDC__ -# include -#else -# include -#endif -#undef ERR_set_mark -#ifdef __cplusplus -extern "C" -#endif -char ERR_set_mark (); -#if defined __stub_ERR_set_mark || defined __stub___ERR_set_mark -choke me -#endif - -int main (void) -{ -return ERR_set_mark (); - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - - tst_api="0x098" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - fi - if test "$tst_api" = "unknown"; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#define ERR_peek_last_error innocuous_ERR_peek_last_error -#ifdef __STDC__ -# include -#else -# include -#endif -#undef ERR_peek_last_error -#ifdef __cplusplus -extern "C" -#endif -char ERR_peek_last_error (); -#if defined __stub_ERR_peek_last_error || defined __stub___ERR_peek_last_error -choke me -#endif - -int main (void) -{ -return ERR_peek_last_error (); - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - - tst_api="0x097" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - fi - if test "$tst_api" = "unknown"; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#define c2i_ASN1_OBJECT innocuous_c2i_ASN1_OBJECT -#ifdef __STDC__ -# include -#else -# include -#endif -#undef c2i_ASN1_OBJECT -#ifdef __cplusplus -extern "C" -#endif -char c2i_ASN1_OBJECT (); -#if defined __stub_c2i_ASN1_OBJECT || defined __stub___c2i_ASN1_OBJECT -choke me -#endif - -int main (void) -{ -return c2i_ASN1_OBJECT (); - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - - tst_api="0x096" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - fi - if test "$tst_api" = "unknown"; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#define SSL_CTX_set_purpose innocuous_SSL_CTX_set_purpose -#ifdef __STDC__ -# include -#else -# include -#endif -#undef SSL_CTX_set_purpose -#ifdef __cplusplus -extern "C" -#endif -char SSL_CTX_set_purpose (); -#if defined __stub_SSL_CTX_set_purpose || defined __stub___SSL_CTX_set_purpose -choke me -#endif - -int main (void) -{ -return SSL_CTX_set_purpose (); - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - - tst_api="0x095" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - fi - if test "$tst_api" = "unknown"; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#define OBJ_obj2txt innocuous_OBJ_obj2txt -#ifdef __STDC__ -# include -#else -# include -#endif -#undef OBJ_obj2txt -#ifdef __cplusplus -extern "C" -#endif -char OBJ_obj2txt (); -#if defined __stub_OBJ_obj2txt || defined __stub___OBJ_obj2txt -choke me -#endif - -int main (void) -{ -return OBJ_obj2txt (); - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - - tst_api="0x094" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - fi - if test "$tst_api" = "unknown"; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#define SSL_get_verify_depth innocuous_SSL_get_verify_depth -#ifdef __STDC__ -# include -#else -# include -#endif -#undef SSL_get_verify_depth -#ifdef __cplusplus -extern "C" -#endif -char SSL_get_verify_depth (); -#if defined __stub_SSL_get_verify_depth || defined __stub___SSL_get_verify_depth -choke me -#endif - -int main (void) -{ -return SSL_get_verify_depth (); - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - - tst_api="0x093" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - fi - if test "$tst_api" = "unknown"; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#define SSL_library_init innocuous_SSL_library_init -#ifdef __STDC__ -# include -#else -# include -#endif -#undef SSL_library_init -#ifdef __cplusplus -extern "C" -#endif -char SSL_library_init (); -#if defined __stub_SSL_library_init || defined __stub___SSL_library_init -choke me -#endif - -int main (void) -{ -return SSL_library_init (); - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - - tst_api="0x092" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - fi - if test "$tst_api" = "unknown"; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#define SSL_CTX_set_cipher_list innocuous_SSL_CTX_set_cipher_list -#ifdef __STDC__ -# include -#else -# include -#endif -#undef SSL_CTX_set_cipher_list -#ifdef __cplusplus -extern "C" -#endif -char SSL_CTX_set_cipher_list (); -#if defined __stub_SSL_CTX_set_cipher_list || defined __stub___SSL_CTX_set_cipher_list -choke me -#endif - -int main (void) -{ -return SSL_CTX_set_cipher_list (); - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - - tst_api="0x091" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - fi - case $tst_api in - 0x300) tst_show="3.0.0" ;; - 0x111) tst_show="1.1.1" ;; - 0x110) tst_show="1.1.0" ;; - 0x102) tst_show="1.0.2" ;; - 0x101) tst_show="1.0.1" ;; - 0x100) tst_show="1.0.0" ;; - 0x099) tst_show="0.9.9" ;; - 0x098) tst_show="0.9.8" ;; - 0x097) tst_show="0.9.7" ;; - 0x096) tst_show="0.9.6" ;; - 0x095) tst_show="0.9.5" ;; - 0x094) tst_show="0.9.4" ;; - 0x093) tst_show="0.9.3" ;; - 0x092) tst_show="0.9.2" ;; - 0x091) tst_show="0.9.1" ;; - *) tst_show="unknown" ;; - esac - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $tst_show" >&5 -printf "%s\n" "$tst_show" >&6; } - # - curl_openssl_api_library=$tst_api - - # - tst_match="yes" - # - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for OpenSSL headers and library versions matching" >&5 -printf %s "checking for OpenSSL headers and library versions matching... " >&6; } - if test "$curl_openssl_api_headers" = "unknown" || - test "$curl_openssl_api_library" = "unknown"; then - tst_match="fail" - tst_warns="Can not compare OpenSSL headers and library versions." - elif test "$curl_openssl_api_headers" != "$curl_openssl_api_library"; then - tst_match="no" - tst_warns="OpenSSL headers and library versions do not match." - fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $tst_match" >&5 -printf "%s\n" "$tst_match" >&6; } - if test "$tst_match" != "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: $tst_warns" >&5 -printf "%s\n" "$as_me: WARNING: $tst_warns" >&2;} - fi - check_for_ca_bundle=1 fi @@ -26358,53 +26316,45 @@ printf "%s\n" "#define RANDOM_FILE \"$RANDOM_FILE\"" >>confdefs.h fi if test "$OPENSSL_ENABLED" = "1"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SRP_Calc_client_key in -lcrypto" >&5 -printf %s "checking for SRP_Calc_client_key in -lcrypto... " >&6; } -if test ${ac_cv_lib_crypto_SRP_Calc_client_key+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcrypto $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SRP support in OpenSSL" >&5 +printf %s "checking for SRP support in OpenSSL... " >&6; } + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#ifdef __cplusplus -extern "C" -#endif -char SRP_Calc_client_key (); +#include + int main (void) { -return SRP_Calc_client_key (); + + SSL_CTX_set_srp_username(NULL, ""); + SSL_CTX_set_srp_password(NULL, ""); + ; return 0; } + _ACEOF if ac_fn_c_try_link "$LINENO" -then : - ac_cv_lib_crypto_SRP_Calc_client_key=yes -else $as_nop - ac_cv_lib_crypto_SRP_Calc_client_key=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_SRP_Calc_client_key" >&5 -printf "%s\n" "$ac_cv_lib_crypto_SRP_Calc_client_key" >&6; } -if test "x$ac_cv_lib_crypto_SRP_Calc_client_key" = xyes then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } printf "%s\n" "#define HAVE_OPENSSL_SRP 1" >>confdefs.h - HAVE_OPENSSL_SRP=1 + HAVE_OPENSSL_SRP=1 -fi +else $as_nop + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +fi if test X"$OPENSSL_ENABLED" = X"1"; then # Check whether --enable-openssl-auto-load-config was given. @@ -27232,6 +27182,7 @@ printf %s "checking for wolfSSL_Init in -lwolfssl... " >&6; } They are set up properly later if it is detected. */ #undef SIZEOF_LONG #undef SIZEOF_LONG_LONG +#include #include int main (void) @@ -27278,14 +27229,13 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ printf "%s\n" "$as_me: detected wolfSSL" >&6;} check_for_ca_bundle=1 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long long" >&5 printf %s "checking size of long long... " >&6; } -if test ${ac_cv_sizeof_long_long+y} -then : - printf %s "(cached) " >&6 -else $as_nop - for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + r=0 + for typesize in 8 4 2 16 1; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -27293,28 +27243,39 @@ else $as_nop int main (void) { -switch (0) case 0: case (sizeof (long long) == $ac_size):; +switch(0) { + case 0: + case (sizeof(long long) == $typesize):; + } + ; return 0; } _ACEOF if ac_fn_c_try_compile "$LINENO" then : - ac_cv_sizeof_long_long=$ac_size + + r=$typesize +else $as_nop + + r=0 fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - if test x$ac_cv_sizeof_long_long != x ; then break; fi -done + if test $r -gt 0; then + break; + fi + done + if test $r -eq 0; then + as_fn_error $? "Failed to find size of long long" "$LINENO" 5 + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $r" >&5 +printf "%s\n" "$r" >&6; } + tname=$(echo "ac_cv_sizeof_long long" | tr A-Z a-z | tr " " "_") + eval "$tname=$r" -fi -if test x$ac_cv_sizeof_long_long = x ; then - as_fn_error $? "cannot determine a size for long long" "$LINENO" 5 -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long_long" >&5 -printf "%s\n" "$ac_cv_sizeof_long_long" >&6; } +printf "%s\n" "#define SIZEOF_LONG_LONG $r" >>confdefs.h -printf "%s\n" "#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long" >>confdefs.h @@ -27341,18 +27302,6 @@ then : printf "%s\n" "#define HAVE_WOLFSSL_DES_ECB_ENCRYPT 1" >>confdefs.h - if test -n "$addcflags"; then - for f in $addcflags; do - CPPFLAGS="$f/wolfssl $CPPFLAGS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Add $f/wolfssl to CPPFLAGS" >&5 -printf "%s\n" "$as_me: Add $f/wolfssl to CPPFLAGS" >&6;} - break - done - else - CPPFLAGS="-I/usr/include/wolfssl $CPPFLAGS" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Add /usr/include/wolfssl to CPPFLAGS" >&5 -printf "%s\n" "$as_me: Add /usr/include/wolfssl to CPPFLAGS" >&6;} - fi WOLFSSL_NTLM=1 @@ -27377,165 +27326,6 @@ fi -if test "x$OPT_MESALINK" != xno; then - _cppflags=$CPPFLAGS - _ldflags=$LDFLAGS - ssl_msg= - - if test X"$OPT_MESALINK" != Xno; then - - if test "$OPT_MESALINK" = "yes"; then - OPT_MESALINK="" - fi - - if test -z "$OPT_MESALINK" ; then - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mesalink_library_init in -lmesalink" >&5 -printf %s "checking for mesalink_library_init in -lmesalink... " >&6; } -if test ${ac_cv_lib_mesalink_mesalink_library_init+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmesalink $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#ifdef __cplusplus -extern "C" -#endif -char mesalink_library_init (); -int main (void) -{ -return mesalink_library_init (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_lib_mesalink_mesalink_library_init=yes -else $as_nop - ac_cv_lib_mesalink_mesalink_library_init=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mesalink_mesalink_library_init" >&5 -printf "%s\n" "$ac_cv_lib_mesalink_mesalink_library_init" >&6; } -if test "x$ac_cv_lib_mesalink_mesalink_library_init" = xyes -then : - - -printf "%s\n" "#define USE_MESALINK 1" >>confdefs.h - - USE_MESALINK=1 - - MESALINK_ENABLED=1 - USE_MESALINK="yes" - ssl_msg="MesaLink" - test mesalink != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes - -fi - - fi - - addld="" - addlib="" - addcflags="" - mesalinklib="" - - if test "x$USE_MESALINK" != "xyes"; then - addld=-L$OPT_MESALINK/lib$libsuff - addcflags=-I$OPT_MESALINK/include - mesalinklib=$OPT_MESALINK/lib$libsuff - - LDFLAGS="$LDFLAGS $addld" - if test "$addcflags" != "-I/usr/include"; then - CPPFLAGS="$CPPFLAGS $addcflags" - fi - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for mesalink_library_init in -lmesalink" >&5 -printf %s "checking for mesalink_library_init in -lmesalink... " >&6; } -if test ${ac_cv_lib_mesalink_mesalink_library_init+y} -then : - printf %s "(cached) " >&6 -else $as_nop - ac_check_lib_save_LIBS=$LIBS -LIBS="-lmesalink $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#ifdef __cplusplus -extern "C" -#endif -char mesalink_library_init (); -int main (void) -{ -return mesalink_library_init (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - ac_cv_lib_mesalink_mesalink_library_init=yes -else $as_nop - ac_cv_lib_mesalink_mesalink_library_init=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mesalink_mesalink_library_init" >&5 -printf "%s\n" "$ac_cv_lib_mesalink_mesalink_library_init" >&6; } -if test "x$ac_cv_lib_mesalink_mesalink_library_init" = xyes -then : - - -printf "%s\n" "#define USE_MESALINK 1" >>confdefs.h - - USE_MESALINK=1 - - MESALINK_ENABLED=1 - USE_MESALINK="yes" - ssl_msg="MesaLink" - test mesalink != "$DEFAULT_SSL_BACKEND" || VALID_DEFAULT_SSL_BACKEND=yes - -else $as_nop - - CPPFLAGS=$_cppflags - LDFLAGS=$_ldflags - -fi - - fi - - if test "x$USE_MESALINK" = "xyes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: detected MesaLink" >&5 -printf "%s\n" "$as_me: detected MesaLink" >&6;} - - LIBS="-lmesalink $LIBS" - - if test -n "$mesalinklib"; then - if test "x$cross_compiling" != "xyes"; then - LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$mesalinklib" - export LD_LIBRARY_PATH - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Added $mesalinklib to LD_LIBRARY_PATH" >&5 -printf "%s\n" "$as_me: Added $mesalinklib to LD_LIBRARY_PATH" >&6;} - fi - fi - fi - - fi - test -z "$ssl_msg" || ssl_backends="${ssl_backends:+$ssl_backends, }$ssl_msg" -fi - - - if test "x$OPT_BEARSSL" != xno; then _cppflags=$CPPFLAGS _ldflags=$LDFLAGS @@ -27709,14 +27499,14 @@ if test "x$OPT_RUSTLS" != xno; then if test -z "$OPT_RUSTLS" ; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rustls_client_session_read in -lcrustls" >&5 -printf %s "checking for rustls_client_session_read in -lcrustls... " >&6; } -if test ${ac_cv_lib_crustls_rustls_client_session_read+y} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rustls_client_session_read in -lrustls" >&5 +printf %s "checking for rustls_client_session_read in -lrustls... " >&6; } +if test ${ac_cv_lib_rustls_rustls_client_session_read+y} then : printf %s "(cached) " >&6 else $as_nop ac_check_lib_save_LIBS=$LIBS -LIBS="-lcrustls -lpthread -ldl $LIBS" +LIBS="-lrustls -lpthread -ldl -lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -27734,17 +27524,17 @@ return rustls_client_session_read (); _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_lib_crustls_rustls_client_session_read=yes + ac_cv_lib_rustls_rustls_client_session_read=yes else $as_nop - ac_cv_lib_crustls_rustls_client_session_read=no + ac_cv_lib_rustls_rustls_client_session_read=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crustls_rustls_client_session_read" >&5 -printf "%s\n" "$ac_cv_lib_crustls_rustls_client_session_read" >&6; } -if test "x$ac_cv_lib_crustls_rustls_client_session_read" = xyes +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rustls_rustls_client_session_read" >&5 +printf "%s\n" "$ac_cv_lib_rustls_rustls_client_session_read" >&6; } +if test "x$ac_cv_lib_rustls_rustls_client_session_read" = xyes then : @@ -27761,11 +27551,6 @@ fi fi - addld="" - addlib="-lpthread" - addcflags="" - bearssllib="" - if test "x$USE_RUSTLS" != "xyes"; then addld=-L$OPT_RUSTLS/lib$libsuff addcflags=-I$OPT_RUSTLS/include @@ -27776,14 +27561,14 @@ fi CPPFLAGS="$CPPFLAGS $addcflags" fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rustls_connection_read in -lcrustls" >&5 -printf %s "checking for rustls_connection_read in -lcrustls... " >&6; } -if test ${ac_cv_lib_crustls_rustls_connection_read+y} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for rustls_connection_read in -lrustls" >&5 +printf %s "checking for rustls_connection_read in -lrustls... " >&6; } +if test ${ac_cv_lib_rustls_rustls_connection_read+y} then : printf %s "(cached) " >&6 else $as_nop ac_check_lib_save_LIBS=$LIBS -LIBS="-lcrustls -lpthread -ldl $LIBS" +LIBS="-lrustls -lpthread -ldl -lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -27801,17 +27586,17 @@ return rustls_connection_read (); _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_lib_crustls_rustls_connection_read=yes + ac_cv_lib_rustls_rustls_connection_read=yes else $as_nop - ac_cv_lib_crustls_rustls_connection_read=no + ac_cv_lib_rustls_rustls_connection_read=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crustls_rustls_connection_read" >&5 -printf "%s\n" "$ac_cv_lib_crustls_rustls_connection_read" >&6; } -if test "x$ac_cv_lib_crustls_rustls_connection_read" = xyes +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rustls_rustls_connection_read" >&5 +printf "%s\n" "$ac_cv_lib_rustls_rustls_connection_read" >&6; } +if test "x$ac_cv_lib_rustls_rustls_connection_read" = xyes then : @@ -27835,7 +27620,7 @@ fi printf "%s\n" "$as_me: detected rustls" >&6;} check_for_ca_bundle=1 - LIBS="-lcrustls -lpthread -ldl $LIBS" + LIBS="-lrustls -lpthread -ldl -lm $LIBS" if test -n "$rustlslib"; then if test "x$cross_compiling" != "xyes"; then @@ -28309,13 +28094,16 @@ if test "x$USE_WIN32_CRYPTO" = "x1" -o "x$USE_SCHANNEL" = "x1"; then LIBS="-ladvapi32 -lcrypt32 $LIBS" fi -case "x$OPENSSL_ENABLED$GNUTLS_ENABLED$NSS_ENABLED$MBEDTLS_ENABLED$WOLFSSL_ENABLED$SCHANNEL_ENABLED$SECURETRANSPORT_ENABLED$MESALINK_ENABLED$BEARSSL_ENABLED$AMISSL_ENABLED$RUSTLS_ENABLED" +if test "x$curl_cv_native_windows" = "xyes" && + test "x$curl_mingw_original" = "xno"; then + LIBS="-lbcrypt $LIBS" +fi + +case "x$OPENSSL_ENABLED$GNUTLS_ENABLED$NSS_ENABLED$MBEDTLS_ENABLED$WOLFSSL_ENABLED$SCHANNEL_ENABLED$SECURETRANSPORT_ENABLED$BEARSSL_ENABLED$RUSTLS_ENABLED$SSL_DISABLED" in x) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: SSL disabled, you will not be able to use HTTPS, FTPS, NTLM and more." >&5 -printf "%s\n" "$as_me: WARNING: SSL disabled, you will not be able to use HTTPS, FTPS, NTLM and more." >&2;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: Use --with-openssl, --with-gnutls, --with-wolfssl, --with-mbedtls, --with-nss, --with-schannel, --with-secure-transport, --with-mesalink, --with-amissl, --with-bearssl or --with-rustls to address this." >&5 -printf "%s\n" "$as_me: WARNING: Use --with-openssl, --with-gnutls, --with-wolfssl, --with-mbedtls, --with-nss, --with-schannel, --with-secure-transport, --with-mesalink, --with-amissl, --with-bearssl or --with-rustls to address this." >&2;} + as_fn_error $? "TLS not detected, you will not be able to use HTTPS, FTPS, NTLM and more. +Use --with-openssl, --with-gnutls, --with-wolfssl, --with-mbedtls, --with-nss, --with-schannel, --with-secure-transport, --with-amissl, --with-bearssl or --with-rustls to address this." "$LINENO" 5 ;; x1) # one SSL backend is enabled @@ -28324,6 +28112,9 @@ x1) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: built with one SSL backend" >&5 printf "%s\n" "$as_me: built with one SSL backend" >&6;} ;; +xD) + # explicitly built without TLS + ;; *) # more than one SSL backend is enabled @@ -29645,6 +29436,9 @@ else fi +CURL_PLIST_VERSION="$CURLVERSION" + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to enable Windows native IDN (Windows native builds only)" >&5 printf %s "checking whether to enable Windows native IDN (Windows native builds only)... " >&6; } @@ -29793,31 +29587,37 @@ then : withval=$with_libidn2; OPT_IDN=$withval fi -case "$OPT_IDN" in - no) - want_idn="no" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +if test "x$tst_links_winidn" = "xyes"; then + want_idn="no" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no (using winidn instead)" >&5 +printf "%s\n" "no (using winidn instead)" >&6; } +else + case "$OPT_IDN" in + no) + want_idn="no" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - ;; - default) - want_idn="yes" - want_idn_path="default" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: (assumed) yes" >&5 + ;; + default) + want_idn="yes" + want_idn_path="default" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: (assumed) yes" >&5 printf "%s\n" "(assumed) yes" >&6; } - ;; - yes) - want_idn="yes" - want_idn_path="default" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + ;; + yes) + want_idn="yes" + want_idn_path="default" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - ;; - *) - want_idn="yes" - want_idn_path="$withval" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes ($withval)" >&5 + ;; + *) + want_idn="yes" + want_idn_path="$withval" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes ($withval)" >&5 printf "%s\n" "yes ($withval)" >&6; } - ;; -esac + ;; + esac +fi if test "$want_idn" = "yes"; then clean_CPPFLAGS="$CPPFLAGS" @@ -30238,13 +30038,10 @@ printf "%s\n" "$as_me: WARNING: Cannot find libraries for IDN support: IDN disab fi - - - OPT_H2="yes" -if test "x$disable_http" = "xyes"; then - # without HTTP, nghttp2 is no use +if test "x$disable_http" = "xyes" -o X"$want_hyper" != Xno; then + # without HTTP or with Hyper, nghttp2 is no use OPT_H2="no" fi @@ -30257,19 +30054,309 @@ fi case "$OPT_H2" in no) - want_h2="no" + want_nghttp2="no" ;; yes) - want_h2="default" - want_h2_path="" + want_nghttp2="default" + want_nghttp2_path="" + want_nghttp2_pkg_config_path="" ;; *) - want_h2="yes" - want_h2_path="$withval/lib/pkgconfig" + want_nghttp2="yes" + want_nghttp2_path="$withval" + want_nghttp2_pkg_config_path="$withval/lib/pkgconfig" ;; esac -if test X"$want_h2" != Xno; then +if test X"$want_nghttp2" != Xno; then + CLEANLDFLAGS="$LDFLAGS" + CLEANCPPFLAGS="$CPPFLAGS" + CLEANLIBS="$LIBS" + + + if test -n "$PKG_CONFIG"; then + PKGCONFIG="$PKG_CONFIG" + else + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. +set dummy ${ac_tool_prefix}pkg-config; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_PKGCONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $PKGCONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKGCONFIG="$PKGCONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$PATH:/usr/bin:/usr/local/bin" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_PKGCONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +PKGCONFIG=$ac_cv_path_PKGCONFIG +if test -n "$PKGCONFIG"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $PKGCONFIG" >&5 +printf "%s\n" "$PKGCONFIG" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_path_PKGCONFIG"; then + ac_pt_PKGCONFIG=$PKGCONFIG + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_path_ac_pt_PKGCONFIG+y} +then : + printf %s "(cached) " >&6 +else $as_nop + case $ac_pt_PKGCONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_ac_pt_PKGCONFIG="$ac_pt_PKGCONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="$PATH:/usr/bin:/usr/local/bin" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_path_ac_pt_PKGCONFIG="$as_dir$ac_word$ac_exec_ext" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + ;; +esac +fi +ac_pt_PKGCONFIG=$ac_cv_path_ac_pt_PKGCONFIG +if test -n "$ac_pt_PKGCONFIG"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKGCONFIG" >&5 +printf "%s\n" "$ac_pt_PKGCONFIG" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_pt_PKGCONFIG" = x; then + PKGCONFIG="no" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + PKGCONFIG=$ac_pt_PKGCONFIG + fi +else + PKGCONFIG="$ac_cv_path_PKGCONFIG" +fi + + fi + + if test "x$PKGCONFIG" != "xno"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libnghttp2 options with pkg-config" >&5 +printf %s "checking for libnghttp2 options with pkg-config... " >&6; } + itexists=` + if test -n "$want_nghttp2_pkg_config_path"; then + PKG_CONFIG_LIBDIR="$want_nghttp2_pkg_config_path" + export PKG_CONFIG_LIBDIR + fi + $PKGCONFIG --exists libnghttp2 >/dev/null 2>&1 && echo 1` + + if test -z "$itexists"; then + PKGCONFIG="no" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: found" >&5 +printf "%s\n" "found" >&6; } + fi + fi + + + if test "$PKGCONFIG" != "no" ; then + LIB_H2=` + if test -n "$want_nghttp2_pkg_config_path"; then + PKG_CONFIG_LIBDIR="$want_nghttp2_pkg_config_path" + export PKG_CONFIG_LIBDIR + fi + + $PKGCONFIG --libs-only-l libnghttp2` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -l is $LIB_H2" >&5 +printf "%s\n" "$as_me: -l is $LIB_H2" >&6;} + + CPP_H2=` + if test -n "$want_nghttp2_pkg_config_path"; then + PKG_CONFIG_LIBDIR="$want_nghttp2_pkg_config_path" + export PKG_CONFIG_LIBDIR + fi + $PKGCONFIG --cflags-only-I libnghttp2` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -I is $CPP_H2" >&5 +printf "%s\n" "$as_me: -I is $CPP_H2" >&6;} + + LD_H2=` + if test -n "$want_nghttp2_pkg_config_path"; then + PKG_CONFIG_LIBDIR="$want_nghttp2_pkg_config_path" + export PKG_CONFIG_LIBDIR + fi + + $PKGCONFIG --libs-only-L libnghttp2` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -L is $LD_H2" >&5 +printf "%s\n" "$as_me: -L is $LD_H2" >&6;} + + DIR_H2=`echo $LD_H2 | $SED -e 's/^-L//'` + elif test x"$want_nghttp2_path" != x; then + LIB_H2="-lnghttp2" + LD_H2=-L${want_nghttp2_path}/lib$libsuff + CPP_H2=-I${want_nghttp2_path}/include + DIR_H2=${want_nghttp2_path}/lib$libsuff + elif test X"$want_nghttp2" != Xdefault; then + as_fn_error $? "--with-nghttp2 was specified but could not find libnghttp2 pkg-config file." "$LINENO" 5 + fi + + LDFLAGS="$LDFLAGS $LD_H2" + CPPFLAGS="$CPPFLAGS $CPP_H2" + LIBS="$LIB_H2 $LIBS" + + # use nghttp2_session_set_local_window_size to require nghttp2 + # >= 1.12.0 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nghttp2_session_set_local_window_size in -lnghttp2" >&5 +printf %s "checking for nghttp2_session_set_local_window_size in -lnghttp2... " >&6; } +if test ${ac_cv_lib_nghttp2_nghttp2_session_set_local_window_size+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lnghttp2 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +#ifdef __cplusplus +extern "C" +#endif +char nghttp2_session_set_local_window_size (); +int main (void) +{ +return nghttp2_session_set_local_window_size (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_nghttp2_nghttp2_session_set_local_window_size=yes +else $as_nop + ac_cv_lib_nghttp2_nghttp2_session_set_local_window_size=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nghttp2_nghttp2_session_set_local_window_size" >&5 +printf "%s\n" "$ac_cv_lib_nghttp2_nghttp2_session_set_local_window_size" >&6; } +if test "x$ac_cv_lib_nghttp2_nghttp2_session_set_local_window_size" = xyes +then : + + for ac_header in nghttp2/nghttp2.h +do : + ac_fn_c_check_header_compile "$LINENO" "nghttp2/nghttp2.h" "ac_cv_header_nghttp2_nghttp2_h" "$ac_includes_default" +if test "x$ac_cv_header_nghttp2_nghttp2_h" = xyes +then : + printf "%s\n" "#define HAVE_NGHTTP2_NGHTTP2_H 1" >>confdefs.h + curl_h2_msg="enabled (nghttp2)" + NGHTTP2_ENABLED=1 + +printf "%s\n" "#define USE_NGHTTP2 1" >>confdefs.h + + USE_NGHTTP2=1 + + +fi + +done + + CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_H2" + export CURL_LIBRARY_PATH + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Added $DIR_H2 to CURL_LIBRARY_PATH" >&5 +printf "%s\n" "$as_me: Added $DIR_H2 to CURL_LIBRARY_PATH" >&6;} + +else $as_nop + LDFLAGS=$CLEANLDFLAGS + CPPFLAGS=$CLEANCPPFLAGS + LIBS=$CLEANLIBS + +fi + +fi + + +OPT_TCP2="yes" + +if test "x$disable_http" = "xyes"; then + # without HTTP, ngtcp2 is no use + OPT_TCP2="no" +fi + + +# Check whether --with-ngtcp2 was given. +if test ${with_ngtcp2+y} +then : + withval=$with_ngtcp2; OPT_TCP2=$withval +fi + +case "$OPT_TCP2" in + no) + want_tcp2="no" + ;; + yes) + want_tcp2="default" + want_tcp2_path="" + ;; + *) + want_tcp2="yes" + want_tcp2_path="$withval/lib/pkgconfig" + ;; +esac + +curl_tcp2_msg="no (--with-ngtcp2)" +if test X"$want_tcp2" != Xno; then CLEANLDFLAGS="$LDFLAGS" CLEANCPPFLAGS="$CPPFLAGS" CLEANLIBS="$LIBS" @@ -30391,14 +30478,14 @@ fi fi if test "x$PKGCONFIG" != "xno"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libnghttp2 options with pkg-config" >&5 -printf %s "checking for libnghttp2 options with pkg-config... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libngtcp2 options with pkg-config" >&5 +printf %s "checking for libngtcp2 options with pkg-config... " >&6; } itexists=` - if test -n "$want_h2_path"; then - PKG_CONFIG_LIBDIR="$want_h2_path" + if test -n "$want_tcp2_path"; then + PKG_CONFIG_LIBDIR="$want_tcp2_path" export PKG_CONFIG_LIBDIR fi - $PKGCONFIG --exists libnghttp2 >/dev/null 2>&1 && echo 1` + $PKGCONFIG --exists libngtcp2 >/dev/null 2>&1 && echo 1` if test -z "$itexists"; then PKGCONFIG="no" @@ -30412,49 +30499,50 @@ printf "%s\n" "found" >&6; } if test "$PKGCONFIG" != "no" ; then - LIB_H2=` - if test -n "$want_h2_path"; then - PKG_CONFIG_LIBDIR="$want_h2_path" + LIB_TCP2=` + if test -n "$want_tcp2_path"; then + PKG_CONFIG_LIBDIR="$want_tcp2_path" export PKG_CONFIG_LIBDIR fi - $PKGCONFIG --libs-only-l libnghttp2` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -l is $LIB_H2" >&5 -printf "%s\n" "$as_me: -l is $LIB_H2" >&6;} + $PKGCONFIG --libs-only-l libngtcp2` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -l is $LIB_TCP2" >&5 +printf "%s\n" "$as_me: -l is $LIB_TCP2" >&6;} - CPP_H2=` - if test -n "$want_h2_path"; then - PKG_CONFIG_LIBDIR="$want_h2_path" + CPP_TCP2=` + if test -n "$want_tcp2_path"; then + PKG_CONFIG_LIBDIR="$want_tcp2_path" export PKG_CONFIG_LIBDIR fi - $PKGCONFIG --cflags-only-I libnghttp2` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -I is $CPP_H2" >&5 -printf "%s\n" "$as_me: -I is $CPP_H2" >&6;} + $PKGCONFIG --cflags-only-I libngtcp2` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -I is $CPP_TCP2" >&5 +printf "%s\n" "$as_me: -I is $CPP_TCP2" >&6;} - LD_H2=` - if test -n "$want_h2_path"; then - PKG_CONFIG_LIBDIR="$want_h2_path" + LD_TCP2=` + if test -n "$want_tcp2_path"; then + PKG_CONFIG_LIBDIR="$want_tcp2_path" export PKG_CONFIG_LIBDIR fi - $PKGCONFIG --libs-only-L libnghttp2` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -L is $LD_H2" >&5 -printf "%s\n" "$as_me: -L is $LD_H2" >&6;} + $PKGCONFIG --libs-only-L libngtcp2` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -L is $LD_TCP2" >&5 +printf "%s\n" "$as_me: -L is $LD_TCP2" >&6;} - LDFLAGS="$LDFLAGS $LD_H2" - CPPFLAGS="$CPPFLAGS $CPP_H2" - LIBS="$LIB_H2 $LIBS" + LDFLAGS="$LDFLAGS $LD_TCP2" + CPPFLAGS="$CPPFLAGS $CPP_TCP2" + LIBS="$LIB_TCP2 $LIBS" - # use nghttp2_session_set_local_window_size to require nghttp2 - # >= 1.12.0 - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for nghttp2_session_set_local_window_size in -lnghttp2" >&5 -printf %s "checking for nghttp2_session_set_local_window_size in -lnghttp2... " >&6; } -if test ${ac_cv_lib_nghttp2_nghttp2_session_set_local_window_size+y} + if test "x$cross_compiling" != "xyes"; then + DIR_TCP2=`echo $LD_TCP2 | $SED -e 's/^-L//'` + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ngtcp2_conn_client_new_versioned in -lngtcp2" >&5 +printf %s "checking for ngtcp2_conn_client_new_versioned in -lngtcp2... " >&6; } +if test ${ac_cv_lib_ngtcp2_ngtcp2_conn_client_new_versioned+y} then : printf %s "(cached) " >&6 else $as_nop ac_check_lib_save_LIBS=$LIBS -LIBS="-lnghttp2 $LIBS" +LIBS="-lngtcp2 $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -30462,42 +30550,45 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char nghttp2_session_set_local_window_size (); +char ngtcp2_conn_client_new_versioned (); int main (void) { -return nghttp2_session_set_local_window_size (); +return ngtcp2_conn_client_new_versioned (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_lib_nghttp2_nghttp2_session_set_local_window_size=yes + ac_cv_lib_ngtcp2_ngtcp2_conn_client_new_versioned=yes else $as_nop - ac_cv_lib_nghttp2_nghttp2_session_set_local_window_size=no + ac_cv_lib_ngtcp2_ngtcp2_conn_client_new_versioned=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nghttp2_nghttp2_session_set_local_window_size" >&5 -printf "%s\n" "$ac_cv_lib_nghttp2_nghttp2_session_set_local_window_size" >&6; } -if test "x$ac_cv_lib_nghttp2_nghttp2_session_set_local_window_size" = xyes +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ngtcp2_ngtcp2_conn_client_new_versioned" >&5 +printf "%s\n" "$ac_cv_lib_ngtcp2_ngtcp2_conn_client_new_versioned" >&6; } +if test "x$ac_cv_lib_ngtcp2_ngtcp2_conn_client_new_versioned" = xyes then : - for ac_header in nghttp2/nghttp2.h + for ac_header in ngtcp2/ngtcp2.h do : - ac_fn_c_check_header_compile "$LINENO" "nghttp2/nghttp2.h" "ac_cv_header_nghttp2_nghttp2_h" "$ac_includes_default" -if test "x$ac_cv_header_nghttp2_nghttp2_h" = xyes + ac_fn_c_check_header_compile "$LINENO" "ngtcp2/ngtcp2.h" "ac_cv_header_ngtcp2_ngtcp2_h" "$ac_includes_default" +if test "x$ac_cv_header_ngtcp2_ngtcp2_h" = xyes then : - printf "%s\n" "#define HAVE_NGHTTP2_NGHTTP2_H 1" >>confdefs.h - curl_h2_msg="enabled (nghttp2)" - NGHTTP2_ENABLED=1 + printf "%s\n" "#define HAVE_NGTCP2_NGTCP2_H 1" >>confdefs.h + NGTCP2_ENABLED=1 -printf "%s\n" "#define USE_NGHTTP2 1" >>confdefs.h +printf "%s\n" "#define USE_NGTCP2 1" >>confdefs.h - USE_NGHTTP2=1 + USE_NGTCP2=1 + CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_TCP2" + export CURL_LIBRARY_PATH + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Added $DIR_TCP2 to CURL_LIBRARY_PATH" >&5 +printf "%s\n" "$as_me: Added $DIR_TCP2 to CURL_LIBRARY_PATH" >&6;} fi @@ -30512,44 +30603,14 @@ fi else - if test X"$want_h2" != Xdefault; then - as_fn_error $? "--with-nghttp2 was specified but could not find libnghttp2 pkg-config file." "$LINENO" 5 + if test X"$want_tcp2" != Xdefault; then + as_fn_error $? "--with-ngtcp2 was specified but could not find ngtcp2 pkg-config file." "$LINENO" 5 fi fi fi - -OPT_TCP2="yes" - -if test "x$disable_http" = "xyes"; then - # without HTTP, ngtcp2 is no use - OPT_TCP2="no" -fi - - -# Check whether --with-ngtcp2 was given. -if test ${with_ngtcp2+y} -then : - withval=$with_ngtcp2; OPT_TCP2=$withval -fi - -case "$OPT_TCP2" in - no) - want_tcp2="no" - ;; - yes) - want_tcp2="default" - want_tcp2_path="" - ;; - *) - want_tcp2="yes" - want_tcp2_path="$withval/lib/pkgconfig" - ;; -esac - -curl_tcp2_msg="no (--with-ngtcp2)" -if test X"$want_tcp2" != Xno; then +if test "x$NGTCP2_ENABLED" = "x1" -a "x$OPENSSL_ENABLED" = "x1"; then CLEANLDFLAGS="$LDFLAGS" CLEANCPPFLAGS="$CPPFLAGS" CLEANLIBS="$LIBS" @@ -30671,14 +30732,14 @@ fi fi if test "x$PKGCONFIG" != "xno"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libngtcp2 options with pkg-config" >&5 -printf %s "checking for libngtcp2 options with pkg-config... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libngtcp2_crypto_openssl options with pkg-config" >&5 +printf %s "checking for libngtcp2_crypto_openssl options with pkg-config... " >&6; } itexists=` if test -n "$want_tcp2_path"; then PKG_CONFIG_LIBDIR="$want_tcp2_path" export PKG_CONFIG_LIBDIR fi - $PKGCONFIG --exists libngtcp2 >/dev/null 2>&1 && echo 1` + $PKGCONFIG --exists libngtcp2_crypto_openssl >/dev/null 2>&1 && echo 1` if test -z "$itexists"; then PKGCONFIG="no" @@ -30692,50 +30753,50 @@ printf "%s\n" "found" >&6; } if test "$PKGCONFIG" != "no" ; then - LIB_TCP2=` + LIB_NGTCP2_CRYPTO_OPENSSL=` if test -n "$want_tcp2_path"; then PKG_CONFIG_LIBDIR="$want_tcp2_path" export PKG_CONFIG_LIBDIR fi - $PKGCONFIG --libs-only-l libngtcp2` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -l is $LIB_TCP2" >&5 -printf "%s\n" "$as_me: -l is $LIB_TCP2" >&6;} + $PKGCONFIG --libs-only-l libngtcp2_crypto_openssl` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -l is $LIB_NGTCP2_CRYPTO_OPENSSL" >&5 +printf "%s\n" "$as_me: -l is $LIB_NGTCP2_CRYPTO_OPENSSL" >&6;} - CPP_TCP2=` + CPP_NGTCP2_CRYPTO_OPENSSL=` if test -n "$want_tcp2_path"; then PKG_CONFIG_LIBDIR="$want_tcp2_path" export PKG_CONFIG_LIBDIR fi - $PKGCONFIG --cflags-only-I libngtcp2` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -I is $CPP_TCP2" >&5 -printf "%s\n" "$as_me: -I is $CPP_TCP2" >&6;} + $PKGCONFIG --cflags-only-I libngtcp2_crypto_openssl` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -I is $CPP_NGTCP2_CRYPTO_OPENSSL" >&5 +printf "%s\n" "$as_me: -I is $CPP_NGTCP2_CRYPTO_OPENSSL" >&6;} - LD_TCP2=` + LD_NGTCP2_CRYPTO_OPENSSL=` if test -n "$want_tcp2_path"; then PKG_CONFIG_LIBDIR="$want_tcp2_path" export PKG_CONFIG_LIBDIR fi - $PKGCONFIG --libs-only-L libngtcp2` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -L is $LD_TCP2" >&5 -printf "%s\n" "$as_me: -L is $LD_TCP2" >&6;} + $PKGCONFIG --libs-only-L libngtcp2_crypto_openssl` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -L is $LD_NGTCP2_CRYPTO_OPENSSL" >&5 +printf "%s\n" "$as_me: -L is $LD_NGTCP2_CRYPTO_OPENSSL" >&6;} - LDFLAGS="$LDFLAGS $LD_TCP2" - CPPFLAGS="$CPPFLAGS $CPP_TCP2" - LIBS="$LIB_TCP2 $LIBS" + LDFLAGS="$LDFLAGS $LD_NGTCP2_CRYPTO_OPENSSL" + CPPFLAGS="$CPPFLAGS $CPP_NGTCP2_CRYPTO_OPENSSL" + LIBS="$LIB_NGTCP2_CRYPTO_OPENSSL $LIBS" if test "x$cross_compiling" != "xyes"; then - DIR_TCP2=`echo $LD_TCP2 | $SED -e 's/^-L//'` + DIR_NGTCP2_CRYPTO_OPENSSL=`echo $LD_NGTCP2_CRYPTO_OPENSSL | $SED -e 's/^-L//'` fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ngtcp2_conn_client_new_versioned in -lngtcp2" >&5 -printf %s "checking for ngtcp2_conn_client_new_versioned in -lngtcp2... " >&6; } -if test ${ac_cv_lib_ngtcp2_ngtcp2_conn_client_new_versioned+y} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ngtcp2_crypto_recv_client_initial_cb in -lngtcp2_crypto_openssl" >&5 +printf %s "checking for ngtcp2_crypto_recv_client_initial_cb in -lngtcp2_crypto_openssl... " >&6; } +if test ${ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_recv_client_initial_cb+y} then : printf %s "(cached) " >&6 else $as_nop ac_check_lib_save_LIBS=$LIBS -LIBS="-lngtcp2 $LIBS" +LIBS="-lngtcp2_crypto_openssl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -30743,45 +30804,45 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ngtcp2_conn_client_new_versioned (); +char ngtcp2_crypto_recv_client_initial_cb (); int main (void) { -return ngtcp2_conn_client_new_versioned (); +return ngtcp2_crypto_recv_client_initial_cb (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_lib_ngtcp2_ngtcp2_conn_client_new_versioned=yes + ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_recv_client_initial_cb=yes else $as_nop - ac_cv_lib_ngtcp2_ngtcp2_conn_client_new_versioned=no + ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_recv_client_initial_cb=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ngtcp2_ngtcp2_conn_client_new_versioned" >&5 -printf "%s\n" "$ac_cv_lib_ngtcp2_ngtcp2_conn_client_new_versioned" >&6; } -if test "x$ac_cv_lib_ngtcp2_ngtcp2_conn_client_new_versioned" = xyes +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_recv_client_initial_cb" >&5 +printf "%s\n" "$ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_recv_client_initial_cb" >&6; } +if test "x$ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_recv_client_initial_cb" = xyes then : - for ac_header in ngtcp2/ngtcp2.h + for ac_header in ngtcp2/ngtcp2_crypto.h do : - ac_fn_c_check_header_compile "$LINENO" "ngtcp2/ngtcp2.h" "ac_cv_header_ngtcp2_ngtcp2_h" "$ac_includes_default" -if test "x$ac_cv_header_ngtcp2_ngtcp2_h" = xyes + ac_fn_c_check_header_compile "$LINENO" "ngtcp2/ngtcp2_crypto.h" "ac_cv_header_ngtcp2_ngtcp2_crypto_h" "$ac_includes_default" +if test "x$ac_cv_header_ngtcp2_ngtcp2_crypto_h" = xyes then : - printf "%s\n" "#define HAVE_NGTCP2_NGTCP2_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_NGTCP2_NGTCP2_CRYPTO_H 1" >>confdefs.h NGTCP2_ENABLED=1 -printf "%s\n" "#define USE_NGTCP2 1" >>confdefs.h +printf "%s\n" "#define USE_NGTCP2_CRYPTO_OPENSSL 1" >>confdefs.h - USE_NGTCP2=1 + USE_NGTCP2_CRYPTO_OPENSSL=1 - CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_TCP2" + CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_NGTCP2_CRYPTO_OPENSSL" export CURL_LIBRARY_PATH - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Added $DIR_TCP2 to CURL_LIBRARY_PATH" >&5 -printf "%s\n" "$as_me: Added $DIR_TCP2 to CURL_LIBRARY_PATH" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Added $DIR_NGTCP2_CRYPTO_OPENSSL to CURL_LIBRARY_PATH" >&5 +printf "%s\n" "$as_me: Added $DIR_NGTCP2_CRYPTO_OPENSSL to CURL_LIBRARY_PATH" >&6;} fi @@ -30797,13 +30858,12 @@ fi else if test X"$want_tcp2" != Xdefault; then - as_fn_error $? "--with-ngtcp2 was specified but could not find ngtcp2 pkg-config file." "$LINENO" 5 + as_fn_error $? "--with-ngtcp2 was specified but could not find ngtcp2_crypto_openssl pkg-config file." "$LINENO" 5 fi fi - fi -if test "x$NGTCP2_ENABLED" = "x1" -a "x$OPENSSL_ENABLED" = "x1"; then +if test "x$NGTCP2_ENABLED" = "x1" -a "x$GNUTLS_ENABLED" = "x1"; then CLEANLDFLAGS="$LDFLAGS" CLEANCPPFLAGS="$CPPFLAGS" CLEANLIBS="$LIBS" @@ -30925,14 +30985,14 @@ fi fi if test "x$PKGCONFIG" != "xno"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libngtcp2_crypto_openssl options with pkg-config" >&5 -printf %s "checking for libngtcp2_crypto_openssl options with pkg-config... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libngtcp2_crypto_gnutls options with pkg-config" >&5 +printf %s "checking for libngtcp2_crypto_gnutls options with pkg-config... " >&6; } itexists=` if test -n "$want_tcp2_path"; then PKG_CONFIG_LIBDIR="$want_tcp2_path" export PKG_CONFIG_LIBDIR fi - $PKGCONFIG --exists libngtcp2_crypto_openssl >/dev/null 2>&1 && echo 1` + $PKGCONFIG --exists libngtcp2_crypto_gnutls >/dev/null 2>&1 && echo 1` if test -z "$itexists"; then PKGCONFIG="no" @@ -30946,50 +31006,50 @@ printf "%s\n" "found" >&6; } if test "$PKGCONFIG" != "no" ; then - LIB_NGTCP2_CRYPTO_OPENSSL=` + LIB_NGTCP2_CRYPTO_GNUTLS=` if test -n "$want_tcp2_path"; then PKG_CONFIG_LIBDIR="$want_tcp2_path" export PKG_CONFIG_LIBDIR fi - $PKGCONFIG --libs-only-l libngtcp2_crypto_openssl` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -l is $LIB_NGTCP2_CRYPTO_OPENSSL" >&5 -printf "%s\n" "$as_me: -l is $LIB_NGTCP2_CRYPTO_OPENSSL" >&6;} + $PKGCONFIG --libs-only-l libngtcp2_crypto_gnutls` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -l is $LIB_NGTCP2_CRYPTO_GNUTLS" >&5 +printf "%s\n" "$as_me: -l is $LIB_NGTCP2_CRYPTO_GNUTLS" >&6;} - CPP_NGTCP2_CRYPTO_OPENSSL=` + CPP_NGTCP2_CRYPTO_GNUTLS=` if test -n "$want_tcp2_path"; then PKG_CONFIG_LIBDIR="$want_tcp2_path" export PKG_CONFIG_LIBDIR fi - $PKGCONFIG --cflags-only-I libngtcp2_crypto_openssl` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -I is $CPP_NGTCP2_CRYPTO_OPENSSL" >&5 -printf "%s\n" "$as_me: -I is $CPP_NGTCP2_CRYPTO_OPENSSL" >&6;} + $PKGCONFIG --cflags-only-I libngtcp2_crypto_gnutls` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -I is $CPP_NGTCP2_CRYPTO_GNUTLS" >&5 +printf "%s\n" "$as_me: -I is $CPP_NGTCP2_CRYPTO_GNUTLS" >&6;} - LD_NGTCP2_CRYPTO_OPENSSL=` + LD_NGTCP2_CRYPTO_GNUTLS=` if test -n "$want_tcp2_path"; then PKG_CONFIG_LIBDIR="$want_tcp2_path" export PKG_CONFIG_LIBDIR fi - $PKGCONFIG --libs-only-L libngtcp2_crypto_openssl` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -L is $LD_NGTCP2_CRYPTO_OPENSSL" >&5 -printf "%s\n" "$as_me: -L is $LD_NGTCP2_CRYPTO_OPENSSL" >&6;} + $PKGCONFIG --libs-only-L libngtcp2_crypto_gnutls` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -L is $LD_NGTCP2_CRYPTO_GNUTLS" >&5 +printf "%s\n" "$as_me: -L is $LD_NGTCP2_CRYPTO_GNUTLS" >&6;} - LDFLAGS="$LDFLAGS $LD_NGTCP2_CRYPTO_OPENSSL" - CPPFLAGS="$CPPFLAGS $CPP_NGTCP2_CRYPTO_OPENSSL" - LIBS="$LIB_NGTCP2_CRYPTO_OPENSSL $LIBS" + LDFLAGS="$LDFLAGS $LD_NGTCP2_CRYPTO_GNUTLS" + CPPFLAGS="$CPPFLAGS $CPP_NGTCP2_CRYPTO_GNUTLS" + LIBS="$LIB_NGTCP2_CRYPTO_GNUTLS $LIBS" if test "x$cross_compiling" != "xyes"; then - DIR_NGTCP2_CRYPTO_OPENSSL=`echo $LD_NGTCP2_CRYPTO_OPENSSL | $SED -e 's/^-L//'` + DIR_NGTCP2_CRYPTO_GNUTLS=`echo $LD_NGTCP2_CRYPTO_GNUTLS | $SED -e 's/^-L//'` fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ngtcp2_crypto_ctx_initial in -lngtcp2_crypto_openssl" >&5 -printf %s "checking for ngtcp2_crypto_ctx_initial in -lngtcp2_crypto_openssl... " >&6; } -if test ${ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_ctx_initial+y} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ngtcp2_crypto_recv_client_initial_cb in -lngtcp2_crypto_gnutls" >&5 +printf %s "checking for ngtcp2_crypto_recv_client_initial_cb in -lngtcp2_crypto_gnutls... " >&6; } +if test ${ac_cv_lib_ngtcp2_crypto_gnutls_ngtcp2_crypto_recv_client_initial_cb+y} then : printf %s "(cached) " >&6 else $as_nop ac_check_lib_save_LIBS=$LIBS -LIBS="-lngtcp2_crypto_openssl $LIBS" +LIBS="-lngtcp2_crypto_gnutls $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -30997,27 +31057,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ngtcp2_crypto_ctx_initial (); +char ngtcp2_crypto_recv_client_initial_cb (); int main (void) { -return ngtcp2_crypto_ctx_initial (); +return ngtcp2_crypto_recv_client_initial_cb (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_ctx_initial=yes + ac_cv_lib_ngtcp2_crypto_gnutls_ngtcp2_crypto_recv_client_initial_cb=yes else $as_nop - ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_ctx_initial=no + ac_cv_lib_ngtcp2_crypto_gnutls_ngtcp2_crypto_recv_client_initial_cb=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_ctx_initial" >&5 -printf "%s\n" "$ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_ctx_initial" >&6; } -if test "x$ac_cv_lib_ngtcp2_crypto_openssl_ngtcp2_crypto_ctx_initial" = xyes +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ngtcp2_crypto_gnutls_ngtcp2_crypto_recv_client_initial_cb" >&5 +printf "%s\n" "$ac_cv_lib_ngtcp2_crypto_gnutls_ngtcp2_crypto_recv_client_initial_cb" >&6; } +if test "x$ac_cv_lib_ngtcp2_crypto_gnutls_ngtcp2_crypto_recv_client_initial_cb" = xyes then : for ac_header in ngtcp2/ngtcp2_crypto.h @@ -31028,14 +31088,14 @@ then : printf "%s\n" "#define HAVE_NGTCP2_NGTCP2_CRYPTO_H 1" >>confdefs.h NGTCP2_ENABLED=1 -printf "%s\n" "#define USE_NGTCP2_CRYPTO_OPENSSL 1" >>confdefs.h +printf "%s\n" "#define USE_NGTCP2_CRYPTO_GNUTLS 1" >>confdefs.h - USE_NGTCP2_CRYPTO_OPENSSL=1 + USE_NGTCP2_CRYPTO_GNUTLS=1 - CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_NGTCP2_CRYPTO_OPENSSL" + CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_NGTCP2_CRYPTO_GNUTLS" export CURL_LIBRARY_PATH - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Added $DIR_NGTCP2_CRYPTO_OPENSSL to CURL_LIBRARY_PATH" >&5 -printf "%s\n" "$as_me: Added $DIR_NGTCP2_CRYPTO_OPENSSL to CURL_LIBRARY_PATH" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Added $DIR_NGTCP2_CRYPTO_GNUTLS to CURL_LIBRARY_PATH" >&5 +printf "%s\n" "$as_me: Added $DIR_NGTCP2_CRYPTO_GNUTLS to CURL_LIBRARY_PATH" >&6;} fi @@ -31051,12 +31111,12 @@ fi else if test X"$want_tcp2" != Xdefault; then - as_fn_error $? "--with-ngtcp2 was specified but could not find ngtcp2_crypto_openssl pkg-config file." "$LINENO" 5 + as_fn_error $? "--with-ngtcp2 was specified but could not find ngtcp2_crypto_gnutls pkg-config file." "$LINENO" 5 fi fi fi -if test "x$NGTCP2_ENABLED" = "x1" -a "x$GNUTLS_ENABLED" = "x1"; then +if test "x$NGTCP2_ENABLED" = "x1" -a "x$WOLFSSL_ENABLED" = "x1"; then CLEANLDFLAGS="$LDFLAGS" CLEANCPPFLAGS="$CPPFLAGS" CLEANLIBS="$LIBS" @@ -31178,14 +31238,14 @@ fi fi if test "x$PKGCONFIG" != "xno"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libngtcp2_crypto_gnutls options with pkg-config" >&5 -printf %s "checking for libngtcp2_crypto_gnutls options with pkg-config... " >&6; } + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libngtcp2_crypto_wolfssl options with pkg-config" >&5 +printf %s "checking for libngtcp2_crypto_wolfssl options with pkg-config... " >&6; } itexists=` if test -n "$want_tcp2_path"; then PKG_CONFIG_LIBDIR="$want_tcp2_path" export PKG_CONFIG_LIBDIR fi - $PKGCONFIG --exists libngtcp2_crypto_gnutls >/dev/null 2>&1 && echo 1` + $PKGCONFIG --exists libngtcp2_crypto_wolfssl >/dev/null 2>&1 && echo 1` if test -z "$itexists"; then PKGCONFIG="no" @@ -31199,50 +31259,50 @@ printf "%s\n" "found" >&6; } if test "$PKGCONFIG" != "no" ; then - LIB_NGTCP2_CRYPTO_GNUTLS=` + LIB_NGTCP2_CRYPTO_WOLFSSL=` if test -n "$want_tcp2_path"; then PKG_CONFIG_LIBDIR="$want_tcp2_path" export PKG_CONFIG_LIBDIR fi - $PKGCONFIG --libs-only-l libngtcp2_crypto_gnutls` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -l is $LIB_NGTCP2_CRYPTO_GNUTLS" >&5 -printf "%s\n" "$as_me: -l is $LIB_NGTCP2_CRYPTO_GNUTLS" >&6;} + $PKGCONFIG --libs-only-l libngtcp2_crypto_wolfssl` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -l is $LIB_NGTCP2_CRYPTO_WOLFSSL" >&5 +printf "%s\n" "$as_me: -l is $LIB_NGTCP2_CRYPTO_WOLFSSL" >&6;} - CPP_NGTCP2_CRYPTO_GNUTLS=` + CPP_NGTCP2_CRYPTO_WOLFSSL=` if test -n "$want_tcp2_path"; then PKG_CONFIG_LIBDIR="$want_tcp2_path" export PKG_CONFIG_LIBDIR fi - $PKGCONFIG --cflags-only-I libngtcp2_crypto_gnutls` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -I is $CPP_NGTCP2_CRYPTO_GNUTLS" >&5 -printf "%s\n" "$as_me: -I is $CPP_NGTCP2_CRYPTO_GNUTLS" >&6;} + $PKGCONFIG --cflags-only-I libngtcp2_crypto_wolfssl` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -I is $CPP_NGTCP2_CRYPTO_WOLFSSL" >&5 +printf "%s\n" "$as_me: -I is $CPP_NGTCP2_CRYPTO_WOLFSSL" >&6;} - LD_NGTCP2_CRYPTO_GNUTLS=` + LD_NGTCP2_CRYPTO_WOLFSSL=` if test -n "$want_tcp2_path"; then PKG_CONFIG_LIBDIR="$want_tcp2_path" export PKG_CONFIG_LIBDIR fi - $PKGCONFIG --libs-only-L libngtcp2_crypto_gnutls` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -L is $LD_NGTCP2_CRYPTO_GNUTLS" >&5 -printf "%s\n" "$as_me: -L is $LD_NGTCP2_CRYPTO_GNUTLS" >&6;} + $PKGCONFIG --libs-only-L libngtcp2_crypto_wolfssl` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: -L is $LD_NGTCP2_CRYPTO_WOLFSSL" >&5 +printf "%s\n" "$as_me: -L is $LD_NGTCP2_CRYPTO_WOLFSSL" >&6;} - LDFLAGS="$LDFLAGS $LD_NGTCP2_CRYPTO_GNUTLS" - CPPFLAGS="$CPPFLAGS $CPP_NGTCP2_CRYPTO_GNUTLS" - LIBS="$LIB_NGTCP2_CRYPTO_GNUTLS $LIBS" + LDFLAGS="$LDFLAGS $LD_NGTCP2_CRYPTO_WOLFSSL" + CPPFLAGS="$CPPFLAGS $CPP_NGTCP2_CRYPTO_WOLFSSL" + LIBS="$LIB_NGTCP2_CRYPTO_WOLFSSL $LIBS" if test "x$cross_compiling" != "xyes"; then - DIR_NGTCP2_CRYPTO_GNUTLS=`echo $LD_NGTCP2_CRYPTO_GNUTLS | $SED -e 's/^-L//'` + DIR_NGTCP2_CRYPTO_WOLFSSL=`echo $LD_NGTCP2_CRYPTO_WOLFSSL | $SED -e 's/^-L//'` fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ngtcp2_crypto_ctx_initial in -lngtcp2_crypto_gnutls" >&5 -printf %s "checking for ngtcp2_crypto_ctx_initial in -lngtcp2_crypto_gnutls... " >&6; } -if test ${ac_cv_lib_ngtcp2_crypto_gnutls_ngtcp2_crypto_ctx_initial+y} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for ngtcp2_crypto_recv_client_initial_cb in -lngtcp2_crypto_wolfssl" >&5 +printf %s "checking for ngtcp2_crypto_recv_client_initial_cb in -lngtcp2_crypto_wolfssl... " >&6; } +if test ${ac_cv_lib_ngtcp2_crypto_wolfssl_ngtcp2_crypto_recv_client_initial_cb+y} then : printf %s "(cached) " >&6 else $as_nop ac_check_lib_save_LIBS=$LIBS -LIBS="-lngtcp2_crypto_gnutls $LIBS" +LIBS="-lngtcp2_crypto_wolfssl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -31250,27 +31310,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char ngtcp2_crypto_ctx_initial (); +char ngtcp2_crypto_recv_client_initial_cb (); int main (void) { -return ngtcp2_crypto_ctx_initial (); +return ngtcp2_crypto_recv_client_initial_cb (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO" then : - ac_cv_lib_ngtcp2_crypto_gnutls_ngtcp2_crypto_ctx_initial=yes + ac_cv_lib_ngtcp2_crypto_wolfssl_ngtcp2_crypto_recv_client_initial_cb=yes else $as_nop - ac_cv_lib_ngtcp2_crypto_gnutls_ngtcp2_crypto_ctx_initial=no + ac_cv_lib_ngtcp2_crypto_wolfssl_ngtcp2_crypto_recv_client_initial_cb=no fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ngtcp2_crypto_gnutls_ngtcp2_crypto_ctx_initial" >&5 -printf "%s\n" "$ac_cv_lib_ngtcp2_crypto_gnutls_ngtcp2_crypto_ctx_initial" >&6; } -if test "x$ac_cv_lib_ngtcp2_crypto_gnutls_ngtcp2_crypto_ctx_initial" = xyes +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ngtcp2_crypto_wolfssl_ngtcp2_crypto_recv_client_initial_cb" >&5 +printf "%s\n" "$ac_cv_lib_ngtcp2_crypto_wolfssl_ngtcp2_crypto_recv_client_initial_cb" >&6; } +if test "x$ac_cv_lib_ngtcp2_crypto_wolfssl_ngtcp2_crypto_recv_client_initial_cb" = xyes then : for ac_header in ngtcp2/ngtcp2_crypto.h @@ -31281,14 +31341,14 @@ then : printf "%s\n" "#define HAVE_NGTCP2_NGTCP2_CRYPTO_H 1" >>confdefs.h NGTCP2_ENABLED=1 -printf "%s\n" "#define USE_NGTCP2_CRYPTO_GNUTLS 1" >>confdefs.h +printf "%s\n" "#define USE_NGTCP2_CRYPTO_WOLFSSL 1" >>confdefs.h - USE_NGTCP2_CRYPTO_GNUTLS=1 + USE_NGTCP2_CRYPTO_WOLFSSL=1 - CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_NGTCP2_CRYPTO_GNUTLS" + CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_NGTCP2_CRYPTO_WOLFSSL" export CURL_LIBRARY_PATH - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Added $DIR_NGTCP2_CRYPTO_GNUTLS to CURL_LIBRARY_PATH" >&5 -printf "%s\n" "$as_me: Added $DIR_NGTCP2_CRYPTO_GNUTLS to CURL_LIBRARY_PATH" >&6;} + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Added $DIR_NGTCP2_CRYPTO_WOLFSSL to CURL_LIBRARY_PATH" >&5 +printf "%s\n" "$as_me: Added $DIR_NGTCP2_CRYPTO_WOLFSSL to CURL_LIBRARY_PATH" >&6;} fi @@ -31304,7 +31364,7 @@ fi else if test X"$want_tcp2" != Xdefault; then - as_fn_error $? "--with-ngtcp2 was specified but could not find ngtcp2_crypto_gnutls pkg-config file." "$LINENO" 5 + as_fn_error $? "--with-ngtcp2 was specified but could not find ngtcp2_crypto_wolfssl pkg-config file." "$LINENO" 5 fi fi fi @@ -31895,6 +31955,125 @@ fi fi +OPT_MSH3="no" + +if test "x$disable_http" = "xyes" -o "x$USE_NGTCP" = "x1"; then + # without HTTP or with ngtcp2, msh3 is no use + OPT_MSH3="no" +fi + + +# Check whether --with-msh3 was given. +if test ${with_msh3+y} +then : + withval=$with_msh3; OPT_MSH3=$withval +fi + +case "$OPT_MSH3" in + no) + want_msh3="no" + ;; + yes) + want_msh3="default" + want_msh3_path="" + ;; + *) + want_msh3="yes" + want_msh3_path="$withval" + ;; +esac + +if test X"$want_msh3" != Xno; then + + if test "$NGHTTP3_ENABLED" = 1; then + as_fn_error $? "--with-msh3 and --with-ngtcp2 are mutually exclusive" "$LINENO" 5 + fi + + CLEANLDFLAGS="$LDFLAGS" + CLEANCPPFLAGS="$CPPFLAGS" + CLEANLIBS="$LIBS" + + if test -n "$want_msh3_path"; then + LD_MSH3="-L$want_msh3_path/lib" + CPP_MSH3="-I$want_msh3_path/include" + DIR_MSH3="$want_msh3_path/lib" + LDFLAGS="$LDFLAGS $LD_MSH3" + CPPFLAGS="$CPPFLAGS $CPP_MSH3" + fi + LIBS="-lmsh3 $LIBS" + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for MsH3ApiOpen in -lmsh3" >&5 +printf %s "checking for MsH3ApiOpen in -lmsh3... " >&6; } +if test ${ac_cv_lib_msh3_MsH3ApiOpen+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_check_lib_save_LIBS=$LIBS +LIBS="-lmsh3 $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +#ifdef __cplusplus +extern "C" +#endif +char MsH3ApiOpen (); +int main (void) +{ +return MsH3ApiOpen (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + ac_cv_lib_msh3_MsH3ApiOpen=yes +else $as_nop + ac_cv_lib_msh3_MsH3ApiOpen=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_msh3_MsH3ApiOpen" >&5 +printf "%s\n" "$ac_cv_lib_msh3_MsH3ApiOpen" >&6; } +if test "x$ac_cv_lib_msh3_MsH3ApiOpen" = xyes +then : + + for ac_header in msh3.h +do : + ac_fn_c_check_header_compile "$LINENO" "msh3.h" "ac_cv_header_msh3_h" "$ac_includes_default" +if test "x$ac_cv_header_msh3_h" = xyes +then : + printf "%s\n" "#define HAVE_MSH3_H 1" >>confdefs.h + curl_h3_msg="enabled (msh3)" + MSH3_ENABLED=1 + +printf "%s\n" "#define USE_MSH3 1" >>confdefs.h + + USE_MSH3=1 + + CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_MSH3" + export CURL_LIBRARY_PATH + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: Added $DIR_MSH3 to CURL_LIBRARY_PATH" >&5 +printf "%s\n" "$as_me: Added $DIR_MSH3 to CURL_LIBRARY_PATH" >&6;} +else $as_nop + experimental="$experimental HTTP3" + +fi + +done + +else $as_nop + LDFLAGS=$CLEANLDFLAGS + CPPFLAGS=$CLEANCPPFLAGS + LIBS=$CLEANLIBS + +fi + +fi + + OPT_ZSH_FPATH=default # Check whether --with-zsh-functions-dir was given. @@ -32078,181 +32257,6 @@ printf "%s\n" "found" >&6; } ;; esac - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for malloc.h" >&5 -printf %s "checking for malloc.h... " >&6; } -if test ${curl_cv_header_malloc_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#include - -int main (void) -{ - - void *p = malloc(10); - void *q = calloc(10,10); - free(p); - free(q); - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - - curl_cv_header_malloc_h="yes" - -else $as_nop - - curl_cv_header_malloc_h="no" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $curl_cv_header_malloc_h" >&5 -printf "%s\n" "$curl_cv_header_malloc_h" >&6; } - if test "$curl_cv_header_malloc_h" = "yes"; then - -printf "%s\n" "#define HAVE_MALLOC_H 1" >>confdefs.h - - # - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#include - -int main (void) -{ - - void *p = malloc(10); - void *q = calloc(10,10); - free(p); - free(q); - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - - curl_cv_need_header_malloc_h="no" - -else $as_nop - - curl_cv_need_header_malloc_h="yes" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - # - case "$curl_cv_need_header_malloc_h" in - yes) - -printf "%s\n" "#define NEED_MALLOC_H 1" >>confdefs.h - - ;; - esac - fi - - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for memory.h" >&5 -printf %s "checking for memory.h... " >&6; } -if test ${curl_cv_header_memory_h+y} -then : - printf %s "(cached) " >&6 -else $as_nop - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#include - -int main (void) -{ - - void *p = malloc(10); - void *q = calloc(10,10); - free(p); - free(q); - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - - curl_cv_header_memory_h="yes" - -else $as_nop - - curl_cv_header_memory_h="no" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $curl_cv_header_memory_h" >&5 -printf "%s\n" "$curl_cv_header_memory_h" >&6; } - if test "$curl_cv_header_memory_h" = "yes"; then - -printf "%s\n" "#define HAVE_MEMORY_H 1" >>confdefs.h - - # - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#include - -int main (void) -{ - - void *p = malloc(10); - void *q = calloc(10,10); - free(p); - free(q); - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - - curl_cv_need_header_memory_h="no" - -else $as_nop - - curl_cv_need_header_memory_h="yes" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - # - case "$curl_cv_need_header_memory_h" in - yes) - -printf "%s\n" "#define NEED_MEMORY_H 1" >>confdefs.h - - ;; - esac - fi - - ac_fn_c_check_header_compile "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" " #ifdef HAVE_SYS_TYPES_H #include @@ -32765,7 +32769,7 @@ then : printf "%s\n" "#define HAVE_NETINET_TCP_H 1" >>confdefs.h fi -ac_fn_c_check_header_compile "$LINENO" "netdb.h" "ac_cv_header_netdb_h" " +ac_fn_c_check_header_compile "$LINENO" "netinet/udp.h" "ac_cv_header_netinet_udp_h" " #ifdef HAVE_SYS_TYPES_H #include #endif @@ -32792,12 +32796,12 @@ ac_fn_c_check_header_compile "$LINENO" "netdb.h" "ac_cv_header_netdb_h" " " -if test "x$ac_cv_header_netdb_h" = xyes +if test "x$ac_cv_header_netinet_udp_h" = xyes then : - printf "%s\n" "#define HAVE_NETDB_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_NETINET_UDP_H 1" >>confdefs.h fi -ac_fn_c_check_header_compile "$LINENO" "sys/sockio.h" "ac_cv_header_sys_sockio_h" " +ac_fn_c_check_header_compile "$LINENO" "netdb.h" "ac_cv_header_netdb_h" " #ifdef HAVE_SYS_TYPES_H #include #endif @@ -32824,12 +32828,12 @@ ac_fn_c_check_header_compile "$LINENO" "sys/sockio.h" "ac_cv_header_sys_sockio_h " -if test "x$ac_cv_header_sys_sockio_h" = xyes +if test "x$ac_cv_header_netdb_h" = xyes then : - printf "%s\n" "#define HAVE_SYS_SOCKIO_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_NETDB_H 1" >>confdefs.h fi -ac_fn_c_check_header_compile "$LINENO" "sys/stat.h" "ac_cv_header_sys_stat_h" " +ac_fn_c_check_header_compile "$LINENO" "sys/sockio.h" "ac_cv_header_sys_sockio_h" " #ifdef HAVE_SYS_TYPES_H #include #endif @@ -32856,12 +32860,12 @@ ac_fn_c_check_header_compile "$LINENO" "sys/stat.h" "ac_cv_header_sys_stat_h" " " -if test "x$ac_cv_header_sys_stat_h" = xyes +if test "x$ac_cv_header_sys_sockio_h" = xyes then : - printf "%s\n" "#define HAVE_SYS_STAT_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYS_SOCKIO_H 1" >>confdefs.h fi -ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" " +ac_fn_c_check_header_compile "$LINENO" "sys/stat.h" "ac_cv_header_sys_stat_h" " #ifdef HAVE_SYS_TYPES_H #include #endif @@ -32888,12 +32892,12 @@ ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" " -if test "x$ac_cv_header_sys_param_h" = xyes +if test "x$ac_cv_header_sys_stat_h" = xyes then : - printf "%s\n" "#define HAVE_SYS_PARAM_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYS_STAT_H 1" >>confdefs.h fi -ac_fn_c_check_header_compile "$LINENO" "termios.h" "ac_cv_header_termios_h" " +ac_fn_c_check_header_compile "$LINENO" "sys/param.h" "ac_cv_header_sys_param_h" " #ifdef HAVE_SYS_TYPES_H #include #endif @@ -32920,12 +32924,12 @@ ac_fn_c_check_header_compile "$LINENO" "termios.h" "ac_cv_header_termios_h" " " -if test "x$ac_cv_header_termios_h" = xyes +if test "x$ac_cv_header_sys_param_h" = xyes then : - printf "%s\n" "#define HAVE_TERMIOS_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_SYS_PARAM_H 1" >>confdefs.h fi -ac_fn_c_check_header_compile "$LINENO" "termio.h" "ac_cv_header_termio_h" " +ac_fn_c_check_header_compile "$LINENO" "termios.h" "ac_cv_header_termios_h" " #ifdef HAVE_SYS_TYPES_H #include #endif @@ -32952,12 +32956,12 @@ ac_fn_c_check_header_compile "$LINENO" "termio.h" "ac_cv_header_termio_h" " " -if test "x$ac_cv_header_termio_h" = xyes +if test "x$ac_cv_header_termios_h" = xyes then : - printf "%s\n" "#define HAVE_TERMIO_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_TERMIOS_H 1" >>confdefs.h fi -ac_fn_c_check_header_compile "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" " +ac_fn_c_check_header_compile "$LINENO" "termio.h" "ac_cv_header_termio_h" " #ifdef HAVE_SYS_TYPES_H #include #endif @@ -32984,12 +32988,12 @@ ac_fn_c_check_header_compile "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" " " -if test "x$ac_cv_header_fcntl_h" = xyes +if test "x$ac_cv_header_termio_h" = xyes then : - printf "%s\n" "#define HAVE_FCNTL_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_TERMIO_H 1" >>confdefs.h fi -ac_fn_c_check_header_compile "$LINENO" "alloca.h" "ac_cv_header_alloca_h" " +ac_fn_c_check_header_compile "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" " #ifdef HAVE_SYS_TYPES_H #include #endif @@ -33016,9 +33020,9 @@ ac_fn_c_check_header_compile "$LINENO" "alloca.h" "ac_cv_header_alloca_h" " " -if test "x$ac_cv_header_alloca_h" = xyes +if test "x$ac_cv_header_fcntl_h" = xyes then : - printf "%s\n" "#define HAVE_ALLOCA_H 1" >>confdefs.h + printf "%s\n" "#define HAVE_FCNTL_H 1" >>confdefs.h fi ac_fn_c_check_header_compile "$LINENO" "io.h" "ac_cv_header_io_h" " @@ -33738,7 +33742,7 @@ fi - ac_fn_c_check_header_compile "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" "$ac_includes_default" if test "x$ac_cv_header_sys_types_h" = xyes then : printf "%s\n" "#define HAVE_SYS_TYPES_H 1" >>confdefs.h @@ -33776,10 +33780,6 @@ else $as_nop #include #ifdef HAVE_WINSOCK2_H #include -#else -#ifdef HAVE_WINSOCK_H -#include -#endif #endif #endif #ifdef HAVE_SYS_TYPES_H @@ -33835,10 +33835,9 @@ printf "%s\n" "#define HAVE_STRUCT_TIMEVAL 1" >>confdefs.h { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking run-time libs availability" >&5 printf %s "checking run-time libs availability... " >&6; } - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes + case $host_os in + darwin*) + if test "$cross_compiling" = yes then : { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -33868,59 +33867,56 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - LD_LIBRARY_PATH=$old # restore - - - fi - - -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5 -printf %s "checking size of size_t... " >&6; } -if test ${ac_cv_sizeof_size_t+y} + ;; + *) + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes then : - printf %s "(cached) " >&6 + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } else $as_nop - for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include - - -int main (void) +int main() { -switch (0) case 0: case (sizeof (size_t) == $ac_size):; - ; - return 0; + return 0; } + _ACEOF -if ac_fn_c_try_compile "$LINENO" +if ac_fn_c_try_run "$LINENO" then : - ac_cv_sizeof_size_t=$ac_size -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - if test x$ac_cv_sizeof_size_t != x ; then break; fi -done + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: fine" >&5 +printf "%s\n" "fine" >&6; } +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: failed" >&5 +printf "%s\n" "failed" >&6; } + as_fn_error $? "one or more libs available at link-time are not available run-time. Libs used at link-time: $LIBS" "$LINENO" 5 fi - -if test x$ac_cv_sizeof_size_t = x ; then - as_fn_error $? "cannot determine a size for size_t" "$LINENO" 5 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_size_t" >&5 -printf "%s\n" "$ac_cv_sizeof_size_t" >&6; } -printf "%s\n" "#define SIZEOF_SIZE_T $ac_cv_sizeof_size_t" >>confdefs.h + LD_LIBRARY_PATH=$old # restore + ;; + esac -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 -printf %s "checking size of long... " >&6; } -if test ${ac_cv_sizeof_long+y} -then : - printf %s "(cached) " >&6 -else $as_nop - for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + fi + + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of size_t" >&5 +printf %s "checking size of size_t... " >&6; } + r=0 + for typesize in 8 4 2 16 1; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -33928,38 +33924,48 @@ else $as_nop int main (void) { -switch (0) case 0: case (sizeof (long) == $ac_size):; +switch(0) { + case 0: + case (sizeof(size_t) == $typesize):; + } + ; return 0; } _ACEOF if ac_fn_c_try_compile "$LINENO" then : - ac_cv_sizeof_long=$ac_size + + r=$typesize +else $as_nop + + r=0 fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - if test x$ac_cv_sizeof_long != x ; then break; fi -done + if test $r -gt 0; then + break; + fi + done + if test $r -eq 0; then + as_fn_error $? "Failed to find size of size_t" "$LINENO" 5 + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $r" >&5 +printf "%s\n" "$r" >&6; } + tname=$(echo "ac_cv_sizeof_size_t" | tr A-Z a-z | tr " " "_") + eval "$tname=$r" -fi -if test x$ac_cv_sizeof_long = x ; then - as_fn_error $? "cannot determine a size for long" "$LINENO" 5 -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 -printf "%s\n" "$ac_cv_sizeof_long" >&6; } +printf "%s\n" "#define SIZEOF_SIZE_T $r" >>confdefs.h -printf "%s\n" "#define SIZEOF_LONG $ac_cv_sizeof_long" >>confdefs.h -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 -printf %s "checking size of int... " >&6; } -if test ${ac_cv_sizeof_int+y} -then : - printf %s "(cached) " >&6 -else $as_nop - for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 +printf %s "checking size of long... " >&6; } + r=0 + for typesize in 8 4 2 16 1; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -33967,38 +33973,48 @@ else $as_nop int main (void) { -switch (0) case 0: case (sizeof (int) == $ac_size):; +switch(0) { + case 0: + case (sizeof(long) == $typesize):; + } + ; return 0; } _ACEOF if ac_fn_c_try_compile "$LINENO" then : - ac_cv_sizeof_int=$ac_size + + r=$typesize +else $as_nop + + r=0 fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - if test x$ac_cv_sizeof_int != x ; then break; fi -done + if test $r -gt 0; then + break; + fi + done + if test $r -eq 0; then + as_fn_error $? "Failed to find size of long" "$LINENO" 5 + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $r" >&5 +printf "%s\n" "$r" >&6; } + tname=$(echo "ac_cv_sizeof_long" | tr A-Z a-z | tr " " "_") + eval "$tname=$r" -fi -if test x$ac_cv_sizeof_int = x ; then - as_fn_error $? "cannot determine a size for int" "$LINENO" 5 -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_int" >&5 -printf "%s\n" "$ac_cv_sizeof_int" >&6; } +printf "%s\n" "#define SIZEOF_LONG $r" >>confdefs.h -printf "%s\n" "#define SIZEOF_INT $ac_cv_sizeof_int" >>confdefs.h -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of short" >&5 -printf %s "checking size of short... " >&6; } -if test ${ac_cv_sizeof_short+y} -then : - printf %s "(cached) " >&6 -else $as_nop - for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of int" >&5 +printf %s "checking size of int... " >&6; } + r=0 + for typesize in 8 4 2 16 1; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -34006,38 +34022,48 @@ else $as_nop int main (void) { -switch (0) case 0: case (sizeof (short) == $ac_size):; +switch(0) { + case 0: + case (sizeof(int) == $typesize):; + } + ; return 0; } _ACEOF if ac_fn_c_try_compile "$LINENO" then : - ac_cv_sizeof_short=$ac_size + + r=$typesize +else $as_nop + + r=0 fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - if test x$ac_cv_sizeof_short != x ; then break; fi -done + if test $r -gt 0; then + break; + fi + done + if test $r -eq 0; then + as_fn_error $? "Failed to find size of int" "$LINENO" 5 + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $r" >&5 +printf "%s\n" "$r" >&6; } + tname=$(echo "ac_cv_sizeof_int" | tr A-Z a-z | tr " " "_") + eval "$tname=$r" -fi -if test x$ac_cv_sizeof_short = x ; then - as_fn_error $? "cannot determine a size for short" "$LINENO" 5 -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_short" >&5 -printf "%s\n" "$ac_cv_sizeof_short" >&6; } +printf "%s\n" "#define SIZEOF_INT $r" >>confdefs.h -printf "%s\n" "#define SIZEOF_SHORT $ac_cv_sizeof_short" >>confdefs.h -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5 + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of time_t" >&5 printf %s "checking size of time_t... " >&6; } -if test ${ac_cv_sizeof_time_t+y} -then : - printf %s "(cached) " >&6 -else $as_nop - for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + r=0 + for typesize in 8 4 2 16 1; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -34045,38 +34071,48 @@ else $as_nop int main (void) { -switch (0) case 0: case (sizeof (time_t) == $ac_size):; +switch(0) { + case 0: + case (sizeof(time_t) == $typesize):; + } + ; return 0; } _ACEOF if ac_fn_c_try_compile "$LINENO" then : - ac_cv_sizeof_time_t=$ac_size + + r=$typesize +else $as_nop + + r=0 fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - if test x$ac_cv_sizeof_time_t != x ; then break; fi -done + if test $r -gt 0; then + break; + fi + done + if test $r -eq 0; then + as_fn_error $? "Failed to find size of time_t" "$LINENO" 5 + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $r" >&5 +printf "%s\n" "$r" >&6; } + tname=$(echo "ac_cv_sizeof_time_t" | tr A-Z a-z | tr " " "_") + eval "$tname=$r" -fi -if test x$ac_cv_sizeof_time_t = x ; then - as_fn_error $? "cannot determine a size for time_t" "$LINENO" 5 -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_time_t" >&5 -printf "%s\n" "$ac_cv_sizeof_time_t" >&6; } +printf "%s\n" "#define SIZEOF_TIME_T $r" >>confdefs.h + -printf "%s\n" "#define SIZEOF_TIME_T $ac_cv_sizeof_time_t" >>confdefs.h -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of off_t" >&5 printf %s "checking size of off_t... " >&6; } -if test ${ac_cv_sizeof_off_t+y} -then : - printf %s "(cached) " >&6 -else $as_nop - for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + r=0 + for typesize in 8 4 2 16 1; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -34084,41 +34120,51 @@ else $as_nop int main (void) { -switch (0) case 0: case (sizeof (off_t) == $ac_size):; +switch(0) { + case 0: + case (sizeof(off_t) == $typesize):; + } + ; return 0; } _ACEOF if ac_fn_c_try_compile "$LINENO" then : - ac_cv_sizeof_off_t=$ac_size + + r=$typesize +else $as_nop + + r=0 fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - if test x$ac_cv_sizeof_off_t != x ; then break; fi -done + if test $r -gt 0; then + break; + fi + done + if test $r -eq 0; then + as_fn_error $? "Failed to find size of off_t" "$LINENO" 5 + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $r" >&5 +printf "%s\n" "$r" >&6; } + tname=$(echo "ac_cv_sizeof_off_t" | tr A-Z a-z | tr " " "_") + eval "$tname=$r" -fi -if test x$ac_cv_sizeof_off_t = x ; then - as_fn_error $? "cannot determine a size for off_t" "$LINENO" 5 -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_off_t" >&5 -printf "%s\n" "$ac_cv_sizeof_off_t" >&6; } +printf "%s\n" "#define SIZEOF_OFF_T $r" >>confdefs.h -printf "%s\n" "#define SIZEOF_OFF_T $ac_cv_sizeof_off_t" >>confdefs.h o=$CPPFLAGS CPPFLAGS="-I$srcdir/include $CPPFLAGS" -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of curl_off_t" >&5 + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking size of curl_off_t" >&5 printf %s "checking size of curl_off_t... " >&6; } -if test ${ac_cv_sizeof_curl_off_t+y} -then : - printf %s "(cached) " >&6 -else $as_nop - for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + r=0 + for typesize in 8 4 2 16 1; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include @@ -34128,28 +34174,39 @@ else $as_nop int main (void) { -switch (0) case 0: case (sizeof (curl_off_t) == $ac_size):; +switch(0) { + case 0: + case (sizeof(curl_off_t) == $typesize):; + } + ; return 0; } _ACEOF if ac_fn_c_try_compile "$LINENO" then : - ac_cv_sizeof_curl_off_t=$ac_size + + r=$typesize +else $as_nop + + r=0 fi rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - if test x$ac_cv_sizeof_curl_off_t != x ; then break; fi -done + if test $r -gt 0; then + break; + fi + done + if test $r -eq 0; then + as_fn_error $? "Failed to find size of curl_off_t" "$LINENO" 5 + fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $r" >&5 +printf "%s\n" "$r" >&6; } + tname=$(echo "ac_cv_sizeof_curl_off_t" | tr A-Z a-z | tr " " "_") + eval "$tname=$r" -fi -if test x$ac_cv_sizeof_curl_off_t = x ; then - as_fn_error $? "cannot determine a size for curl_off_t" "$LINENO" 5 -fi -{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_curl_off_t" >&5 -printf "%s\n" "$ac_cv_sizeof_curl_off_t" >&6; } +printf "%s\n" "#define SIZEOF_CURL_OFF_T $r" >>confdefs.h -printf "%s\n" "#define SIZEOF_CURL_OFF_T $ac_cv_sizeof_curl_off_t" >>confdefs.h CPPFLAGS=$o @@ -34165,42 +34222,6 @@ printf "%s\n" "#define HAVE_LONGLONG 1" >>confdefs.h fi -if test "xyes" = "x$longlong"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if numberLL works" >&5 -printf %s "checking if numberLL works... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - - -int main (void) -{ - - long long val = 1000LL; - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - -printf "%s\n" "#define HAVE_LL 1" >>confdefs.h - - -else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - # check for ssize_t ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default" @@ -34293,10 +34314,9 @@ fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if time_t is unsigned" >&5 printf %s "checking if time_t is unsigned... " >&6; } - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes + case $host_os in + darwin*) + if test "$cross_compiling" = yes then : { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } @@ -34328,7 +34348,46 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - LD_LIBRARY_PATH=$old # restore + ;; + *) + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include + #include + time_t t = -1; + return (t > 0); + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +printf "%s\n" "#define HAVE_TIME_T_UNSIGNED 1" >>confdefs.h + + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + LD_LIBRARY_PATH=$old # restore + ;; + esac @@ -34425,10 +34484,6 @@ _EOF #include #ifdef HAVE_WINSOCK2_H #include -#else -#ifdef HAVE_WINSOCK_H -#include -#endif #endif #else #ifdef HAVE_SYS_TYPES_H @@ -34473,10 +34528,6 @@ else $as_nop #include #ifdef HAVE_WINSOCK2_H #include -#else -#ifdef HAVE_WINSOCK_H -#include -#endif #endif #else #ifdef HAVE_SYS_TYPES_H @@ -34569,7 +34620,7 @@ fi - ac_fn_c_check_header_compile "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default" + ac_fn_c_check_header_compile "$LINENO" "sys/select.h" "ac_cv_header_sys_select_h" "$ac_includes_default" if test "x$ac_cv_header_sys_select_h" = xyes then : printf "%s\n" "#define HAVE_SYS_SELECT_H 1" >>confdefs.h @@ -34597,10 +34648,6 @@ printf %s "checking for select... " >&6; } #include #ifdef HAVE_WINSOCK2_H #include -#else -#ifdef HAVE_WINSOCK_H -#include -#endif #endif #endif #ifdef HAVE_SYS_TYPES_H @@ -34619,11 +34666,7 @@ printf %s "checking for select... " >&6; } #ifdef HAVE_SYS_SOCKET_H #include #endif -#ifdef HAVE_PROTO_BSDSOCKET_H -#include -struct Library *SocketBase = NULL; -#define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0) -#endif +$curl_includes_bsdsocket #endif int main (void) @@ -34679,10 +34722,6 @@ else $as_nop #include #ifdef HAVE_WINSOCK2_H #include -#else -#ifdef HAVE_WINSOCK_H -#include -#endif #endif #define SELECTCALLCONV PASCAL #endif @@ -34702,11 +34741,7 @@ else $as_nop #ifdef HAVE_SYS_SOCKET_H #include #endif -#ifdef HAVE_PROTO_BSDSOCKET_H -#include -struct Library *SocketBase = NULL; -#define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0) -#endif +$curl_includes_bsdsocket #define SELECTCALLCONV #endif #ifndef HAVE_STRUCT_TIMEVAL @@ -34850,16 +34885,9 @@ printf %s "checking for recv... " >&6; } #include #ifdef HAVE_WINSOCK2_H #include -#else -#ifdef HAVE_WINSOCK_H -#include -#endif #endif #else -#ifdef HAVE_PROTO_BSDSOCKET_H -#include -struct Library *SocketBase = NULL; -#endif +$curl_includes_bsdsocket #ifdef HAVE_SYS_TYPES_H #include #endif @@ -34922,17 +34950,10 @@ else $as_nop #include #ifdef HAVE_WINSOCK2_H #include -#else -#ifdef HAVE_WINSOCK_H -#include -#endif #endif #define RECVCALLCONV PASCAL #else -#ifdef HAVE_PROTO_BSDSOCKET_H -#include -struct Library *SocketBase = NULL; -#endif +$curl_includes_bsdsocket #ifdef HAVE_SYS_TYPES_H #include #endif @@ -35039,16 +35060,9 @@ printf %s "checking for send... " >&6; } #include #ifdef HAVE_WINSOCK2_H #include -#else -#ifdef HAVE_WINSOCK_H -#include -#endif #endif #else -#ifdef HAVE_PROTO_BSDSOCKET_H -#include -struct Library *SocketBase = NULL; -#endif +$curl_includes_bsdsocket #ifdef HAVE_SYS_TYPES_H #include #endif @@ -35111,17 +35125,10 @@ else $as_nop #include #ifdef HAVE_WINSOCK2_H #include -#else -#ifdef HAVE_WINSOCK_H -#include -#endif #endif #define SENDCALLCONV PASCAL #else -#ifdef HAVE_PROTO_BSDSOCKET_H -#include -struct Library *SocketBase = NULL; -#endif +$curl_includes_bsdsocket #ifdef HAVE_SYS_TYPES_H #include #endif @@ -35266,16 +35273,8 @@ else $as_nop #include #ifdef HAVE_WINSOCK2_H #include -#else -#ifdef HAVE_WINSOCK_H -#include -#endif #endif #else -#ifdef HAVE_PROTO_BSDSOCKET_H -#include -struct Library *SocketBase = NULL; -#endif #ifdef HAVE_SYS_TYPES_H #include #endif @@ -35750,7 +35749,6 @@ printf %s "checking if closesocket can be linked... " >&6; } $curl_includes_winsock2 - $curl_includes_bsdsocket $curl_includes_socket int main (void) @@ -35788,7 +35786,6 @@ printf %s "checking if closesocket is prototyped... " >&6; } /* end confdefs.h. */ $curl_includes_winsock2 - $curl_includes_bsdsocket $curl_includes_socket _ACEOF @@ -35819,7 +35816,6 @@ printf %s "checking if closesocket is compilable... " >&6; } $curl_includes_winsock2 - $curl_includes_bsdsocket $curl_includes_socket int main (void) @@ -35909,7 +35905,7 @@ fi - # + # tst_links_closesocket_camel="unknown" tst_proto_closesocket_camel="unknown" tst_compi_closesocket_camel="unknown" @@ -35921,6 +35917,7 @@ printf %s "checking if CloseSocket can be linked... " >&6; } /* end confdefs.h. */ + $curl_includes_bsdsocket $curl_includes_sys_socket int main (void) @@ -35957,6 +35954,7 @@ printf %s "checking if CloseSocket is prototyped... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ + $curl_includes_bsdsocket $curl_includes_sys_socket _ACEOF @@ -35986,6 +35984,7 @@ printf %s "checking if CloseSocket is compilable... " >&6; } /* end confdefs.h. */ + $curl_includes_bsdsocket $curl_includes_sys_socket int main (void) @@ -36049,7 +36048,7 @@ printf "%s\n" "no" >&6; } fi - # + # tst_links_connect="unknown" tst_proto_connect="unknown" tst_compi_connect="unknown" @@ -36133,7 +36132,7 @@ printf %s "checking if connect is compilable... " >&6; } $curl_includes_winsock2 - $curl_includes_bsdsocket + $curl_includes_bsdsocket $curl_includes_sys_socket $curl_includes_socket @@ -36383,7 +36382,7 @@ printf "%s\n" "#define HAVE_FCNTL 1" >>confdefs.h tst_allow_fcntl_o_nonblock="unknown" # case $host_os in - sunos4* | aix3* | beos*) + sunos4* | aix3*) curl_disallow_fcntl_o_nonblock="yes" ;; esac @@ -37351,10 +37350,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if getaddrinfo seems to work" >&5 printf %s "checking if getaddrinfo seems to work... " >&6; } - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes + case $host_os in + darwin*) + if test "$cross_compiling" = yes then : { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -37415,7 +37413,75 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - LD_LIBRARY_PATH=$old # restore + ;; + *) + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes +then : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + $curl_includes_ws2tcpip + $curl_includes_stdlib + $curl_includes_string + $curl_includes_sys_socket + $curl_includes_netdb + +int main (void) +{ + + struct addrinfo hints; + struct addrinfo *ai = 0; + int error; + + #ifdef HAVE_WINSOCK2_H + WSADATA wsa; + if (WSAStartup(MAKEWORD(2,2), &wsa)) + exit(2); + #endif + + memset(&hints, 0, sizeof(hints)); + hints.ai_flags = AI_NUMERICHOST; + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + error = getaddrinfo("127.0.0.1", 0, &hints, &ai); + if(error || !ai) + exit(1); /* fail */ + else + exit(0); + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + tst_works_getaddrinfo="yes" + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + tst_works_getaddrinfo="no" + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + LD_LIBRARY_PATH=$old # restore + ;; + esac fi # @@ -37482,6 +37548,9 @@ printf %s "checking if getaddrinfo is threadsafe... " >&6; } hpux*) tst_tsafe_getaddrinfo="yes" ;; + midnightbsd*) + tst_tsafe_getaddrinfo="yes" + ;; netbsd[123].*) tst_tsafe_getaddrinfo="no" ;; @@ -37709,7 +37778,7 @@ printf %s "checking if gethostbyname is compilable... " >&6; } $curl_includes_winsock2 - $curl_includes_bsdsocket + $curl_includes_bsdsocket $curl_includes_netdb int main (void) @@ -37863,6 +37932,7 @@ printf %s "checking if gethostbyname_r takes 3 args.... " >&6; } $curl_includes_netdb + $curl_includes_bsdsocket int main (void) { @@ -37900,6 +37970,7 @@ printf %s "checking if gethostbyname_r takes 5 args.... " >&6; } $curl_includes_netdb + $curl_includes_bsdsocket int main (void) { @@ -37937,6 +38008,7 @@ printf %s "checking if gethostbyname_r takes 6 args.... " >&6; } $curl_includes_netdb + $curl_includes_bsdsocket int main (void) { @@ -38048,8 +38120,8 @@ printf %s "checking if gethostname can be linked... " >&6; } $curl_includes_winsock2 - $curl_includes_bsdsocket $curl_includes_unistd + $curl_includes_bsdsocket int main (void) { @@ -38086,8 +38158,8 @@ printf %s "checking if gethostname is prototyped... " >&6; } /* end confdefs.h. */ $curl_includes_winsock2 - $curl_includes_bsdsocket $curl_includes_unistd + $curl_includes_bsdsocket _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | @@ -38117,8 +38189,8 @@ printf %s "checking if gethostname is compilable... " >&6; } $curl_includes_winsock2 - $curl_includes_bsdsocket $curl_includes_unistd + $curl_includes_bsdsocket int main (void) { @@ -38160,8 +38232,8 @@ printf %s "checking for gethostname arg 2 data type... " >&6; } $curl_includes_winsock2 - $curl_includes_bsdsocket $curl_includes_unistd + $curl_includes_bsdsocket $curl_preprocess_callconv extern int FUNCALLCONV gethostname($tst_arg1, $tst_arg2); @@ -38849,10 +38921,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if getifaddrs seems to work" >&5 printf %s "checking if getifaddrs seems to work... " >&6; } - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes + case $host_os in + darwin*) + if test "$cross_compiling" = yes then : { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -38899,7 +38970,61 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - LD_LIBRARY_PATH=$old # restore + ;; + *) + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes +then : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + $curl_includes_stdlib + $curl_includes_ifaddrs + +int main (void) +{ + + struct ifaddrs *ifa = 0; + int error; + + error = getifaddrs(&ifa); + if(error || !ifa) + exit(1); /* fail */ + else + exit(0); + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + tst_works_getifaddrs="yes" + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + tst_works_getifaddrs="no" + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + LD_LIBRARY_PATH=$old # restore + ;; + esac fi # @@ -39088,10 +39213,61 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if gmtime_r seems to work" >&5 printf %s "checking if gmtime_r seems to work... " >&6; } - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes + case $host_os in + darwin*) + if test "$cross_compiling" = yes +then : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + $curl_includes_stdlib + $curl_includes_time + +int main (void) +{ + + time_t local = 1170352587; + struct tm *gmt = 0; + struct tm result; + gmt = gmtime_r(&local, &result); + if(gmt) + exit(0); + else + exit(1); + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + tst_works_gmtime_r="yes" + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + tst_works_gmtime_r="no" + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + ;; + *) + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes then : { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -39138,7 +39314,9 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - LD_LIBRARY_PATH=$old # restore + LD_LIBRARY_PATH=$old # restore + ;; + esac fi # @@ -39350,10 +39528,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if inet_ntop seems to work" >&5 printf %s "checking if inet_ntop seems to work... " >&6; } - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes + case $host_os in + darwin*) + if test "$cross_compiling" = yes then : { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -39442,7 +39619,103 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - LD_LIBRARY_PATH=$old # restore + ;; + *) + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes +then : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + $curl_includes_stdlib + $curl_includes_arpa_inet + $curl_includes_string + +int main (void) +{ + + char ipv6res[sizeof("ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255")]; + char ipv4res[sizeof "255.255.255.255"]; + unsigned char ipv6a[26]; + unsigned char ipv4a[5]; + char *ipv6ptr = 0; + char *ipv4ptr = 0; + /* - */ + ipv4res[0] = '\0'; + ipv4a[0] = 0xc0; + ipv4a[1] = 0xa8; + ipv4a[2] = 0x64; + ipv4a[3] = 0x01; + ipv4a[4] = 0x01; + /* - */ + ipv4ptr = inet_ntop(AF_INET, ipv4a, ipv4res, sizeof(ipv4res)); + if(!ipv4ptr) + exit(1); /* fail */ + if(ipv4ptr != ipv4res) + exit(1); /* fail */ + if(!ipv4ptr[0]) + exit(1); /* fail */ + if(memcmp(ipv4res, "192.168.100.1", 13) != 0) + exit(1); /* fail */ + /* - */ + ipv6res[0] = '\0'; + memset(ipv6a, 0, sizeof(ipv6a)); + ipv6a[0] = 0xfe; + ipv6a[1] = 0x80; + ipv6a[8] = 0x02; + ipv6a[9] = 0x14; + ipv6a[10] = 0x4f; + ipv6a[11] = 0xff; + ipv6a[12] = 0xfe; + ipv6a[13] = 0x0b; + ipv6a[14] = 0x76; + ipv6a[15] = 0xc8; + ipv6a[25] = 0x01; + /* - */ + ipv6ptr = inet_ntop(AF_INET6, ipv6a, ipv6res, sizeof(ipv6res)); + if(!ipv6ptr) + exit(1); /* fail */ + if(ipv6ptr != ipv6res) + exit(1); /* fail */ + if(!ipv6ptr[0]) + exit(1); /* fail */ + if(memcmp(ipv6res, "fe80::214:4fff:fe0b:76c8", 24) != 0) + exit(1); /* fail */ + /* - */ + exit(0); + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + tst_works_inet_ntop="yes" + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + tst_works_inet_ntop="no" + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + LD_LIBRARY_PATH=$old # restore + ;; + esac fi # @@ -39604,10 +39877,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if inet_pton seems to work" >&5 printf %s "checking if inet_pton seems to work... " >&6; } - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes + case $host_os in + darwin*) + if test "$cross_compiling" = yes then : { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -39689,395 +39961,131 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - LD_LIBRARY_PATH=$old # restore - - fi - # - if test "$tst_compi_inet_pton" = "yes" && - test "$tst_works_inet_pton" != "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if inet_pton usage allowed" >&5 -printf %s "checking if inet_pton usage allowed... " >&6; } - if test "x$curl_disallow_inet_pton" != "xyes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_allow_inet_pton="yes" - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_allow_inet_pton="no" - fi - fi - # - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if inet_pton might be used" >&5 -printf %s "checking if inet_pton might be used... " >&6; } - if test "$tst_links_inet_pton" = "yes" && - test "$tst_proto_inet_pton" = "yes" && - test "$tst_compi_inet_pton" = "yes" && - test "$tst_allow_inet_pton" = "yes" && - test "$tst_works_inet_pton" != "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - -printf "%s\n" "#define HAVE_INET_PTON 1" >>confdefs.h - - curl_cv_func_inet_pton="yes" - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - curl_cv_func_inet_pton="no" - fi - - -curl_includes_stropts="\ -/* includes start */ -#ifdef HAVE_SYS_TYPES_H -# include -#endif -#ifdef HAVE_UNISTD_H -# include -#endif -#ifdef HAVE_SYS_SOCKET_H -# include -#endif -#ifdef HAVE_SYS_IOCTL_H -# include -#endif -#ifdef HAVE_STROPTS_H -# include -#endif -/* includes end */" - ac_fn_c_check_header_compile "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" "$curl_includes_stropts -" -if test "x$ac_cv_header_sys_types_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_TYPES_H 1" >>confdefs.h - -fi -ac_fn_c_check_header_compile "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$curl_includes_stropts -" -if test "x$ac_cv_header_unistd_h" = xyes -then : - printf "%s\n" "#define HAVE_UNISTD_H 1" >>confdefs.h - -fi -ac_fn_c_check_header_compile "$LINENO" "sys/socket.h" "ac_cv_header_sys_socket_h" "$curl_includes_stropts -" -if test "x$ac_cv_header_sys_socket_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_SOCKET_H 1" >>confdefs.h - -fi -ac_fn_c_check_header_compile "$LINENO" "sys/ioctl.h" "ac_cv_header_sys_ioctl_h" "$curl_includes_stropts -" -if test "x$ac_cv_header_sys_ioctl_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_IOCTL_H 1" >>confdefs.h - -fi -ac_fn_c_check_header_compile "$LINENO" "stropts.h" "ac_cv_header_stropts_h" "$curl_includes_stropts -" -if test "x$ac_cv_header_stropts_h" = xyes -then : - printf "%s\n" "#define HAVE_STROPTS_H 1" >>confdefs.h - -fi - - - - # - tst_links_ioctl="unknown" - tst_proto_ioctl="unknown" - tst_compi_ioctl="unknown" - tst_allow_ioctl="unknown" - # - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if ioctl can be linked" >&5 -printf %s "checking if ioctl can be linked... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#define ioctl innocuous_ioctl -#ifdef __STDC__ -# include -#else -# include -#endif -#undef ioctl -#ifdef __cplusplus -extern "C" -#endif -char ioctl (); -#if defined __stub_ioctl || defined __stub___ioctl -choke me -#endif - -int main (void) -{ -return ioctl (); - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_links_ioctl="yes" - -else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_links_ioctl="no" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - # - if test "$tst_links_ioctl" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if ioctl is prototyped" >&5 -printf %s "checking if ioctl is prototyped... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - $curl_includes_stropts - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "ioctl" >/dev/null 2>&1 + ;; + *) + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_proto_ioctl="yes" - + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_proto_ioctl="no" - -fi -rm -rf conftest* - - fi - # - if test "$tst_proto_ioctl" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if ioctl is compilable" >&5 -printf %s "checking if ioctl is compilable... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - $curl_includes_stropts + $curl_includes_stdlib + $curl_includes_arpa_inet + $curl_includes_string int main (void) { - if(0 != ioctl(0, 0, 0)) - return 1; + unsigned char ipv6a[16+1]; + unsigned char ipv4a[4+1]; + const char *ipv6src = "fe80::214:4fff:fe0b:76c8"; + const char *ipv4src = "192.168.100.1"; + /* - */ + memset(ipv4a, 1, sizeof(ipv4a)); + if(1 != inet_pton(AF_INET, ipv4src, ipv4a)) + exit(1); /* fail */ + /* - */ + if( (ipv4a[0] != 0xc0) || + (ipv4a[1] != 0xa8) || + (ipv4a[2] != 0x64) || + (ipv4a[3] != 0x01) || + (ipv4a[4] != 0x01) ) + exit(1); /* fail */ + /* - */ + memset(ipv6a, 1, sizeof(ipv6a)); + if(1 != inet_pton(AF_INET6, ipv6src, ipv6a)) + exit(1); /* fail */ + /* - */ + if( (ipv6a[0] != 0xfe) || + (ipv6a[1] != 0x80) || + (ipv6a[8] != 0x02) || + (ipv6a[9] != 0x14) || + (ipv6a[10] != 0x4f) || + (ipv6a[11] != 0xff) || + (ipv6a[12] != 0xfe) || + (ipv6a[13] != 0x0b) || + (ipv6a[14] != 0x76) || + (ipv6a[15] != 0xc8) || + (ipv6a[16] != 0x01) ) + exit(1); /* fail */ + /* - */ + if( (ipv6a[2] != 0x0) || + (ipv6a[3] != 0x0) || + (ipv6a[4] != 0x0) || + (ipv6a[5] != 0x0) || + (ipv6a[6] != 0x0) || + (ipv6a[7] != 0x0) ) + exit(1); /* fail */ + /* - */ + exit(0); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" +if ac_fn_c_try_run "$LINENO" then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - tst_compi_ioctl="yes" + tst_works_inet_pton="yes" else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - tst_compi_ioctl="no" + tst_works_inet_pton="no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - fi - # - if test "$tst_compi_ioctl" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if ioctl usage allowed" >&5 -printf %s "checking if ioctl usage allowed... " >&6; } - if test "x$curl_disallow_ioctl" != "xyes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_allow_ioctl="yes" - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_allow_ioctl="no" - fi - fi - # - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if ioctl might be used" >&5 -printf %s "checking if ioctl might be used... " >&6; } - if test "$tst_links_ioctl" = "yes" && - test "$tst_proto_ioctl" = "yes" && - test "$tst_compi_ioctl" = "yes" && - test "$tst_allow_ioctl" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - -printf "%s\n" "#define HAVE_IOCTL 1" >>confdefs.h - - curl_cv_func_ioctl="yes" - - # - tst_compi_ioctl_fionbio="unknown" - tst_allow_ioctl_fionbio="unknown" - # - if test "$curl_cv_func_ioctl" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if ioctl FIONBIO is compilable" >&5 -printf %s "checking if ioctl FIONBIO is compilable... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - - $curl_includes_stropts - -int main (void) -{ - - int flags = 0; - if(0 != ioctl(0, FIONBIO, &flags)) - return 1; - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_compi_ioctl_fionbio="yes" - -else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_compi_ioctl_fionbio="no" - +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - fi - # - if test "$tst_compi_ioctl_fionbio" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if ioctl FIONBIO usage allowed" >&5 -printf %s "checking if ioctl FIONBIO usage allowed... " >&6; } - if test "x$curl_disallow_ioctl_fionbio" != "xyes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_allow_ioctl_fionbio="yes" - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_allow_ioctl_fionbio="no" - fi - fi - # - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if ioctl FIONBIO might be used" >&5 -printf %s "checking if ioctl FIONBIO might be used... " >&6; } - if test "$tst_compi_ioctl_fionbio" = "yes" && - test "$tst_allow_ioctl_fionbio" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - -printf "%s\n" "#define HAVE_IOCTL_FIONBIO 1" >>confdefs.h - - curl_cv_func_ioctl_fionbio="yes" - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - curl_cv_func_ioctl_fionbio="no" - fi - - # - tst_compi_ioctl_siocgifaddr="unknown" - tst_allow_ioctl_siocgifaddr="unknown" - # - if test "$curl_cv_func_ioctl" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if ioctl SIOCGIFADDR is compilable" >&5 -printf %s "checking if ioctl SIOCGIFADDR is compilable... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - - $curl_includes_stropts - #include - -int main (void) -{ - - struct ifreq ifr; - if(0 != ioctl(0, SIOCGIFADDR, &ifr)) - return 1; - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_compi_ioctl_siocgifaddr="yes" - -else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_compi_ioctl_siocgifaddr="no" + LD_LIBRARY_PATH=$old # restore + ;; + esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi # - if test "$tst_compi_ioctl_siocgifaddr" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if ioctl SIOCGIFADDR usage allowed" >&5 -printf %s "checking if ioctl SIOCGIFADDR usage allowed... " >&6; } - if test "x$curl_disallow_ioctl_siocgifaddr" != "xyes"; then + if test "$tst_compi_inet_pton" = "yes" && + test "$tst_works_inet_pton" != "no"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if inet_pton usage allowed" >&5 +printf %s "checking if inet_pton usage allowed... " >&6; } + if test "x$curl_disallow_inet_pton" != "xyes"; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - tst_allow_ioctl_siocgifaddr="yes" + tst_allow_inet_pton="yes" else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - tst_allow_ioctl_siocgifaddr="no" + tst_allow_inet_pton="no" fi fi # - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if ioctl SIOCGIFADDR might be used" >&5 -printf %s "checking if ioctl SIOCGIFADDR might be used... " >&6; } - if test "$tst_compi_ioctl_siocgifaddr" = "yes" && - test "$tst_allow_ioctl_siocgifaddr" = "yes"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if inet_pton might be used" >&5 +printf %s "checking if inet_pton might be used... " >&6; } + if test "$tst_links_inet_pton" = "yes" && + test "$tst_proto_inet_pton" = "yes" && + test "$tst_compi_inet_pton" = "yes" && + test "$tst_allow_inet_pton" = "yes" && + test "$tst_works_inet_pton" != "no"; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } -printf "%s\n" "#define HAVE_IOCTL_SIOCGIFADDR 1" >>confdefs.h - - curl_cv_func_ioctl_siocgifaddr="yes" - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - curl_cv_func_ioctl_siocgifaddr="no" - fi +printf "%s\n" "#define HAVE_INET_PTON 1" >>confdefs.h + curl_cv_func_inet_pton="yes" else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - curl_cv_func_ioctl="no" + curl_cv_func_inet_pton="no" fi @@ -40094,7 +40102,6 @@ printf %s "checking if ioctlsocket can be linked... " >&6; } $curl_includes_winsock2 - $curl_includes_bsdsocket int main (void) { @@ -40131,7 +40138,6 @@ printf %s "checking if ioctlsocket is prototyped... " >&6; } /* end confdefs.h. */ $curl_includes_winsock2 - $curl_includes_bsdsocket _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | @@ -40161,7 +40167,6 @@ printf %s "checking if ioctlsocket is compilable... " >&6; } $curl_includes_winsock2 - $curl_includes_bsdsocket int main (void) { @@ -40230,7 +40235,6 @@ printf %s "checking if ioctlsocket FIONBIO is compilable... " >&6; } $curl_includes_winsock2 - $curl_includes_bsdsocket int main (void) { @@ -40310,24 +40314,13 @@ printf %s "checking if IoctlSocket can be linked... " >&6; } /* end confdefs.h. */ -#define IoctlSocket innocuous_IoctlSocket -#ifdef __STDC__ -# include -#else -# include -#endif -#undef IoctlSocket -#ifdef __cplusplus -extern "C" -#endif -char IoctlSocket (); -#if defined __stub_IoctlSocket || defined __stub___IoctlSocket -choke me -#endif + $curl_includes_bsdsocket int main (void) { -return IoctlSocket (); + + IoctlSocket(0, 0, 0); + ; return 0; } @@ -40356,7 +40349,7 @@ printf %s "checking if IoctlSocket is prototyped... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - $curl_includes_stropts + $curl_includes_bsdsocket _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | @@ -40385,7 +40378,7 @@ printf %s "checking if IoctlSocket is compilable... " >&6; } /* end confdefs.h. */ - $curl_includes_stropts + $curl_includes_bsdsocket int main (void) { @@ -40442,7 +40435,7 @@ printf "%s\n" "#define HAVE_IOCTLSOCKET_CAMEL 1" >>confdefs.h curl_cv_func_ioctlsocket_camel="yes" - # + # tst_compi_ioctlsocket_camel_fionbio="unknown" tst_allow_ioctlsocket_camel_fionbio="unknown" # @@ -40453,7 +40446,7 @@ printf %s "checking if IoctlSocket FIONBIO is compilable... " >&6; } /* end confdefs.h. */ - $curl_includes_stropts + $curl_includes_bsdsocket int main (void) { @@ -40521,218 +40514,6 @@ printf "%s\n" "no" >&6; } fi - # - tst_links_localtime_r="unknown" - tst_proto_localtime_r="unknown" - tst_compi_localtime_r="unknown" - tst_works_localtime_r="unknown" - tst_allow_localtime_r="unknown" - # - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if localtime_r can be linked" >&5 -printf %s "checking if localtime_r can be linked... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#define localtime_r innocuous_localtime_r -#ifdef __STDC__ -# include -#else -# include -#endif -#undef localtime_r -#ifdef __cplusplus -extern "C" -#endif -char localtime_r (); -#if defined __stub_localtime_r || defined __stub___localtime_r -choke me -#endif - -int main (void) -{ -return localtime_r (); - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_links_localtime_r="yes" - -else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_links_localtime_r="no" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - # - if test "$tst_links_localtime_r" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if localtime_r is prototyped" >&5 -printf %s "checking if localtime_r is prototyped... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - $curl_includes_time - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "localtime_r" >/dev/null 2>&1 -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_proto_localtime_r="yes" - -else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_proto_localtime_r="no" - -fi -rm -rf conftest* - - fi - # - if test "$tst_proto_localtime_r" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if localtime_r is compilable" >&5 -printf %s "checking if localtime_r is compilable... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - - $curl_includes_time - -int main (void) -{ - - if(0 != localtime_r(0, 0)) - return 1; - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_compi_localtime_r="yes" - -else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_compi_localtime_r="no" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - fi - # - if test "x$cross_compiling" != "xyes" && - test "$tst_compi_localtime_r" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if localtime_r seems to work" >&5 -printf %s "checking if localtime_r seems to work... " >&6; } - - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes -then : - { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "cannot run test program while cross compiling -See \`config.log' for more details" "$LINENO" 5; } -else $as_nop - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - - $curl_includes_stdlib - $curl_includes_time - -int main (void) -{ - - time_t clock = 1170352587; - struct tm *tmp = 0; - struct tm result; - tmp = localtime_r(&clock, &result); - if(tmp) - exit(0); - else - exit(1); - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_run "$LINENO" -then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_works_localtime_r="yes" - -else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_works_localtime_r="no" - -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext -fi - - LD_LIBRARY_PATH=$old # restore - - fi - # - if test "$tst_compi_localtime_r" = "yes" && - test "$tst_works_localtime_r" != "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if localtime_r usage allowed" >&5 -printf %s "checking if localtime_r usage allowed... " >&6; } - if test "x$curl_disallow_localtime_r" != "xyes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_allow_localtime_r="yes" - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_allow_localtime_r="no" - fi - fi - # - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if localtime_r might be used" >&5 -printf %s "checking if localtime_r might be used... " >&6; } - if test "$tst_links_localtime_r" = "yes" && - test "$tst_proto_localtime_r" = "yes" && - test "$tst_compi_localtime_r" = "yes" && - test "$tst_allow_localtime_r" = "yes" && - test "$tst_works_localtime_r" != "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - -printf "%s\n" "#define HAVE_LOCALTIME_R 1" >>confdefs.h - - curl_cv_func_localtime_r="yes" - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - curl_cv_func_localtime_r="no" - fi - - # tst_links_memrchr="unknown" tst_macro_memrchr="unknown" @@ -41043,10 +40824,9 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if poll seems to work" >&5 printf %s "checking if poll seems to work... " >&6; } - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes + case $host_os in + darwin*) + if test "$cross_compiling" = yes then : { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -41105,265 +40885,108 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - LD_LIBRARY_PATH=$old # restore - - fi - # - if test "$tst_compi_poll" = "yes" && - test "$tst_works_poll" != "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if poll usage allowed" >&5 -printf %s "checking if poll usage allowed... " >&6; } - if test "x$curl_disallow_poll" != "xyes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_allow_poll="yes" - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_allow_poll="no" - fi - fi - # - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if poll might be used" >&5 -printf %s "checking if poll might be used... " >&6; } - if test "$tst_links_poll" = "yes" && - test "$tst_proto_poll" = "yes" && - test "$tst_compi_poll" = "yes" && - test "$tst_allow_poll" = "yes" && - test "$tst_works_poll" != "no"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - -printf "%s\n" "#define HAVE_POLL 1" >>confdefs.h - - -printf "%s\n" "#define HAVE_POLL_FINE 1" >>confdefs.h - - curl_cv_func_poll="yes" - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - curl_cv_func_poll="no" - fi - - - # - tst_links_setsockopt="unknown" - tst_proto_setsockopt="unknown" - tst_compi_setsockopt="unknown" - tst_allow_setsockopt="unknown" - # - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if setsockopt can be linked" >&5 -printf %s "checking if setsockopt can be linked... " >&6; } + ;; + *) + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes +then : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } +else $as_nop cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ - $curl_includes_winsock2 - $curl_includes_bsdsocket - $curl_includes_sys_socket + $curl_includes_stdlib + $curl_includes_poll + $curl_includes_time int main (void) { - if(0 != setsockopt(0, 0, 0, 0, 0)) - return 1; - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_links_setsockopt="yes" - -else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_links_setsockopt="no" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - # - if test "$tst_links_setsockopt" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if setsockopt is prototyped" >&5 -printf %s "checking if setsockopt is prototyped... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - $curl_includes_winsock2 - $curl_includes_bsdsocket - $curl_includes_sys_socket - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "setsockopt" >/dev/null 2>&1 -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_proto_setsockopt="yes" - -else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_proto_setsockopt="no" - -fi -rm -rf conftest* - - fi - # - if test "$tst_proto_setsockopt" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if setsockopt is compilable" >&5 -printf %s "checking if setsockopt is compilable... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - + /* detect the original poll() breakage */ + if(0 != poll(0, 0, 10)) + exit(1); /* fail */ + else { + /* detect the 10.12 poll() breakage */ + struct timeval before, after; + int rc; + size_t us; - $curl_includes_winsock2 - $curl_includes_bsdsocket - $curl_includes_sys_socket + gettimeofday(&before, NULL); + rc = poll(NULL, 0, 500); + gettimeofday(&after, NULL); -int main (void) -{ + us = (after.tv_sec - before.tv_sec) * 1000000 + + (after.tv_usec - before.tv_usec); - if(0 != setsockopt(0, 0, 0, 0, 0)) - return 1; + if(us < 400000) + exit(1); + } ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO" +if ac_fn_c_try_run "$LINENO" then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - tst_compi_setsockopt="yes" + tst_works_poll="yes" else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - tst_compi_setsockopt="no" + tst_works_poll="no" fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - fi - # - if test "$tst_compi_setsockopt" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if setsockopt usage allowed" >&5 -printf %s "checking if setsockopt usage allowed... " >&6; } - if test "x$curl_disallow_setsockopt" != "xyes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_allow_setsockopt="yes" - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_allow_setsockopt="no" - fi - fi - # - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if setsockopt might be used" >&5 -printf %s "checking if setsockopt might be used... " >&6; } - if test "$tst_links_setsockopt" = "yes" && - test "$tst_proto_setsockopt" = "yes" && - test "$tst_compi_setsockopt" = "yes" && - test "$tst_allow_setsockopt" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - -printf "%s\n" "#define HAVE_SETSOCKOPT 1" >>confdefs.h - - curl_cv_func_setsockopt="yes" - - # - tst_compi_setsockopt_so_nonblock="unknown" - tst_allow_setsockopt_so_nonblock="unknown" - # - if test "$curl_cv_func_setsockopt" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if setsockopt SO_NONBLOCK is compilable" >&5 -printf %s "checking if setsockopt SO_NONBLOCK is compilable... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - - $curl_includes_winsock2 - $curl_includes_bsdsocket - $curl_includes_sys_socket - -int main (void) -{ - - if(0 != setsockopt(0, SOL_SOCKET, SO_NONBLOCK, 0, 0)) - return 1; - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_compi_setsockopt_so_nonblock="yes" - -else $as_nop +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_compi_setsockopt_so_nonblock="no" + LD_LIBRARY_PATH=$old # restore + ;; + esac -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext fi # - if test "$tst_compi_setsockopt_so_nonblock" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if setsockopt SO_NONBLOCK usage allowed" >&5 -printf %s "checking if setsockopt SO_NONBLOCK usage allowed... " >&6; } - if test "x$curl_disallow_setsockopt_so_nonblock" != "xyes"; then + if test "$tst_compi_poll" = "yes" && + test "$tst_works_poll" != "no"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if poll usage allowed" >&5 +printf %s "checking if poll usage allowed... " >&6; } + if test "x$curl_disallow_poll" != "xyes"; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - tst_allow_setsockopt_so_nonblock="yes" + tst_allow_poll="yes" else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - tst_allow_setsockopt_so_nonblock="no" + tst_allow_poll="no" fi fi # - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if setsockopt SO_NONBLOCK might be used" >&5 -printf %s "checking if setsockopt SO_NONBLOCK might be used... " >&6; } - if test "$tst_compi_setsockopt_so_nonblock" = "yes" && - test "$tst_allow_setsockopt_so_nonblock" = "yes"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if poll might be used" >&5 +printf %s "checking if poll might be used... " >&6; } + if test "$tst_links_poll" = "yes" && + test "$tst_proto_poll" = "yes" && + test "$tst_compi_poll" = "yes" && + test "$tst_allow_poll" = "yes" && + test "$tst_works_poll" != "no"; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } -printf "%s\n" "#define HAVE_SETSOCKOPT_SO_NONBLOCK 1" >>confdefs.h - - curl_cv_func_setsockopt_so_nonblock="yes" - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - curl_cv_func_setsockopt_so_nonblock="no" - fi +printf "%s\n" "#define HAVE_POLL_FINE 1" >>confdefs.h + curl_cv_func_poll="yes" else { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - curl_cv_func_setsockopt="no" + curl_cv_func_poll="no" fi @@ -42145,7 +41768,7 @@ printf %s "checking if socket is compilable... " >&6; } $curl_includes_winsock2 - $curl_includes_bsdsocket + $curl_includes_bsdsocket $curl_includes_sys_socket $curl_includes_socket @@ -42988,10 +42611,9 @@ printf "%s\n" "yes" >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if strerror_r seems to work" >&5 printf %s "checking if strerror_r seems to work... " >&6; } - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes + case $host_os in + darwin*) + if test "$cross_compiling" = yes then : { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -43041,7 +42663,64 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - LD_LIBRARY_PATH=$old # restore + ;; + *) + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes +then : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + $curl_includes_stdlib + $curl_includes_string +# include + +int main (void) +{ + + char buffer[1024]; + char *string = 0; + buffer[0] = '\0'; + string = strerror_r(EACCES, buffer, sizeof(buffer)); + if(!string) + exit(1); /* fail */ + if(!string[0]) + exit(1); /* fail */ + else + exit(0); + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + tst_works_glibc_strerror_r="yes" + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + tst_works_glibc_strerror_r="no" + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + LD_LIBRARY_PATH=$old # restore + ;; + esac fi # @@ -43098,10 +42777,64 @@ printf "%s\n" "yes" >&6; } { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if strerror_r seems to work" >&5 printf %s "checking if strerror_r seems to work... " >&6; } - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH - if test "$cross_compiling" = yes + case $host_os in + darwin*) + if test "$cross_compiling" = yes +then : + { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + $curl_includes_stdlib + $curl_includes_string +# include + +int main (void) +{ + + char buffer[1024]; + int error = 1; + buffer[0] = '\0'; + error = strerror_r(EACCES, buffer, sizeof(buffer)); + if(error) + exit(1); /* fail */ + if(buffer[0] == '\0') + exit(1); /* fail */ + else + exit(0); + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + tst_works_posix_strerror_r="yes" + +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } + tst_works_posix_strerror_r="no" + +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + ;; + *) + old=$LD_LIBRARY_PATH + LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old + export LD_LIBRARY_PATH + if test "$cross_compiling" = yes then : { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;} @@ -43151,7 +42884,9 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ conftest.$ac_objext conftest.beam conftest.$ac_ext fi - LD_LIBRARY_PATH=$old # restore + LD_LIBRARY_PATH=$old # restore + ;; + esac fi # @@ -43200,9 +42935,6 @@ printf "%s\n" "#define HAVE_STRERROR_R 1" >>confdefs.h printf "%s\n" "#define HAVE_GLIBC_STRERROR_R 1" >>confdefs.h - -printf "%s\n" "#define STRERROR_R_TYPE_ARG3 $tst_glibc_strerror_r_type_arg3" >>confdefs.h - fi if test "$tst_posix_strerror_r" = "yes"; then @@ -43211,9 +42943,6 @@ printf "%s\n" "#define HAVE_STRERROR_R 1" >>confdefs.h printf "%s\n" "#define HAVE_POSIX_STRERROR_R 1" >>confdefs.h - -printf "%s\n" "#define STRERROR_R_TYPE_ARG3 $tst_posix_strerror_r_type_arg3" >>confdefs.h - fi curl_cv_func_strerror_r="yes" else @@ -43380,456 +43109,6 @@ printf "%s\n" "no" >&6; } fi - # - tst_links_strncmpi="unknown" - tst_proto_strncmpi="unknown" - tst_compi_strncmpi="unknown" - tst_allow_strncmpi="unknown" - # - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if strncmpi can be linked" >&5 -printf %s "checking if strncmpi can be linked... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#define strncmpi innocuous_strncmpi -#ifdef __STDC__ -# include -#else -# include -#endif -#undef strncmpi -#ifdef __cplusplus -extern "C" -#endif -char strncmpi (); -#if defined __stub_strncmpi || defined __stub___strncmpi -choke me -#endif - -int main (void) -{ -return strncmpi (); - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_links_strncmpi="yes" - -else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_links_strncmpi="no" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - # - if test "$tst_links_strncmpi" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if strncmpi is prototyped" >&5 -printf %s "checking if strncmpi is prototyped... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - $curl_includes_string - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "strncmpi" >/dev/null 2>&1 -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_proto_strncmpi="yes" - -else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_proto_strncmpi="no" - -fi -rm -rf conftest* - - fi - # - if test "$tst_proto_strncmpi" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if strncmpi is compilable" >&5 -printf %s "checking if strncmpi is compilable... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - - $curl_includes_string - -int main (void) -{ - - if(0 != strncmpi(0, 0)) - return 1; - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_compi_strncmpi="yes" - -else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_compi_strncmpi="no" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - fi - # - if test "$tst_compi_strncmpi" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if strncmpi usage allowed" >&5 -printf %s "checking if strncmpi usage allowed... " >&6; } - if test "x$curl_disallow_strncmpi" != "xyes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_allow_strncmpi="yes" - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_allow_strncmpi="no" - fi - fi - # - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if strncmpi might be used" >&5 -printf %s "checking if strncmpi might be used... " >&6; } - if test "$tst_links_strncmpi" = "yes" && - test "$tst_proto_strncmpi" = "yes" && - test "$tst_compi_strncmpi" = "yes" && - test "$tst_allow_strncmpi" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - -printf "%s\n" "#define HAVE_STRNCMPI 1" >>confdefs.h - - curl_cv_func_strncmpi="yes" - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - curl_cv_func_strncmpi="no" - fi - - - # - tst_links_strnicmp="unknown" - tst_proto_strnicmp="unknown" - tst_compi_strnicmp="unknown" - tst_allow_strnicmp="unknown" - # - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if strnicmp can be linked" >&5 -printf %s "checking if strnicmp can be linked... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#define strnicmp innocuous_strnicmp -#ifdef __STDC__ -# include -#else -# include -#endif -#undef strnicmp -#ifdef __cplusplus -extern "C" -#endif -char strnicmp (); -#if defined __stub_strnicmp || defined __stub___strnicmp -choke me -#endif - -int main (void) -{ -return strnicmp (); - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_links_strnicmp="yes" - -else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_links_strnicmp="no" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - # - if test "$tst_links_strnicmp" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if strnicmp is prototyped" >&5 -printf %s "checking if strnicmp is prototyped... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - $curl_includes_string - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "strnicmp" >/dev/null 2>&1 -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_proto_strnicmp="yes" - -else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_proto_strnicmp="no" - -fi -rm -rf conftest* - - fi - # - if test "$tst_proto_strnicmp" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if strnicmp is compilable" >&5 -printf %s "checking if strnicmp is compilable... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - - $curl_includes_string - -int main (void) -{ - - if(0 != strnicmp(0, 0)) - return 1; - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_compi_strnicmp="yes" - -else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_compi_strnicmp="no" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - fi - # - if test "$tst_compi_strnicmp" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if strnicmp usage allowed" >&5 -printf %s "checking if strnicmp usage allowed... " >&6; } - if test "x$curl_disallow_strnicmp" != "xyes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_allow_strnicmp="yes" - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_allow_strnicmp="no" - fi - fi - # - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if strnicmp might be used" >&5 -printf %s "checking if strnicmp might be used... " >&6; } - if test "$tst_links_strnicmp" = "yes" && - test "$tst_proto_strnicmp" = "yes" && - test "$tst_compi_strnicmp" = "yes" && - test "$tst_allow_strnicmp" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - -printf "%s\n" "#define HAVE_STRNICMP 1" >>confdefs.h - - curl_cv_func_strnicmp="yes" - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - curl_cv_func_strnicmp="no" - fi - - - # - tst_links_strstr="unknown" - tst_proto_strstr="unknown" - tst_compi_strstr="unknown" - tst_allow_strstr="unknown" - # - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if strstr can be linked" >&5 -printf %s "checking if strstr can be linked... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#define strstr innocuous_strstr -#ifdef __STDC__ -# include -#else -# include -#endif -#undef strstr -#ifdef __cplusplus -extern "C" -#endif -char strstr (); -#if defined __stub_strstr || defined __stub___strstr -choke me -#endif - -int main (void) -{ -return strstr (); - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_links_strstr="yes" - -else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_links_strstr="no" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - # - if test "$tst_links_strstr" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if strstr is prototyped" >&5 -printf %s "checking if strstr is prototyped... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - $curl_includes_string - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "strstr" >/dev/null 2>&1 -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_proto_strstr="yes" - -else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_proto_strstr="no" - -fi -rm -rf conftest* - - fi - # - if test "$tst_proto_strstr" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if strstr is compilable" >&5 -printf %s "checking if strstr is compilable... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - - $curl_includes_string - -int main (void) -{ - - if(0 != strstr(0, 0)) - return 1; - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_compi_strstr="yes" - -else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_compi_strstr="no" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - fi - # - if test "$tst_compi_strstr" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if strstr usage allowed" >&5 -printf %s "checking if strstr usage allowed... " >&6; } - if test "x$curl_disallow_strstr" != "xyes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_allow_strstr="yes" - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_allow_strstr="no" - fi - fi - # - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if strstr might be used" >&5 -printf %s "checking if strstr might be used... " >&6; } - if test "$tst_links_strstr" = "yes" && - test "$tst_proto_strstr" = "yes" && - test "$tst_compi_strstr" = "yes" && - test "$tst_allow_strstr" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - -printf "%s\n" "#define HAVE_STRSTR 1" >>confdefs.h - - curl_cv_func_strstr="yes" - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - curl_cv_func_strstr="no" - fi - - # tst_links_strtok_r="unknown" tst_proto_strtok_r="unknown" @@ -44130,182 +43409,6 @@ printf "%s\n" "no" >&6; } fi -curl_includes_sys_uio="\ -/* includes start */ -#ifdef HAVE_SYS_TYPES_H -# include -#endif -#ifdef HAVE_SYS_UIO_H -# include -#endif -/* includes end */" - ac_fn_c_check_header_compile "$LINENO" "sys/types.h" "ac_cv_header_sys_types_h" "$curl_includes_sys_uio -" -if test "x$ac_cv_header_sys_types_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_TYPES_H 1" >>confdefs.h - -fi -ac_fn_c_check_header_compile "$LINENO" "sys/uio.h" "ac_cv_header_sys_uio_h" "$curl_includes_sys_uio -" -if test "x$ac_cv_header_sys_uio_h" = xyes -then : - printf "%s\n" "#define HAVE_SYS_UIO_H 1" >>confdefs.h - -fi - - - - # - tst_links_writev="unknown" - tst_proto_writev="unknown" - tst_compi_writev="unknown" - tst_allow_writev="unknown" - # - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if writev can be linked" >&5 -printf %s "checking if writev can be linked... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -#define writev innocuous_writev -#ifdef __STDC__ -# include -#else -# include -#endif -#undef writev -#ifdef __cplusplus -extern "C" -#endif -char writev (); -#if defined __stub_writev || defined __stub___writev -choke me -#endif - -int main (void) -{ -return writev (); - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_link "$LINENO" -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_links_writev="yes" - -else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_links_writev="no" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam \ - conftest$ac_exeext conftest.$ac_ext - # - if test "$tst_links_writev" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if writev is prototyped" >&5 -printf %s "checking if writev is prototyped... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - $curl_includes_sys_uio - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "writev" >/dev/null 2>&1 -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_proto_writev="yes" - -else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_proto_writev="no" - -fi -rm -rf conftest* - - fi - # - if test "$tst_proto_writev" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if writev is compilable" >&5 -printf %s "checking if writev is compilable... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - - $curl_includes_sys_uio - -int main (void) -{ - - if(0 != writev(0, 0, 0)) - return 1; - - ; - return 0; -} - -_ACEOF -if ac_fn_c_try_compile "$LINENO" -then : - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_compi_writev="yes" - -else $as_nop - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_compi_writev="no" - -fi -rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext - fi - # - if test "$tst_compi_writev" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if writev usage allowed" >&5 -printf %s "checking if writev usage allowed... " >&6; } - if test "x$curl_disallow_writev" != "xyes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - tst_allow_writev="yes" - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - tst_allow_writev="no" - fi - fi - # - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking if writev might be used" >&5 -printf %s "checking if writev might be used... " >&6; } - if test "$tst_links_writev" = "yes" && - test "$tst_proto_writev" = "yes" && - test "$tst_compi_writev" = "yes" && - test "$tst_allow_writev" = "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } - -printf "%s\n" "#define HAVE_WRITEV 1" >>confdefs.h - - curl_cv_func_writev="yes" - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 -printf "%s\n" "no" >&6; } - curl_cv_func_writev="no" - fi - - case $host in *msdosdjgpp) ac_cv_func_pipe=no @@ -44415,7 +43518,7 @@ fi - for ac_func in fnmatch geteuid getpass_r getppid getpwuid getpwuid_r getrlimit gettimeofday if_nametoindex mach_absolute_time pipe setlocale setmode setrlimit usleep utime utimes + for ac_func in fnmatch fchmod geteuid getpass_r getppid getpwuid getpwuid_r getrlimit gettimeofday if_nametoindex mach_absolute_time pipe sched_yield sendmsg setlocale setmode setrlimit utime utimes do : as_ac_var=`printf "%s\n" "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -44475,7 +43578,7 @@ fi done - # + # tst_method="unknown" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking how to set a socket into non-blocking mode" >&5 @@ -44652,16 +43755,12 @@ fi - - # if test "$want_ares" = "yes"; then clean_CPPFLAGS="$CPPFLAGS" clean_LDFLAGS="$LDFLAGS" clean_LIBS="$LIBS" - embedded_ares="unknown" configure_runpath=`pwd` - embedded_ares_builddir="$configure_runpath/ares" if test -n "$want_ares_path"; then ARES_PCDIR="$want_ares_path/lib/pkgconfig" @@ -44834,14 +43933,6 @@ printf "%s\n" "$as_me: pkg-config: ares CPPFLAGS: \"$ares_CPPFLAGS\"" >&6;} ares_LIBS="-lcares" fi else - if test -d "$srcdir/ares"; then - embedded_ares="yes" - subdirs="$subdirs ares" - - ares_CPPFLAGS="" - ares_LDFLAGS="-L$embedded_ares_builddir" - ares_LIBS="-lcares" - else if test -n "$PKG_CONFIG"; then PKGCONFIG="$PKG_CONFIG" @@ -44978,21 +44069,20 @@ printf "%s\n" "found" >&6; } fi fi - if test "$PKGCONFIG" != "no" ; then - ares_LIBS=`$PKGCONFIG --libs-only-l libcares` - ares_LDFLAGS=`$PKGCONFIG --libs-only-L libcares` - ares_CPPFLAGS=`$PKGCONFIG --cflags-only-I libcares` - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: pkg-config: ares_LIBS: \"$ares_LIBS\"" >&5 + if test "$PKGCONFIG" != "no" ; then + ares_LIBS=`$PKGCONFIG --libs-only-l libcares` + ares_LDFLAGS=`$PKGCONFIG --libs-only-L libcares` + ares_CPPFLAGS=`$PKGCONFIG --cflags-only-I libcares` + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: pkg-config: ares_LIBS: \"$ares_LIBS\"" >&5 printf "%s\n" "$as_me: pkg-config: ares_LIBS: \"$ares_LIBS\"" >&6;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: pkg-config: ares_LDFLAGS: \"$ares_LDFLAGS\"" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: pkg-config: ares_LDFLAGS: \"$ares_LDFLAGS\"" >&5 printf "%s\n" "$as_me: pkg-config: ares_LDFLAGS: \"$ares_LDFLAGS\"" >&6;} - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: pkg-config: ares_CPPFLAGS: \"$ares_CPPFLAGS\"" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: pkg-config: ares_CPPFLAGS: \"$ares_CPPFLAGS\"" >&5 printf "%s\n" "$as_me: pkg-config: ares_CPPFLAGS: \"$ares_CPPFLAGS\"" >&6;} - else - ares_CPPFLAGS="" - ares_LDFLAGS="" - ares_LIBS="-lcares" - fi + else + ares_CPPFLAGS="" + ares_LDFLAGS="" + ares_LIBS="-lcares" fi fi # @@ -45000,28 +44090,28 @@ printf "%s\n" "$as_me: pkg-config: ares_CPPFLAGS: \"$ares_CPPFLAGS\"" >&6;} LDFLAGS="$clean_LDFLAGS $ares_LDFLAGS" LIBS="$ares_LIBS $clean_LIBS" # - if test "$embedded_ares" != "yes"; then - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that c-ares is good and recent enough" >&5 + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking that c-ares is good and recent enough" >&5 printf %s "checking that c-ares is good and recent enough... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include - /* set of dummy functions in case c-ares was built with debug */ - void curl_dofree() { } - void curl_sclose() { } - void curl_domalloc() { } - void curl_docalloc() { } - void curl_socket() { } + /* set of dummy functions in case c-ares was built with debug */ + void curl_dofree() { } + void curl_sclose() { } + void curl_domalloc() { } + void curl_docalloc() { } + void curl_socket() { } int main (void) { - ares_channel channel; - ares_cancel(channel); /* added in 1.2.0 */ - ares_process_fd(channel, 0, 0); /* added in 1.4.0 */ - ares_dup(&channel, channel); /* added in 1.6.0 */ + ares_channel channel; + ares_cancel(channel); /* added in 1.2.0 */ + ares_process_fd(channel, 0, 0); /* added in 1.4.0 */ + ares_dup(&channel, channel); /* added in 1.6.0 */ ; return 0; @@ -45031,24 +44121,24 @@ _ACEOF if ac_fn_c_try_link "$LINENO" then : - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - as_fn_error $? "c-ares library defective or too old" "$LINENO" 5 - CPPFLAGS="$clean_CPPFLAGS" - LDFLAGS="$clean_LDFLAGS" - LIBS="$clean_LIBS" - # prevent usage - want_ares="no" + as_fn_error $? "c-ares library defective or too old" "$LINENO" 5 + CPPFLAGS="$clean_CPPFLAGS" + LDFLAGS="$clean_LDFLAGS" + LIBS="$clean_LIBS" + # prevent usage + want_ares="no" fi rm -f core conftest.err conftest.$ac_objext conftest.beam \ conftest$ac_exeext conftest.$ac_ext - fi + if test "$want_ares" = "yes"; then printf "%s\n" "#define USE_ARES 1" >>confdefs.h @@ -45059,14 +44149,6 @@ printf "%s\n" "#define USE_ARES 1" >>confdefs.h fi fi - if test x$embedded_ares = xyes; then - USE_EMBEDDED_ARES_TRUE= - USE_EMBEDDED_ARES_FALSE='#' -else - USE_EMBEDDED_ARES_TRUE='#' - USE_EMBEDDED_ARES_FALSE= -fi - if test "x$curl_cv_native_windows" != "xyes" && test "x$enable_shared" = "xyes"; then @@ -45178,9 +44260,25 @@ fi if test "$USE_THREADS_POSIX" != "1" then - CFLAGS="$CFLAGS -pthread" # assign PTHREAD for pkg-config use PTHREAD=" -pthread" + + case $host in + *-ibm-aix*) + COMPILER_VERSION=`"$CC" -qversion 2>/dev/null` + if test x"$COMPILER_VERSION" = "x"; then + CFLAGS="$CFLAGS -pthread" + else + CFLAGS="$CFLAGS -qthreaded" + fi + ;; + powerpc-*amigaos*) + PTHREAD=" -lpthread" + ;; + *) + CFLAGS="$CFLAGS -pthread" + ;; + esac { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 printf %s "checking for pthread_create in -lpthread... " >&6; } if test ${ac_cv_lib_pthread_pthread_create+y} @@ -45804,8 +44902,33 @@ printf "%s\n" "yes" >&6; } ;; esac else $as_nop - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + +fi + + +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to support headers-api" >&5 +printf %s "checking whether to support headers-api... " >&6; } +# Check whether --enable-headers-api was given. +if test ${enable_headers_api+y} +then : + enableval=$enable_headers_api; case "$enableval" in + no) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } + curl_headers_msg="no (--enable-headers-api)" + +printf "%s\n" "#define CURL_DISABLE_HEADERS_API 1" >>confdefs.h + + ;; + *) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + ;; + esac +else $as_nop + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } fi @@ -46034,7 +45157,8 @@ if test "x$USE_NGHTTP2" = "x1" -o "x$USE_HYPER" = "x1"; then SUPPORT_FEATURES="$SUPPORT_FEATURES HTTP2" fi -if test "x$USE_NGTCP2" = "x1" -o "x$USE_QUICHE" = "x1"; then +if test "x$USE_NGTCP2" = "x1" -o "x$USE_QUICHE" = "x1" \ + -o "x$USE_MSH3" = "x1"; then SUPPORT_FEATURES="$SUPPORT_FEATURES HTTP3" fi @@ -46060,6 +45184,36 @@ if test ${ac_cv_sizeof_curl_off_t} -gt 4; then fi fi +if test "$tst_atomic" = "yes"; then + SUPPORT_FEATURES="$SUPPORT_FEATURES threadsafe" +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + + #include + +int main (void) +{ + + #if (WINVER < 0x600) && (_WIN32_WINNT < 0x600) + #error + #endif + + ; + return 0; +} + +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + + SUPPORT_FEATURES="$SUPPORT_FEATURES threadsafe" + +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + SUPPORT_FEATURES=`echo $SUPPORT_FEATURES | tr ' ' '\012' | sort | tr '\012' ' '` @@ -46342,7 +45496,7 @@ if test "x$want_curldebug_assumed" = "xyes" && ac_configure_args="$ac_configure_args --enable-curldebug" fi -ac_config_files="$ac_config_files Makefile docs/Makefile docs/examples/Makefile docs/libcurl/Makefile docs/libcurl/opts/Makefile docs/cmdline-opts/Makefile include/Makefile include/curl/Makefile src/Makefile lib/Makefile scripts/Makefile lib/libcurl.vers tests/Makefile tests/certs/Makefile tests/certs/scripts/Makefile tests/data/Makefile tests/server/Makefile tests/libtest/Makefile tests/unit/Makefile packages/Makefile packages/vms/Makefile curl-config libcurl.pc" +ac_config_files="$ac_config_files Makefile docs/Makefile docs/examples/Makefile docs/libcurl/Makefile docs/libcurl/opts/Makefile docs/cmdline-opts/Makefile include/Makefile include/curl/Makefile src/Makefile lib/Makefile scripts/Makefile lib/libcurl.vers lib/libcurl.plist tests/Makefile tests/certs/Makefile tests/certs/scripts/Makefile tests/data/Makefile tests/server/Makefile tests/libtest/Makefile tests/unit/Makefile packages/Makefile packages/vms/Makefile curl-config libcurl.pc" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -46537,10 +45691,6 @@ if test -z "${USE_MANUAL_TRUE}" && test -z "${USE_MANUAL_FALSE}"; then as_fn_error $? "conditional \"USE_MANUAL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${USE_EMBEDDED_ARES_TRUE}" && test -z "${USE_EMBEDDED_ARES_FALSE}"; then - as_fn_error $? "conditional \"USE_EMBEDDED_ARES\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${BUILD_LIBHOSTNAME_TRUE}" && test -z "${BUILD_LIBHOSTNAME_FALSE}"; then as_fn_error $? "conditional \"BUILD_LIBHOSTNAME\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -47169,12 +46319,14 @@ lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_q lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' +FILECMD='`$ECHO "$FILECMD" | $SED "$delay_single_quote_subst"`' deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`' want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' +lt_ar_flags='`$ECHO "$lt_ar_flags" | $SED "$delay_single_quote_subst"`' AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' @@ -47298,13 +46450,13 @@ LN_S \ lt_SP2NL \ lt_NL2SP \ reload_flag \ +FILECMD \ deplibs_check_method \ file_magic_cmd \ file_magic_glob \ want_nocaseglob \ sharedlib_from_linklib_cmd \ AR \ -AR_FLAGS \ archiver_list_spec \ STRIP \ RANLIB \ @@ -47432,6 +46584,7 @@ do "lib/Makefile") CONFIG_FILES="$CONFIG_FILES lib/Makefile" ;; "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; "lib/libcurl.vers") CONFIG_FILES="$CONFIG_FILES lib/libcurl.vers" ;; + "lib/libcurl.plist") CONFIG_FILES="$CONFIG_FILES lib/libcurl.plist" ;; "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; "tests/certs/Makefile") CONFIG_FILES="$CONFIG_FILES tests/certs/Makefile" ;; "tests/certs/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES tests/certs/scripts/Makefile" ;; @@ -48277,6 +47430,9 @@ to_host_file_cmd=$lt_cv_to_host_file_cmd # convert \$build files to toolchain format. to_tool_file_cmd=$lt_cv_to_tool_file_cmd +# A file(cmd) program that detects file types. +FILECMD=$lt_FILECMD + # Method to check whether dependent libraries are shared objects. deplibs_check_method=$lt_deplibs_check_method @@ -48295,8 +47451,11 @@ sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd # The archiver. AR=$lt_AR +# Flags to create an archive (by configure). +lt_ar_flags=$lt_ar_flags + # Flags to create an archive. -AR_FLAGS=$lt_AR_FLAGS +AR_FLAGS=\${ARFLAGS-"\$lt_ar_flags"} # How to feed a file listing to the archiver. archiver_list_spec=$lt_archiver_list_spec @@ -48672,7 +47831,7 @@ ltmain=$ac_aux_dir/ltmain.sh # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ + $SED '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) mv -f "$cfgfile" "$ofile" || @@ -48713,149 +47872,6 @@ if test "$no_create" != yes; then # would make configure fail if this is the last instruction. $ac_cs_success || as_fn_exit 1 fi - -# -# CONFIG_SUBDIRS section. -# -if test "$no_recursion" != yes; then - - # Remove --cache-file, --srcdir, and --disable-option-checking arguments - # so they do not pile up. - ac_sub_configure_args= - ac_prev= - eval "set x $ac_configure_args" - shift - for ac_arg - do - if test -n "$ac_prev"; then - ac_prev= - continue - fi - case $ac_arg in - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* \ - | --c=*) - ;; - --config-cache | -C) - ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - ;; - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - ;; - --disable-option-checking) - ;; - *) - case $ac_arg in - *\'*) ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - as_fn_append ac_sub_configure_args " '$ac_arg'" ;; - esac - done - - # Always prepend --prefix to ensure using the same prefix - # in subdir configurations. - ac_arg="--prefix=$prefix" - case $ac_arg in - *\'*) ac_arg=`printf "%s\n" "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - ac_sub_configure_args="'$ac_arg' $ac_sub_configure_args" - - # Pass --silent - if test "$silent" = yes; then - ac_sub_configure_args="--silent $ac_sub_configure_args" - fi - - # Always prepend --disable-option-checking to silence warnings, since - # different subdirs can have different --enable and --with options. - ac_sub_configure_args="--disable-option-checking $ac_sub_configure_args" - - ac_popdir=`pwd` - for ac_dir in : $subdirs; do test "x$ac_dir" = x: && continue - - # Do not complain, so a configure script can configure whichever - # parts of a large source tree are present. - test -d "$srcdir/$ac_dir" || continue - - ac_msg="=== configuring in $ac_dir (`pwd`/$ac_dir)" - printf "%s\n" "$as_me:${as_lineno-$LINENO}: $ac_msg" >&5 - printf "%s\n" "$ac_msg" >&6 - as_dir="$ac_dir"; as_fn_mkdir_p - ac_builddir=. - -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`printf "%s\n" "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`printf "%s\n" "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix - -case $srcdir in - .) # We are building in place. - ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; -esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - - cd "$ac_dir" - - # Check for configure.gnu first; this name is used for a wrapper for - # Metaconfig's "Configure" on case-insensitive file systems. - if test -f "$ac_srcdir/configure.gnu"; then - ac_sub_configure=$ac_srcdir/configure.gnu - elif test -f "$ac_srcdir/configure"; then - ac_sub_configure=$ac_srcdir/configure - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: no configuration information is in $ac_dir" >&5 -printf "%s\n" "$as_me: WARNING: no configuration information is in $ac_dir" >&2;} - ac_sub_configure= - fi - - # The recursion is here. - if test -n "$ac_sub_configure"; then - # Make the cache file name correct relative to the subdirectory. - case $cache_file in - [\\/]* | ?:[\\/]* ) ac_sub_cache_file=$cache_file ;; - *) # Relative name. - ac_sub_cache_file=$ac_top_build_prefix$cache_file ;; - esac - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&5 -printf "%s\n" "$as_me: running $SHELL $ac_sub_configure $ac_sub_configure_args --cache-file=$ac_sub_cache_file --srcdir=$ac_srcdir" >&6;} - # The eval makes quoting arguments work. - eval "\$SHELL \"\$ac_sub_configure\" $ac_sub_configure_args \ - --cache-file=\"\$ac_sub_cache_file\" --srcdir=\"\$ac_srcdir\"" || - as_fn_error $? "$ac_sub_configure failed for $ac_dir" "$LINENO" 5 - fi - - cd "$ac_popdir" - done -fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} @@ -49037,6 +48053,7 @@ done RTMP: ${curl_rtmp_msg} PSL: ${curl_psl_msg} Alt-svc: ${curl_altsvc_msg} + Headers API: ${curl_headers_msg} HSTS: ${curl_hsts_msg} HTTP1: ${curl_h1_msg} HTTP2: ${curl_h2_msg} @@ -49083,6 +48100,7 @@ printf "%s\n" "$as_me: Configured to build curl/libcurl: RTMP: ${curl_rtmp_msg} PSL: ${curl_psl_msg} Alt-svc: ${curl_altsvc_msg} + Headers API: ${curl_headers_msg} HSTS: ${curl_hsts_msg} HTTP1: ${curl_h1_msg} HTTP2: ${curl_h2_msg} diff --git a/trunk/libs/libcurl/curl-7.x/configure.ac b/trunk/libs/libcurl/curl-7.x/configure.ac index 152b0472..30c881f3 100644 --- a/trunk/libs/libcurl/curl-7.x/configure.ac +++ b/trunk/libs/libcurl/curl-7.x/configure.ac @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# #*************************************************************************** dnl Process this file with autoconf to produce a configure script. @@ -31,7 +33,7 @@ XC_OVR_ZZ60 CURL_OVERRIDE_AUTOCONF dnl configure script copyright -AC_COPYRIGHT([Copyright (c) 1998 - 2021 Daniel Stenberg, +AC_COPYRIGHT([Copyright (c) 1998 - 2022 Daniel Stenberg, This configure script may be copied, distributed and modified under the terms of the curl license; see COPYING for more details]) @@ -118,6 +120,7 @@ AC_SUBST(libext) dnl figure out the libcurl version CURLVERSION=`$SED -ne 's/^#define LIBCURL_VERSION "\(.*\)".*/\1/p' ${srcdir}/include/curl/curlver.h` XC_CHECK_PROG_CC +CURL_ATOMIC dnl for --enable-code-coverage CURL_COVERAGE @@ -143,7 +146,7 @@ AC_SUBST(PKGADD_VENDOR) dnl dnl initialize all the info variables - curl_ssl_msg="no (--with-{openssl,gnutls,nss,mbedtls,wolfssl,schannel,secure-transport,mesalink,amissl,bearssl,rustls} )" + curl_ssl_msg="no (--with-{openssl,gnutls,nss,mbedtls,wolfssl,schannel,secure-transport,amissl,bearssl,rustls} )" curl_ssh_msg="no (--with-{libssh,libssh2})" curl_zlib_msg="no (--with-zlib)" curl_brotli_msg="no (--with-brotli)" @@ -165,11 +168,12 @@ curl_verbose_msg="enabled (--disable-verbose)" curl_rtmp_msg="no (--with-librtmp)" curl_psl_msg="no (--with-libpsl)" curl_altsvc_msg="enabled (--disable-alt-svc)" +curl_headers_msg="enabled (--disable-headers-api)" curl_hsts_msg="enabled (--disable-hsts)" ssl_backends= curl_h1_msg="enabled (internal)" curl_h2_msg="no (--with-nghttp2, --with-hyper)" - curl_h3_msg="no (--with-ngtcp2, --with-quiche)" + curl_h3_msg="no (--with-ngtcp2, --with-quiche --with-msh3)" enable_altsvc="yes" hsts="yes" @@ -192,73 +196,108 @@ AS_HELP_STRING([--with-schannel],[enable Windows native SSL/TLS]), OPT_SECURETRANSPORT=no AC_ARG_WITH(secure-transport,dnl -AS_HELP_STRING([--with-secure-transport],[enable Apple OS native SSL/TLS]), +AS_HELP_STRING([--with-secure-transport],[enable Apple OS native SSL/TLS]),[ OPT_SECURETRANSPORT=$withval - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }Secure-Transport" -) + TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }Secure-Transport" +]) OPT_AMISSL=no AC_ARG_WITH(amissl,dnl -AS_HELP_STRING([--with-amissl],[enable Amiga native SSL/TLS (AmiSSL)]), +AS_HELP_STRING([--with-amissl],[enable Amiga native SSL/TLS (AmiSSL)]),[ OPT_AMISSL=$withval - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }AmiSSL") + TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }AmiSSL" +]) OPT_OPENSSL=no dnl Default to no CA bundle ca="no" AC_ARG_WITH(ssl,dnl AS_HELP_STRING([--with-ssl=PATH],[old version of --with-openssl]) -AS_HELP_STRING([--without-ssl], [build without any TLS library]), +AS_HELP_STRING([--without-ssl], [build without any TLS library]),[ OPT_SSL=$withval OPT_OPENSSL=$withval - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }OpenSSL") + if test X"$withval" != Xno; then + TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }OpenSSL" + else + SSL_DISABLED="D" + fi +]) AC_ARG_WITH(openssl,dnl -AS_HELP_STRING([--with-openssl=PATH],[Where to look for OpenSSL, PATH points to the SSL installation (default: /usr/local/ssl); when possible, set the PKG_CONFIG_PATH environment variable instead of using this option]), +AS_HELP_STRING([--with-openssl=PATH],[Where to look for OpenSSL, PATH points to the SSL installation (default: /usr/local/ssl); when possible, set the PKG_CONFIG_PATH environment variable instead of using this option]),[ OPT_OPENSSL=$withval - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }OpenSSL") + if test X"$withval" != Xno; then + TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }OpenSSL" + fi +]) OPT_GNUTLS=no AC_ARG_WITH(gnutls,dnl -AS_HELP_STRING([--with-gnutls=PATH],[where to look for GnuTLS, PATH points to the installation root]), +AS_HELP_STRING([--with-gnutls=PATH],[where to look for GnuTLS, PATH points to the installation root]),[ OPT_GNUTLS=$withval - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }GnuTLS") + if test X"$withval" != Xno; then + TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }GnuTLS" + fi +]) OPT_MBEDTLS=no AC_ARG_WITH(mbedtls,dnl -AS_HELP_STRING([--with-mbedtls=PATH],[where to look for mbedTLS, PATH points to the installation root]), +AS_HELP_STRING([--with-mbedtls=PATH],[where to look for mbedTLS, PATH points to the installation root]),[ OPT_MBEDTLS=$withval - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }mbedTLS") + if test X"$withval" != Xno; then + TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }mbedTLS" + fi +]) OPT_WOLFSSL=no AC_ARG_WITH(wolfssl,dnl -AS_HELP_STRING([--with-wolfssl=PATH],[where to look for WolfSSL, PATH points to the installation root (default: system lib default)]), +AS_HELP_STRING([--with-wolfssl=PATH],[where to look for WolfSSL, PATH points to the installation root (default: system lib default)]),[ OPT_WOLFSSL=$withval - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }wolfSSL") - -OPT_MESALINK=no -AC_ARG_WITH(mesalink,dnl -AS_HELP_STRING([--with-mesalink=PATH],[where to look for MesaLink, PATH points to the installation root]), - OPT_MESALINK=$withval - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }MesaLink") + if test X"$withval" != Xno; then + TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }wolfSSL" + fi +]) OPT_BEARSSL=no AC_ARG_WITH(bearssl,dnl -AS_HELP_STRING([--with-bearssl=PATH],[where to look for BearSSL, PATH points to the installation root]), +AS_HELP_STRING([--with-bearssl=PATH],[where to look for BearSSL, PATH points to the installation root]),[ OPT_BEARSSL=$withval - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }BearSSL") + if test X"$withval" != Xno; then + TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }BearSSL" + fi +]) OPT_RUSTLS=no AC_ARG_WITH(rustls,dnl -AS_HELP_STRING([--with-rustls=PATH],[where to look for rustls, PATH points to the installation root]), +AS_HELP_STRING([--with-rustls=PATH],[where to look for rustls, PATH points to the installation root]),[ OPT_RUSTLS=$withval - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }rustls") + if test X"$withval" != Xno; then + TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }rustls" + experimental="$experimental rustls" + fi +]) + +OPT_NSS_AWARE=no +AC_ARG_WITH(nss-deprecated,dnl +AS_HELP_STRING([--with-nss-deprecated],[confirm you realize NSS is going away]), + if test X"$withval" != Xno; then + OPT_NSS_AWARE=$withval + fi +) OPT_NSS=no AC_ARG_WITH(nss,dnl AS_HELP_STRING([--with-nss=PATH],[where to look for NSS, PATH points to the installation root]), OPT_NSS=$withval - test -z "TLSCHOICE" || TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }NSS") + if test X"$withval" != Xno; then + + if test X"$OPT_NSS_AWARE" = "Xno" ; then + AC_MSG_ERROR([NSS use must be confirmed using --with-nss-deprecated. NSS support will be dropped from curl in August 2022. See docs/DEPRECATE.md]) + fi + + [TLSCHOICE="${TLSCHOICE:+$TLSCHOICE, }NSS"] + fi +) dnl If no TLS choice has been made, check if it was explicitly disabled or dnl error out to force the user to decide. @@ -272,7 +311,6 @@ Select from these: --with-bearssl --with-gnutls --with-mbedtls - --with-mesalink --with-nss --with-openssl (also works for BoringSSL and libressl) --with-rustls @@ -472,12 +510,34 @@ case $host in ;; esac +# Detect original MinGW (not MinGW-w64) +curl_mingw_original=no +case $host in + *-*-mingw32*) + AC_MSG_CHECKING([using original MinGW (not MinGW-w64)]) + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([[ +#include <_mingw.h> + ]],[[ +#if defined(__MINGW64_VERSION_MAJOR) +#error +#endif + ]]) + ],[ + curl_mingw_original=yes + AC_MSG_RESULT([yes]) + ],[ + AC_MSG_RESULT([no]) + ]) + ;; +esac + dnl ********************************************************************** dnl Compilation based checks should not be done before this point. dnl ********************************************************************** dnl ********************************************************************** -dnl Make sure that our checks for headers windows.h winsock.h winsock2.h +dnl Make sure that our checks for headers windows.h winsock2.h dnl and ws2tcpip.h take precedence over any other further checks which dnl could be done later using AC_CHECK_HEADER or AC_CHECK_HEADERS for dnl this specific header files. And do them before its results are used. @@ -487,20 +547,16 @@ CURL_CHECK_HEADER_WINDOWS CURL_CHECK_NATIVE_WINDOWS case X-"$curl_cv_native_windows" in X-yes) - CURL_CHECK_HEADER_WINSOCK CURL_CHECK_HEADER_WINSOCK2 CURL_CHECK_HEADER_WS2TCPIP CURL_CHECK_HEADER_WINCRYPT CURL_CHECK_HEADER_WINLDAP - CURL_CHECK_HEADER_WINBER ;; *) - curl_cv_header_winsock_h="no" curl_cv_header_winsock2_h="no" curl_cv_header_ws2tcpip_h="no" curl_cv_header_wincrypt_h="no" curl_cv_header_winldap_h="no" - curl_cv_header_winber_h="no" ;; esac CURL_CHECK_WIN32_LARGEFILE @@ -674,7 +730,7 @@ if test X"$want_hyper" != Xno; then LIB_HYPER="-lhyper -ldl -lpthread -lm" if test X"$want_hyper" != Xdefault; then CPP_HYPER=-I"$want_hyper_path/capi/include" - LD_HYPER="-L$want_hyper_path/target/debug" + LD_HYPER="-L$want_hyper_path/target/release -L$want_hyper_path/target/debug" fi fi if test -n "$LIB_HYPER"; then @@ -687,7 +743,8 @@ if test X"$want_hyper" != Xno; then LIBS="$LIB_HYPER $LIBS" if test "x$cross_compiling" != "xyes"; then - DIR_HYPER=`echo $LD_HYPER | $SED -e 's/^-L//'` + dnl remove -L, separate with colon if more than one + DIR_HYPER=`echo $LD_HYPER | $SED -e 's/^-L//' -e 's/ -L/:/g'` fi AC_CHECK_LIB(hyper, hyper_io_new, @@ -705,6 +762,11 @@ if test X"$want_hyper" != Xno; then AC_MSG_NOTICE([Added $DIR_HYPER to CURL_LIBRARY_PATH]), ) ], + for d in `echo $DIR_HYPER | $SED -e 's/:/ /'`; do + if test -f "$d/libhyper.a"; then + AC_MSG_ERROR([hyper was found in $d but was probably built with wrong flags. See docs/HYPER.md.]) + fi + done AC_MSG_ERROR([--with-hyper but hyper was not found. See docs/HYPER.md.]) ) fi @@ -1022,16 +1084,6 @@ if test "$HAVE_GETHOSTBYNAME" != "1" then dnl This is for winsock systems if test "$curl_cv_header_windows_h" = "yes"; then - if test "$curl_cv_header_winsock_h" = "yes"; then - case $host in - *-*-mingw32ce*) - winsock_LIB="-lwinsock" - ;; - *) - winsock_LIB="-lwsock32" - ;; - esac - fi if test "$curl_cv_header_winsock2_h" = "yes"; then winsock_LIB="-lws2_32" fi @@ -1048,10 +1100,6 @@ then #include #ifdef HAVE_WINSOCK2_H #include -#else -#ifdef HAVE_WINSOCK_H -#include -#endif #endif #endif ]],[[ @@ -1113,8 +1161,13 @@ then AC_MSG_CHECKING([for gethostbyname for AmigaOS bsdsocket.library]) AC_LINK_IFELSE([ AC_LANG_PROGRAM([[ + #define __USE_INLINE__ #include + #ifdef __amigaos4__ + struct SocketIFace *ISocket = NULL; + #else struct Library *SocketBase = NULL; + #endif ]],[[ gethostbyname("www.dummysite.com"); ]]) @@ -1138,16 +1191,6 @@ then ]) fi -if test "$HAVE_GETHOSTBYNAME" != "1" -then - dnl gethostbyname in the net lib - for BeOS - AC_CHECK_LIB(net, gethostbyname, - [HAVE_GETHOSTBYNAME="1" - LIBS="-lnet $LIBS" - ]) -fi - - if test "$HAVE_GETHOSTBYNAME" != "1"; then AC_MSG_ERROR([couldn't find libraries for gethostbyname()]) fi @@ -1472,7 +1515,6 @@ if test x$CURL_DISABLE_LDAP != x1 ; then CURL_CHECK_HEADER_LBER CURL_CHECK_HEADER_LDAP - CURL_CHECK_HEADER_LDAPSSL CURL_CHECK_HEADER_LDAP_SSL if test -z "$LDAPLIBNAME" ; then @@ -1528,7 +1570,7 @@ if test x$CURL_DISABLE_LDAP != x1 ; then fi if test x$CURL_DISABLE_LDAP != x1 ; then - AC_CHECK_FUNCS([ldap_url_parse ldap_init_fd]) + AC_CHECK_FUNCS([ldap_url_parse]) if test "$LDAPLIBNAME" = "wldap32"; then curl_ldap_msg="enabled (winldap)" @@ -1700,9 +1742,16 @@ AC_MSG_CHECKING([if GSS-API support is requested]) if test x"$want_gss" = xyes; then AC_MSG_RESULT(yes) + if test $GSSAPI_ROOT != "/usr"; then + CURL_CHECK_PKGCONFIG(mit-krb5-gssapi, $GSSAPI_ROOT/lib/pkgconfig) + else + CURL_CHECK_PKGCONFIG(mit-krb5-gssapi) + fi if test -z "$GSSAPI_INCS"; then if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi` + elif test "$PKGCONFIG" != "no" ; then + GSSAPI_INCS=`$PKGCONFIG --cflags mit-krb5-gssapi` elif test -f "$KRB5CONFIG"; then GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi` elif test "$GSSAPI_ROOT" != "yes"; then @@ -1789,11 +1838,19 @@ if test x"$want_gss" = xyes; then LIBS="-lgssapi_krb5 -lresolv $LIBS" ;; *) + if test $GSSAPI_ROOT != "/usr"; then + CURL_CHECK_PKGCONFIG(mit-krb5-gssapi, $GSSAPI_ROOT/lib/pkgconfig) + else + CURL_CHECK_PKGCONFIG(mit-krb5-gssapi) + fi if test -n "$host_alias" -a -f "$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then dnl krb5-config doesn't have --libs-only-L or similar, put everything dnl into LIBS gss_libs=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --libs gssapi` LIBS="$gss_libs $LIBS" + elif test "$PKGCONFIG" != "no" ; then + gss_libs=`$PKGCONFIG --libs mit-krb5-gssapi` + LIBS="$gss_libs $LIBS" elif test -f "$KRB5CONFIG"; then dnl krb5-config doesn't have --libs-only-L or similar, put everything dnl into LIBS @@ -1833,6 +1890,18 @@ else CPPFLAGS="$save_CPPFLAGS" fi +if test x"$want_gss" = xyes; then + AC_MSG_CHECKING([if we can link against GSS-API library]) + AC_LINK_IFELSE([ + AC_LANG_FUNC_LINK_TRY([gss_init_sec_context]) + ],[ + AC_MSG_RESULT([yes]) + ],[ + AC_MSG_RESULT([no]) + AC_MSG_ERROR([--with-gssapi was specified, but a GSS-API library was not found.]) + ]) +fi + build_libstubgss=no if test x"$want_gss" = "xyes"; then build_libstubgss=yes @@ -1873,7 +1942,6 @@ CURL_WITH_OPENSSL CURL_WITH_GNUTLS CURL_WITH_MBEDTLS CURL_WITH_WOLFSSL -CURL_WITH_MESALINK CURL_WITH_BEARSSL CURL_WITH_RUSTLS CURL_WITH_NSS @@ -1883,11 +1951,17 @@ if test "x$USE_WIN32_CRYPTO" = "x1" -o "x$USE_SCHANNEL" = "x1"; then LIBS="-ladvapi32 -lcrypt32 $LIBS" fi -case "x$OPENSSL_ENABLED$GNUTLS_ENABLED$NSS_ENABLED$MBEDTLS_ENABLED$WOLFSSL_ENABLED$SCHANNEL_ENABLED$SECURETRANSPORT_ENABLED$MESALINK_ENABLED$BEARSSL_ENABLED$AMISSL_ENABLED$RUSTLS_ENABLED" +dnl link bcrypt for BCryptGenRandom() (used when building for Vista or newer) +if test "x$curl_cv_native_windows" = "xyes" && + test "x$curl_mingw_original" = "xno"; then + LIBS="-lbcrypt $LIBS" +fi + +case "x$OPENSSL_ENABLED$GNUTLS_ENABLED$NSS_ENABLED$MBEDTLS_ENABLED$WOLFSSL_ENABLED$SCHANNEL_ENABLED$SECURETRANSPORT_ENABLED$BEARSSL_ENABLED$RUSTLS_ENABLED$SSL_DISABLED" in x) - AC_MSG_WARN([SSL disabled, you will not be able to use HTTPS, FTPS, NTLM and more.]) - AC_MSG_WARN([Use --with-openssl, --with-gnutls, --with-wolfssl, --with-mbedtls, --with-nss, --with-schannel, --with-secure-transport, --with-mesalink, --with-amissl, --with-bearssl or --with-rustls to address this.]) + AC_MSG_ERROR([TLS not detected, you will not be able to use HTTPS, FTPS, NTLM and more. +Use --with-openssl, --with-gnutls, --with-wolfssl, --with-mbedtls, --with-nss, --with-schannel, --with-secure-transport, --with-amissl, --with-bearssl or --with-rustls to address this.]) ;; x1) # one SSL backend is enabled @@ -1895,6 +1969,9 @@ x1) SSL_ENABLED="1" AC_MSG_NOTICE([built with one SSL backend]) ;; +xD) + # explicitly built without TLS + ;; *) # more than one SSL backend is enabled AC_SUBST(SSL_ENABLED) @@ -2303,6 +2380,10 @@ AC_SUBST([CURL_LT_SHLIB_VERSIONED_FLAVOUR], AM_CONDITIONAL([CURL_LT_SHLIB_USE_VERSIONED_SYMBOLS], [test "x$versioned_symbols" = 'xyes']) +dnl Update .plist file with current version +AC_SUBST([CURL_PLIST_VERSION], + ["$CURLVERSION"]) + dnl ------------------------------------------------- dnl check winidn option before other IDN libraries dnl ------------------------------------------------- @@ -2411,31 +2492,36 @@ AC_ARG_WITH(libidn2, AS_HELP_STRING([--with-libidn2=PATH],[Enable libidn2 usage]) AS_HELP_STRING([--without-libidn2],[Disable libidn2 usage]), [OPT_IDN=$withval]) -case "$OPT_IDN" in - no) - dnl --without-libidn2 option used - want_idn="no" - AC_MSG_RESULT([no]) - ;; - default) - dnl configure option not specified - want_idn="yes" - want_idn_path="default" - AC_MSG_RESULT([(assumed) yes]) - ;; - yes) - dnl --with-libidn2 option used without path - want_idn="yes" - want_idn_path="default" - AC_MSG_RESULT([yes]) - ;; - *) - dnl --with-libidn2 option used with path - want_idn="yes" - want_idn_path="$withval" - AC_MSG_RESULT([yes ($withval)]) - ;; -esac +if test "x$tst_links_winidn" = "xyes"; then + want_idn="no" + AC_MSG_RESULT([no (using winidn instead)]) +else + case "$OPT_IDN" in + no) + dnl --without-libidn2 option used + want_idn="no" + AC_MSG_RESULT([no]) + ;; + default) + dnl configure option not specified + want_idn="yes" + want_idn_path="default" + AC_MSG_RESULT([(assumed) yes]) + ;; + yes) + dnl --with-libidn2 option used without path + want_idn="yes" + want_idn_path="default" + AC_MSG_RESULT([yes]) + ;; + *) + dnl --with-libidn2 option used with path + want_idn="yes" + want_idn_path="$withval" + AC_MSG_RESULT([yes ($withval)]) + ;; + esac +fi if test "$want_idn" = "yes"; then dnl idn library support has been requested @@ -2525,20 +2611,14 @@ if test "$want_idn" = "yes"; then fi fi - -dnl Let's hope this split URL remains working: -dnl https://www15.software.ibm.com/doc_link/en_US/a_doc_lib/aixprggd/ \ -dnl genprogc/thread_quick_ref.htm - - dnl ********************************************************************** dnl Check for nghttp2 dnl ********************************************************************** OPT_H2="yes" -if test "x$disable_http" = "xyes"; then - # without HTTP, nghttp2 is no use +if test "x$disable_http" = "xyes" -o X"$want_hyper" != Xno; then + # without HTTP or with Hyper, nghttp2 is no use OPT_H2="no" fi @@ -2549,71 +2629,79 @@ AS_HELP_STRING([--without-nghttp2],[Disable nghttp2 usage]), case "$OPT_H2" in no) dnl --without-nghttp2 option used - want_h2="no" + want_nghttp2="no" ;; yes) dnl --with-nghttp2 option used without path - want_h2="default" - want_h2_path="" + want_nghttp2="default" + want_nghttp2_path="" + want_nghttp2_pkg_config_path="" ;; *) dnl --with-nghttp2 option used with path - want_h2="yes" - want_h2_path="$withval/lib/pkgconfig" + want_nghttp2="yes" + want_nghttp2_path="$withval" + want_nghttp2_pkg_config_path="$withval/lib/pkgconfig" ;; esac -if test X"$want_h2" != Xno; then +if test X"$want_nghttp2" != Xno; then dnl backup the pre-nghttp2 variables CLEANLDFLAGS="$LDFLAGS" CLEANCPPFLAGS="$CPPFLAGS" CLEANLIBS="$LIBS" - CURL_CHECK_PKGCONFIG(libnghttp2, $want_h2_path) + CURL_CHECK_PKGCONFIG(libnghttp2, $want_nghttp2_pkg_config_path) if test "$PKGCONFIG" != "no" ; then - LIB_H2=`CURL_EXPORT_PCDIR([$want_h2_path]) + LIB_H2=`CURL_EXPORT_PCDIR([$want_nghttp2_pkg_config_path]) $PKGCONFIG --libs-only-l libnghttp2` AC_MSG_NOTICE([-l is $LIB_H2]) - CPP_H2=`CURL_EXPORT_PCDIR([$want_h2_path]) dnl + CPP_H2=`CURL_EXPORT_PCDIR([$want_nghttp2_pkg_config_path]) dnl $PKGCONFIG --cflags-only-I libnghttp2` AC_MSG_NOTICE([-I is $CPP_H2]) - LD_H2=`CURL_EXPORT_PCDIR([$want_h2_path]) + LD_H2=`CURL_EXPORT_PCDIR([$want_nghttp2_pkg_config_path]) $PKGCONFIG --libs-only-L libnghttp2` AC_MSG_NOTICE([-L is $LD_H2]) - LDFLAGS="$LDFLAGS $LD_H2" - CPPFLAGS="$CPPFLAGS $CPP_H2" - LIBS="$LIB_H2 $LIBS" + DIR_H2=`echo $LD_H2 | $SED -e 's/^-L//'` + elif test x"$want_nghttp2_path" != x; then + LIB_H2="-lnghttp2" + LD_H2=-L${want_nghttp2_path}/lib$libsuff + CPP_H2=-I${want_nghttp2_path}/include + DIR_H2=${want_nghttp2_path}/lib$libsuff + elif test X"$want_nghttp2" != Xdefault; then + dnl no nghttp2 pkg-config found and no custom directory specified, + dnl deal with it + AC_MSG_ERROR([--with-nghttp2 was specified but could not find libnghttp2 pkg-config file.]) + fi - # use nghttp2_session_set_local_window_size to require nghttp2 - # >= 1.12.0 - AC_CHECK_LIB(nghttp2, nghttp2_session_set_local_window_size, - [ - AC_CHECK_HEADERS(nghttp2/nghttp2.h, - curl_h2_msg="enabled (nghttp2)" - NGHTTP2_ENABLED=1 - AC_DEFINE(USE_NGHTTP2, 1, [if nghttp2 is in use]) - AC_SUBST(USE_NGHTTP2, [1]) - ) - ], - dnl not found, revert back to clean variables - LDFLAGS=$CLEANLDFLAGS - CPPFLAGS=$CLEANCPPFLAGS - LIBS=$CLEANLIBS - ) + LDFLAGS="$LDFLAGS $LD_H2" + CPPFLAGS="$CPPFLAGS $CPP_H2" + LIBS="$LIB_H2 $LIBS" - else - dnl no nghttp2 pkg-config found, deal with it - if test X"$want_h2" != Xdefault; then - dnl To avoid link errors, we do not allow --with-nghttp2 without - dnl a pkgconfig file - AC_MSG_ERROR([--with-nghttp2 was specified but could not find libnghttp2 pkg-config file.]) - fi - fi + # use nghttp2_session_set_local_window_size to require nghttp2 + # >= 1.12.0 + AC_CHECK_LIB(nghttp2, nghttp2_session_set_local_window_size, + [ + AC_CHECK_HEADERS(nghttp2/nghttp2.h, + curl_h2_msg="enabled (nghttp2)" + NGHTTP2_ENABLED=1 + AC_DEFINE(USE_NGHTTP2, 1, [if nghttp2 is in use]) + AC_SUBST(USE_NGHTTP2, [1]) + ) + CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_H2" + export CURL_LIBRARY_PATH + AC_MSG_NOTICE([Added $DIR_H2 to CURL_LIBRARY_PATH]) + ], + dnl not found, revert back to clean variables + LDFLAGS=$CLEANLDFLAGS + CPPFLAGS=$CLEANCPPFLAGS + LIBS=$CLEANLIBS + ) fi dnl ********************************************************************** @@ -2733,7 +2821,7 @@ if test "x$NGTCP2_ENABLED" = "x1" -a "x$OPENSSL_ENABLED" = "x1"; then if test "x$cross_compiling" != "xyes"; then DIR_NGTCP2_CRYPTO_OPENSSL=`echo $LD_NGTCP2_CRYPTO_OPENSSL | $SED -e 's/^-L//'` fi - AC_CHECK_LIB(ngtcp2_crypto_openssl, ngtcp2_crypto_ctx_initial, + AC_CHECK_LIB(ngtcp2_crypto_openssl, ngtcp2_crypto_recv_client_initial_cb, [ AC_CHECK_HEADERS(ngtcp2/ngtcp2_crypto.h, NGTCP2_ENABLED=1 @@ -2788,7 +2876,7 @@ if test "x$NGTCP2_ENABLED" = "x1" -a "x$GNUTLS_ENABLED" = "x1"; then if test "x$cross_compiling" != "xyes"; then DIR_NGTCP2_CRYPTO_GNUTLS=`echo $LD_NGTCP2_CRYPTO_GNUTLS | $SED -e 's/^-L//'` fi - AC_CHECK_LIB(ngtcp2_crypto_gnutls, ngtcp2_crypto_ctx_initial, + AC_CHECK_LIB(ngtcp2_crypto_gnutls, ngtcp2_crypto_recv_client_initial_cb, [ AC_CHECK_HEADERS(ngtcp2/ngtcp2_crypto.h, NGTCP2_ENABLED=1 @@ -2815,6 +2903,61 @@ if test "x$NGTCP2_ENABLED" = "x1" -a "x$GNUTLS_ENABLED" = "x1"; then fi fi +if test "x$NGTCP2_ENABLED" = "x1" -a "x$WOLFSSL_ENABLED" = "x1"; then + dnl backup the pre-ngtcp2_crypto_wolfssl variables + CLEANLDFLAGS="$LDFLAGS" + CLEANCPPFLAGS="$CPPFLAGS" + CLEANLIBS="$LIBS" + + CURL_CHECK_PKGCONFIG(libngtcp2_crypto_wolfssl, $want_tcp2_path) + + if test "$PKGCONFIG" != "no" ; then + LIB_NGTCP2_CRYPTO_WOLFSSL=`CURL_EXPORT_PCDIR([$want_tcp2_path]) + $PKGCONFIG --libs-only-l libngtcp2_crypto_wolfssl` + AC_MSG_NOTICE([-l is $LIB_NGTCP2_CRYPTO_WOLFSSL]) + + CPP_NGTCP2_CRYPTO_WOLFSSL=`CURL_EXPORT_PCDIR([$want_tcp2_path]) dnl + $PKGCONFIG --cflags-only-I libngtcp2_crypto_wolfssl` + AC_MSG_NOTICE([-I is $CPP_NGTCP2_CRYPTO_WOLFSSL]) + + LD_NGTCP2_CRYPTO_WOLFSSL=`CURL_EXPORT_PCDIR([$want_tcp2_path]) + $PKGCONFIG --libs-only-L libngtcp2_crypto_wolfssl` + AC_MSG_NOTICE([-L is $LD_NGTCP2_CRYPTO_WOLFSSL]) + + LDFLAGS="$LDFLAGS $LD_NGTCP2_CRYPTO_WOLFSSL" + CPPFLAGS="$CPPFLAGS $CPP_NGTCP2_CRYPTO_WOLFSSL" + LIBS="$LIB_NGTCP2_CRYPTO_WOLFSSL $LIBS" + + if test "x$cross_compiling" != "xyes"; then + DIR_NGTCP2_CRYPTO_WOLFSSL=`echo $LD_NGTCP2_CRYPTO_WOLFSSL | $SED -e 's/^-L//'` + fi + AC_CHECK_LIB(ngtcp2_crypto_wolfssl, ngtcp2_crypto_recv_client_initial_cb, + [ + AC_CHECK_HEADERS(ngtcp2/ngtcp2_crypto.h, + NGTCP2_ENABLED=1 + AC_DEFINE(USE_NGTCP2_CRYPTO_WOLFSSL, 1, [if ngtcp2_crypto_wolfssl is in use]) + AC_SUBST(USE_NGTCP2_CRYPTO_WOLFSSL, [1]) + CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_NGTCP2_CRYPTO_WOLFSSL" + export CURL_LIBRARY_PATH + AC_MSG_NOTICE([Added $DIR_NGTCP2_CRYPTO_WOLFSSL to CURL_LIBRARY_PATH]) + ) + ], + dnl not found, revert back to clean variables + LDFLAGS=$CLEANLDFLAGS + CPPFLAGS=$CLEANCPPFLAGS + LIBS=$CLEANLIBS + ) + + else + dnl no ngtcp2_crypto_wolfssl pkg-config found, deal with it + if test X"$want_tcp2" != Xdefault; then + dnl To avoid link errors, we do not allow --with-ngtcp2 without + dnl a pkgconfig file + AC_MSG_ERROR([--with-ngtcp2 was specified but could not find ngtcp2_crypto_wolfssl pkg-config file.]) + fi + fi +fi + dnl ********************************************************************** dnl Check for nghttp3 (HTTP/3 with ngtcp2) dnl ********************************************************************** @@ -3004,6 +3147,78 @@ AC_INCLUDES_DEFAULT fi fi +dnl ********************************************************************** +dnl Check for msh3 (QUIC) +dnl ********************************************************************** + +OPT_MSH3="no" + +if test "x$disable_http" = "xyes" -o "x$USE_NGTCP" = "x1"; then + # without HTTP or with ngtcp2, msh3 is no use + OPT_MSH3="no" +fi + +AC_ARG_WITH(msh3, +AS_HELP_STRING([--with-msh3=PATH],[Enable msh3 usage]) +AS_HELP_STRING([--without-msh3],[Disable msh3 usage]), + [OPT_MSH3=$withval]) +case "$OPT_MSH3" in + no) + dnl --without-msh3 option used + want_msh3="no" + ;; + yes) + dnl --with-msh3 option used without path + want_msh3="default" + want_msh3_path="" + ;; + *) + dnl --with-msh3 option used with path + want_msh3="yes" + want_msh3_path="$withval" + ;; +esac + +if test X"$want_msh3" != Xno; then + + if test "$NGHTTP3_ENABLED" = 1; then + AC_MSG_ERROR([--with-msh3 and --with-ngtcp2 are mutually exclusive]) + fi + + dnl backup the pre-msh3 variables + CLEANLDFLAGS="$LDFLAGS" + CLEANCPPFLAGS="$CPPFLAGS" + CLEANLIBS="$LIBS" + + if test -n "$want_msh3_path"; then + LD_MSH3="-L$want_msh3_path/lib" + CPP_MSH3="-I$want_msh3_path/include" + DIR_MSH3="$want_msh3_path/lib" + LDFLAGS="$LDFLAGS $LD_MSH3" + CPPFLAGS="$CPPFLAGS $CPP_MSH3" + fi + LIBS="-lmsh3 $LIBS" + + AC_CHECK_LIB(msh3, MsH3ApiOpen, + [ + AC_CHECK_HEADERS(msh3.h, + curl_h3_msg="enabled (msh3)" + MSH3_ENABLED=1 + AC_DEFINE(USE_MSH3, 1, [if msh3 is in use]) + AC_SUBST(USE_MSH3, [1]) + CURL_LIBRARY_PATH="$CURL_LIBRARY_PATH:$DIR_MSH3" + export CURL_LIBRARY_PATH + AC_MSG_NOTICE([Added $DIR_MSH3 to CURL_LIBRARY_PATH]), + experimental="$experimental HTTP3" + ) + ], + dnl not found, revert back to clean variables + LDFLAGS=$CLEANLDFLAGS + CPPFLAGS=$CLEANCPPFLAGS + LIBS=$CLEANLIBS + ) +fi + dnl ********************************************************************** dnl Check for zsh completion path dnl ********************************************************************** @@ -3059,9 +3274,6 @@ case "$OPT_FISH_FPATH" in ;; esac -CURL_CHECK_HEADER_MALLOC -CURL_CHECK_HEADER_MEMORY - dnl Now check for the very most basic headers. Then we can use these dnl ones as default-headers when checking for the rest! AC_CHECK_HEADERS( @@ -3081,6 +3293,7 @@ AC_CHECK_HEADERS( sys/un.h \ linux/tcp.h \ netinet/tcp.h \ + netinet/udp.h \ netdb.h \ sys/sockio.h \ sys/stat.h \ @@ -3088,7 +3301,6 @@ AC_CHECK_HEADERS( termios.h \ termio.h \ fcntl.h \ - alloca.h \ io.h \ pwd.h \ utime.h \ @@ -3146,16 +3358,15 @@ AC_TYPE_SIZE_T CURL_CHECK_STRUCT_TIMEVAL CURL_VERIFY_RUNTIMELIBS -AX_COMPILE_CHECK_SIZEOF(size_t) -AX_COMPILE_CHECK_SIZEOF(long) -AX_COMPILE_CHECK_SIZEOF(int) -AX_COMPILE_CHECK_SIZEOF(short) -AX_COMPILE_CHECK_SIZEOF(time_t) -AX_COMPILE_CHECK_SIZEOF(off_t) +CURL_SIZEOF(size_t) +CURL_SIZEOF(long) +CURL_SIZEOF(int) +CURL_SIZEOF(time_t) +CURL_SIZEOF(off_t) o=$CPPFLAGS CPPFLAGS="-I$srcdir/include $CPPFLAGS" -AX_COMPILE_CHECK_SIZEOF(curl_off_t, [ +CURL_SIZEOF(curl_off_t, [ #include ]) CPPFLAGS=$o @@ -3166,21 +3377,6 @@ AC_CHECK_TYPE(long long, longlong="yes" ) -if test "xyes" = "x$longlong"; then - AC_MSG_CHECKING([if numberLL works]) - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([[ - ]],[[ - long long val = 1000LL; - ]]) - ],[ - AC_MSG_RESULT([yes]) - AC_DEFINE(HAVE_LL, 1, [if your compiler supports LL]) - ],[ - AC_MSG_RESULT([no]) - ]) -fi - # check for ssize_t AC_CHECK_TYPE(ssize_t, , @@ -3281,13 +3477,10 @@ CURL_CHECK_FUNC_GETIFADDRS CURL_CHECK_FUNC_GMTIME_R CURL_CHECK_FUNC_INET_NTOP CURL_CHECK_FUNC_INET_PTON -CURL_CHECK_FUNC_IOCTL CURL_CHECK_FUNC_IOCTLSOCKET CURL_CHECK_FUNC_IOCTLSOCKET_CAMEL -CURL_CHECK_FUNC_LOCALTIME_R CURL_CHECK_FUNC_MEMRCHR CURL_CHECK_FUNC_POLL -CURL_CHECK_FUNC_SETSOCKOPT CURL_CHECK_FUNC_SIGACTION CURL_CHECK_FUNC_SIGINTERRUPT CURL_CHECK_FUNC_SIGNAL @@ -3299,12 +3492,8 @@ CURL_CHECK_FUNC_STRCMPI CURL_CHECK_FUNC_STRDUP CURL_CHECK_FUNC_STRERROR_R CURL_CHECK_FUNC_STRICMP -CURL_CHECK_FUNC_STRNCMPI -CURL_CHECK_FUNC_STRNICMP -CURL_CHECK_FUNC_STRSTR CURL_CHECK_FUNC_STRTOK_R CURL_CHECK_FUNC_STRTOLL -CURL_CHECK_FUNC_WRITEV case $host in *msdosdjgpp) @@ -3320,6 +3509,7 @@ AC_CHECK_DECLS([getpwuid_r], [], [AC_DEFINE(HAVE_DECL_GETPWUID_R_MISSING, 1, "Se AC_CHECK_FUNCS([fnmatch \ + fchmod \ geteuid \ getpass_r \ getppid \ @@ -3330,10 +3520,11 @@ AC_CHECK_FUNCS([fnmatch \ if_nametoindex \ mach_absolute_time \ pipe \ + sched_yield \ + sendmsg \ setlocale \ setmode \ setrlimit \ - usleep \ utime \ utimes ],[ @@ -3415,7 +3606,6 @@ dnl set variable for use in automakefile(s) AM_CONDITIONAL(USE_MANUAL, test x"$USE_MANUAL" = x1) CURL_CHECK_LIB_ARES -AM_CONDITIONAL(USE_EMBEDDED_ARES, test x$embedded_ares = xyes) if test "x$curl_cv_native_windows" != "xyes" && test "x$enable_shared" = "xyes"; then @@ -3499,9 +3689,27 @@ if test "$want_pthreads" != "no"; then dnl if it wasn't found without lib, search for it in pthread lib if test "$USE_THREADS_POSIX" != "1" then - CFLAGS="$CFLAGS -pthread" # assign PTHREAD for pkg-config use PTHREAD=" -pthread" + + case $host in + *-ibm-aix*) + dnl Check if compiler is xlC + COMPILER_VERSION=`"$CC" -qversion 2>/dev/null` + if test x"$COMPILER_VERSION" = "x"; then + CFLAGS="$CFLAGS -pthread" + else + CFLAGS="$CFLAGS -qthreaded" + fi + ;; + powerpc-*amigaos*) + dnl No -pthread option, but link with -lpthread + PTHREAD=" -lpthread" + ;; + *) + CFLAGS="$CFLAGS -pthread" + ;; + esac AC_CHECK_LIB(pthread, pthread_create, [USE_THREADS_POSIX=1], [ CFLAGS="$save_CFLAGS"]) @@ -3885,7 +4093,26 @@ AS_HELP_STRING([--disable-alt-svc],[Disable alt-svc support]), *) AC_MSG_RESULT(yes) ;; esac ], - AC_MSG_RESULT(no) + AC_MSG_RESULT(yes) +) + +dnl ************************************************************ +dnl switch on/off headers-api +dnl +AC_MSG_CHECKING([whether to support headers-api]) +AC_ARG_ENABLE(headers-api, +AS_HELP_STRING([--enable-headers-api],[Enable headers-api support]) +AS_HELP_STRING([--disable-headers-api],[Disable headers-api support]), +[ case "$enableval" in + no) AC_MSG_RESULT(no) + curl_headers_msg="no (--enable-headers-api)" + AC_DEFINE(CURL_DISABLE_HEADERS_API, 1, [disable headers-api]) + ;; + *) + AC_MSG_RESULT(yes) + ;; + esac ], + AC_MSG_RESULT(yes) ) dnl only check for HSTS if there's SSL present @@ -4083,7 +4310,8 @@ if test "x$USE_NGHTTP2" = "x1" -o "x$USE_HYPER" = "x1"; then SUPPORT_FEATURES="$SUPPORT_FEATURES HTTP2" fi -if test "x$USE_NGTCP2" = "x1" -o "x$USE_QUICHE" = "x1"; then +if test "x$USE_NGTCP2" = "x1" -o "x$USE_QUICHE" = "x1" \ + -o "x$USE_MSH3" = "x1"; then SUPPORT_FEATURES="$SUPPORT_FEATURES HTTP3" fi @@ -4091,7 +4319,7 @@ if test "x$CURL_WITH_MULTI_SSL" = "x1"; then SUPPORT_FEATURES="$SUPPORT_FEATURES MultiSSL" fi -dnl if not explictily turned off, HTTPS-proxy comes with some TLS backends +dnl if not explicitly turned off, HTTPS-proxy comes with some TLS backends if test "x$https_proxy" != "xno"; then if test "x$OPENSSL_ENABLED" = "x1" -o "x$GNUTLS_ENABLED" = "x1" \ -o "x$NSS_ENABLED" = "x1"; then @@ -4110,6 +4338,23 @@ if test ${ac_cv_sizeof_curl_off_t} -gt 4; then fi fi +if test "$tst_atomic" = "yes"; then + SUPPORT_FEATURES="$SUPPORT_FEATURES threadsafe" +else + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM([[ + #include + ]],[[ + #if (WINVER < 0x600) && (_WIN32_WINNT < 0x600) + #error + #endif + ]]) + ],[ + SUPPORT_FEATURES="$SUPPORT_FEATURES threadsafe" + ],[ + ]) +fi + dnl replace spaces with newlines dnl sort the lines dnl replace the newlines back to spaces @@ -4246,6 +4491,7 @@ AC_CONFIG_FILES([Makefile \ lib/Makefile \ scripts/Makefile \ lib/libcurl.vers \ + lib/libcurl.plist \ tests/Makefile \ tests/certs/Makefile \ tests/certs/scripts/Makefile \ @@ -4302,6 +4548,7 @@ AC_MSG_NOTICE([Configured to build curl/libcurl: RTMP: ${curl_rtmp_msg} PSL: ${curl_psl_msg} Alt-svc: ${curl_altsvc_msg} + Headers API: ${curl_headers_msg} HSTS: ${curl_hsts_msg} HTTP1: ${curl_h1_msg} HTTP2: ${curl_h2_msg} diff --git a/trunk/libs/libcurl/curl-7.x/curl-config.in b/trunk/libs/libcurl/curl-7.x/curl-config.in index 8b4a29a9..f3e51617 100644 --- a/trunk/libs/libcurl/curl-7.x/curl-config.in +++ b/trunk/libs/libcurl/curl-7.x/curl-config.in @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 2001 - 2020, Daniel Stenberg, , et al. +# Copyright (C) 2001 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -19,9 +19,11 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### -prefix=@prefix@ +prefix="@prefix@" exec_prefix=@exec_prefix@ includedir=@includedir@ cppflag_curl_staticlib=@CPPFLAG_CURL_STATICLIB@ @@ -172,7 +174,7 @@ while test $# -gt 0; do --static-libs) if test "X@ENABLE_STATIC@" != "Xno" ; then - echo @libdir@/libcurl.@libext@ @LDFLAGS@ @LIBCURL_LIBS@ + echo "@libdir@/libcurl.@libext@" @LDFLAGS@ @LIBCURL_LIBS@ else echo "curl was built with static libraries disabled" >&2 exit 1 diff --git a/trunk/libs/libcurl/curl-7.x/docs/ALTSVC.md b/trunk/libs/libcurl/curl-7.x/docs/ALTSVC.md index 25437d6f..d347f6e1 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/ALTSVC.md +++ b/trunk/libs/libcurl/curl-7.x/docs/ALTSVC.md @@ -10,7 +10,7 @@ curl features support for the Alt-Svc: HTTP header. ## Standard -[RFC 7838](https://tools.ietf.org/html/rfc7838) +[RFC 7838](https://datatracker.ietf.org/doc/html/rfc7838) # Alt-Svc cache file format diff --git a/trunk/libs/libcurl/curl-7.x/docs/BINDINGS.md b/trunk/libs/libcurl/curl-7.x/docs/BINDINGS.md index 9cdf2942..b9f68ea2 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/BINDINGS.md +++ b/trunk/libs/libcurl/curl-7.x/docs/BINDINGS.md @@ -10,17 +10,19 @@ libcurl bindings The bindings listed below are not part of the curl/libcurl distribution archives, but must be downloaded and installed separately. + + [Ada95](https://web.archive.org/web/20070403105909/www.almroth.com/adacurl/index.html) Written by Andreas Almroth [Basic](https://scriptbasic.com/) ScriptBasic bindings written by Peter Verhas -C++: [curlpp](https://curlpp.org/) Written by Jean-Philippe Barrette-LaPierre, +C++: [curlpp](https://github.com/jpbarrette/curlpp/) Written by Jean-Philippe Barrette-LaPierre, [curlcpp](https://github.com/JosephP91/curlcpp) by Giuseppe Persico and [C++ -Requests](https://github.com/whoshuu/cpr) by Huu Nguyen +Requests](https://github.com/libcpr/cpr) by Huu Nguyen [Ch](https://chcurl.sourceforge.io/) Written by Stephen Nestinger and Jonathan Rogado -Cocoa: [BBHTTP](https://github.com/brunodecarvalho/BBHTTP) written by Bruno de Carvalho +Cocoa: [BBHTTP](https://github.com/biasedbit/BBHTTP) written by Bruno de Carvalho [curlhandle](https://github.com/karelia/curlhandle) Written by Dan Wood Clojure: [clj-curl](https://github.com/lsevero/clj-curl) by Lucas Severo @@ -31,11 +33,11 @@ Clojure: [clj-curl](https://github.com/lsevero/clj-curl) by Lucas Severo [Dylan](https://dylanlibs.sourceforge.io/) Written by Chris Double -[Eiffel](https://room.eiffel.com/library/curl) Written by Eiffel Software +[Eiffel](https://iron.eiffel.com/repository/20.11/package/ABEF6975-37AC-45FD-9C67-52D10BA0669B) Written by Eiffel Software [Euphoria](https://web.archive.org/web/20050204080544/rays-web.com/eulibcurl.htm) Written by Ray Smith -[Falcon](http://www.falconpl.org/index.ftd?page_id=prjs&prj_id=curl) +[Falcon](http://www.falconpl.org/project_docs/curl/) [Ferite](https://web.archive.org/web/20150102192018/ferite.org/) Written by Paul Querna @@ -45,15 +47,17 @@ Clojure: [clj-curl](https://github.com/lsevero/clj-curl) by Lucas Severo Go: [go-curl](https://github.com/andelf/go-curl) by ShuYu Wang -[Guile](https://www.lonelycactus.com/guile-curl.html) Written by Michael L. Gran +[Guile](https://github.com/spk121/guile-curl) Written by Michael L. Gran + +[Harbour](https://github.com/vszakats/hb/tree/main/contrib/hbcurl) Written by Viktor Szakats -[Harbour](https://github.com/vszakats/hb/tree/master/contrib/hbcurl) Written by Viktor Szakats +[Haskell](https://hackage.haskell.org/package/curl) Written by Galois, Inc -[Haskell](https://hackage.haskell.org/cgi-bin/hackage-scripts/package/curl) Written by Galois, Inc +[Hollywood](https://www.hollywood-mal.com/download.html) hURL by Andreas Falkenhahn [Java](https://github.com/pjlegato/curl-java) -[Julia](https://github.com/forio/Curl.jl) Written by Paul Howe +[Julia](https://github.com/JuliaWeb/LibCURL.jl) Written by Amit Murthy [Kapito](https://github.com/puzza007/katipo) is an Erlang HTTP library around libcurl. @@ -61,7 +65,7 @@ Go: [go-curl](https://github.com/andelf/go-curl) by ShuYu Wang Lua: [luacurl](https://web.archive.org/web/20201205052437/luacurl.luaforge.net/) by Alexander Marinov, [Lua-cURL](https://github.com/Lua-cURL) by Jürgen Hötzel -[Mono](https://forge.novell.com/modules/xfmod/project/?libcurl-mono) Written by Jeffrey Phillips +[Mono](https://web.archive.org/web/20070606064500/https://forge.novell.com/modules/xfmod/project/?libcurl-mono) Written by Jeffrey Phillips [.NET](https://sourceforge.net/projects/libcurl-net/) libcurl-net by Jeffrey Phillips @@ -84,10 +88,14 @@ Bailiff and Bálint Szilakszi, [PostgreSQL](https://github.com/pramsey/pgsql-http) - HTTP client for PostgreSQL +[PostgreSQL](https://github.com/RekGRpth/pg_curl) - cURL client for PostgreSQL + [PureBasic](https://www.purebasic.com/documentation/http/index.html) uses libcurl in its "native" HTTP subsystem [Python](http://pycurl.io/) PycURL by Kjetil Jacobsen +[Q](https://q-lang.sourceforge.io/) The libcurl module is part of the default install + [R](https://cran.r-project.org/package=curl) [Rexx](https://rexxcurl.sourceforge.io/) Written Mark Hessling @@ -96,9 +104,10 @@ Bailiff and Bálint Szilakszi, RPG, support for ILE/RPG on OS/400 is included in source distribution -Ruby: [curb](https://github.com/taf2/curb) written by Ross Bamford +Ruby: [curb](https://github.com/taf2/curb) written by Ross Bamford, +[ruby-curl-multi](https://github.com/kball/curl_multi.rb) by Kristjan Petursson and Keith Rarick -[Rust](https://github.com/carllerche/curl-rust) curl-rust - by Carl Lerche +[Rust](https://github.com/alexcrichton/curl-rust) curl-rust - by Carl Lerche [Scheme](http://www.metapaper.net/lisovsky/web/curl/) Bigloo binding by Kirill Lisovsky @@ -110,7 +119,7 @@ Ruby: [curb](https://github.com/taf2/curb) written by Ross Bamford [SP-Forth](https://sourceforge.net/p/spf/spf/ci/master/tree/devel/~ac/lib/lin/curl/) Written by Andrey Cherezov -[SPL](http://www.clifford.at/spl/) Written by Clifford Wolf +[SPL](https://web.archive.org/web/20210203022158/http://www.clifford.at/spl/spldoc/curl.html) Written by Clifford Wolf [Tcl](https://web.archive.org/web/20160826011806/mirror.yellow5.com/tclcurl/) Tclcurl by Andrés García @@ -118,8 +127,6 @@ Ruby: [curb](https://github.com/taf2/curb) written by Ross Bamford [Visual Foxpro](https://web.archive.org/web/20130730181523/www.ctl32.com.ar/libcurl.asp) by Carlos Alloatti -[Q](https://q-lang.sourceforge.io/) The libcurl module is part of the default install - [wxWidgets](https://wxcode.sourceforge.io/components/wxcurl/) Written by Casey O'Donnell [XBLite](https://web.archive.org/web/20060426150418/perso.wanadoo.fr/xblite/libraries.html) Written by David Szafranski diff --git a/trunk/libs/libcurl/curl-7.x/docs/BUFREF.md b/trunk/libs/libcurl/curl-7.x/docs/BUFREF.md index 2697919a..35c53426 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/BUFREF.md +++ b/trunk/libs/libcurl/curl-7.x/docs/BUFREF.md @@ -6,7 +6,7 @@ when the reference is invalidated. Once referenced, a buffer cannot be reallocated. A data length is stored within the reference for binary data handling -purpose; it is not used by the bufref API. +purposes; it is not used by the bufref API. The `struct bufref` is used to hold data referencing a buffer. The members of that structure **MUST NOT** be accessed or modified without using the dedicated @@ -43,7 +43,7 @@ void Curl_bufref_set(struct bufref *br, const void *buffer, size_t length, ``` Releases the previously referenced buffer, then assigns the new `buffer` to -the structure, associated with its `destructor` function. The later can be +the structure, associated with its `destructor` function. The latter can be specified as `NULL`: this will be the case when the referenced buffer is static. diff --git a/trunk/libs/libcurl/curl-7.x/docs/BUG-BOUNTY.md b/trunk/libs/libcurl/curl-7.x/docs/BUG-BOUNTY.md index 5cbb343b..aa8ee895 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/BUG-BOUNTY.md +++ b/trunk/libs/libcurl/curl-7.x/docs/BUG-BOUNTY.md @@ -4,38 +4,37 @@ The curl project runs a bug bounty program in association with [HackerOne](https://www.hackerone.com) and the [Internet Bug Bounty](https://internetbugbounty.org). -# How does it work? +## How does it work? Start out by posting your suspected security vulnerability directly to [curl's HackerOne program](https://hackerone.com/curl). After you have reported a security issue, it has been deemed credible, and a patch and advisory has been made public, you may be eligible for a bounty from -this program. +this program. See the [SECURITY-PROCESS](SECURITY-PROCESS.md) document for how +we work with security issues. -See all details at [https://hackerone.com/curl](https://hackerone.com/curl) - -This bounty is relying on funds from sponsors. If you use curl professionally, -consider help funding this! See -[https://opencollective.com/curl](https://opencollective.com/curl) for -details. - -# What are the reward amounts? +## What are the reward amounts? The curl project offers monetary compensation for reported and published security vulnerabilities. The amount of money that is rewarded depends on how serious the flaw is determined to be. -We offer reward money *up to* a certain amount per severity. The curl security -team determines the severity of each reported flaw on a case by case basis and -the exact amount rewarded to the reporter is then decided. +Since 2021, the Bug Bounty is managed in association with the Internet Bug +Bounty and they will set the reward amounts. If it would turn out that they +set amounts that are way lower than we can accept, the curl project intends to +"top up" rewards. -Check out the current award amounts at [https://hackerone.com/curl](https://hackerone.com/curl) +In 2022, typical "Medium" rated vulnerabilities have been rewarded 2,400 USD +each. -# Who is eligible for a reward? +## Who is eligible for a reward? Everyone and anyone who reports a security problem in a released curl version -that hasn't already been reported can ask for a bounty. +that has not already been reported can ask for a bounty. + +Dedicated - paid for - security audits that are performed in collaboration +with curl developers are not eligible for bounties. Vulnerabilities in features that are off by default and documented as experimental are not eligible for a reward. @@ -43,41 +42,37 @@ experimental are not eligible for a reward. The vulnerability has to be fixed and publicly announced (by the curl project) before a bug bounty will be considered. +Once the vulnerability has been published by curl, the researcher can request +their bounty from the [Internet Bug Bounty](https://hackerone.com/ibb). + Bounties need to be requested within twelve months from the publication of the vulnerability. -# Product vulnerabilities only +## Product vulnerabilities only This bug bounty only concerns the curl and libcurl products and thus their respective source codes - when running on existing hardware. It does not -include documentation, websites, or other infrastructure. +include curl documentation, curl websites, or other curl related +infrastructure. The curl security team is the sole arbiter if a reported flaw is subject to a bounty or not. -# How are vulnerabilities graded? +## How are vulnerabilities graded? The grading of each reported vulnerability that makes a reward claim will be performed by the curl security team. The grading will be based on the CVSS (Common Vulnerability Scoring System) 3.0. -# How are reward amounts determined? - -The curl security team first gives the vulnerability a score, as mentioned -above, and based on that level we set an amount depending on the specifics of -the individual case. Other sponsors of the program might also get involved and -can raise the amounts depending on the particular issue. - -# What happens if the bounty fund is drained? +## How are reward amounts determined? -The bounty fund depends on sponsors. If we pay out more bounties than we add, -the fund will eventually drain. If that end up happening, we will simply not -be able to pay out as high bounties as we would like and hope that we can -convince new sponsors to help us top up the fund again. +The curl security team gives the vulnerability a score or severity level, as +mentioned above. The actual monetary reward amount is decided and paid by the +Internet Bug Bounty.. -# Regarding taxes, etc. on the bounties +## Regarding taxes, etc. on the bounties -In the event that the individual receiving a curl bug bounty needs to pay -taxes on the reward money, the responsibility lies with the receiver. The -curl project or its security team never actually receive any of this money, -hold the money, or pay out the money. +In the event that the individual receiving a bug bounty needs to pay taxes on +the reward money, the responsibility lies with the receiver. The curl project +or its security team never actually receive any of this money, hold the money, +or pay out the money. diff --git a/trunk/libs/libcurl/curl-7.x/docs/BUGS.md b/trunk/libs/libcurl/curl-7.x/docs/BUGS.md index 2c0a3017..4de58064 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/BUGS.md +++ b/trunk/libs/libcurl/curl-7.x/docs/BUGS.md @@ -3,7 +3,7 @@ ## There are still bugs Curl and libcurl keep being developed. Adding features and changing code - means that bugs will sneak in, no matter how hard we try not to. + means that bugs will sneak in, no matter how hard we try to keep them out. Of course there are lots of bugs left. And lots of misfeatures. @@ -12,12 +12,12 @@ ## Where to report - If you can't fix a bug yourself and submit a fix for it, try to report an as + If you cannot fix a bug yourself and submit a fix for it, try to report an as detailed report as possible to a curl mailing list to allow one of us to have a go at a solution. You can optionally also submit your problem in [curl's bug tracking system](https://github.com/curl/curl/issues). - Please read the rest of this document below first before doing that! + Please read the rest of this document below first before doing that. If you feel you need to ask around first, find a suitable [mailing list]( https://curl.se/mail/) and post your questions there. @@ -44,12 +44,12 @@ ## What to report When reporting a bug, you should include all information that will help us - understand what's wrong, what you expected to happen and how to repeat the + understand what is wrong, what you expected to happen and how to repeat the bad behavior. You therefore need to tell us: - your operating system's name and version number - - what version of curl you're using (`curl -V` is fine) + - what version of curl you are using (`curl -V` is fine) - versions of the used libraries that libcurl is built to use @@ -65,22 +65,22 @@ debug dump with your bug report. The output you get by using the `-v` or `--trace` options. - If curl crashed, causing a core dump (in unix), there is hardly any use to - send that huge file to anyone of us. Unless we have an exact same system - setup as you, we can't do much with it. Instead, we ask you to get a stack - trace and send that (much smaller) output to us instead! + If curl crashed, causing a core dump (in Unix), there is hardly any use to + send that huge file to anyone of us. Unless we have the same system setup as + you, we cannot do much with it. Instead, we ask you to get a stack trace and + send that (much smaller) output to us instead. The address and how to subscribe to the mailing lists are detailed in the `MANUAL.md` file. ## libcurl problems - When you've written your own application with libcurl to perform transfers, + When you have written your own application with libcurl to perform transfers, it is even more important to be specific and detailed when reporting bugs. Tell us the libcurl version and your operating system. Tell us the name and version of all relevant sub-components like for example the SSL library - you're using and what name resolving your libcurl uses. If you use SFTP or + you are using and what name resolving your libcurl uses. If you use SFTP or SCP, the libssh2 version is relevant etc. Showing us a real source code example repeating your problem is the best way @@ -102,9 +102,9 @@ it out of an ambition to keep curl and libcurl excellent products and out of pride. - But please do not assume that you can just lump over something to us and it - will then magically be fixed after some given time. Most often we need - feedback and help to understand what you've experienced and how to repeat a + Please do not assume that you can just lump over something to us and it will + then magically be fixed after some given time. Most often we need feedback + and help to understand what you have experienced and how to repeat a problem. Then we may only be able to assist YOU to debug the problem and to track down the proper fix. @@ -114,7 +114,7 @@ ## How to get a stack trace First, you must make sure that you compile all sources with `-g` and that you - don't 'strip' the final executable. Try to avoid optimizing the code as well, + do not 'strip' the final executable. Try to avoid optimizing the code as well, remove `-O`, `-O2` etc from the compiler options. Run the program until it cores. @@ -128,7 +128,7 @@ The list that is presented is the stack trace. If everything worked, it is supposed to contain the chain of functions that were called when curl - crashed. Include the stack trace with your detailed bug report. It'll help a + crashed. Include the stack trace with your detailed bug report, it will help a lot. ## Bugs in libcurl bindings @@ -148,12 +148,12 @@ The developers in the curl project do not have bandwidth or energy enough to maintain several branches or to spend much time on hunting down problems in - old versions when chances are we already fixed them or at least that they've + old versions when chances are we already fixed them or at least that they have changed nature and appearance in later versions. When you experience a problem and want to report it, you really SHOULD - include the version number of the curl you're using when you experience the - issue. If that version number shows us that you're using an out-of-date curl, + include the version number of the curl you are using when you experience the + issue. If that version number shows us that you are using an out-of-date curl, you should also try out a modern curl version to see if the problem persists or how/if it has changed in appearance. @@ -162,9 +162,9 @@ experimental build or similar, to get this confirmed or not. At times people insist that they cannot upgrade to a modern curl version, but - instead they "just want the bug fixed". That's fine, just don't count on us - spending many cycles on trying to identify which single commit, if that's - even possible, that at some point in the past fixed the problem you're now + instead they "just want the bug fixed". That is fine, just do not count on us + spending many cycles on trying to identify which single commit, if that is + even possible, that at some point in the past fixed the problem you are now experiencing. Security wise, it is almost always a bad idea to lag behind the current curl @@ -177,8 +177,8 @@ ## What happens on first filing When a new issue is posted in the issue tracker or on the mailing list, the - team of developers first need to see the report. Maybe they took the day off, - maybe they're off in the woods hunting. Have patience. Allow at least a few + team of developers first needs to see the report. Maybe they took the day off, + maybe they are off in the woods hunting. Have patience. Allow at least a few days before expecting someone to have responded. In the issue tracker you can expect that some labels will be set on the issue @@ -186,7 +186,7 @@ ## First response - If your issue/bug report wasn't perfect at once (and few are), chances are + If your issue/bug report was not perfect at once (and few are), chances are that someone will ask follow-up questions. Which version did you use? Which options did you use? How often does the problem occur? How can we reproduce this problem? Which protocols does it involve? Or perhaps much more specific @@ -199,19 +199,18 @@ ## Not reproducible - For problems that we can't reproduce and can't understand even after having - gotten all the info we need and having studied the source code over again, - are really hard to solve so then we may require further work from you who - actually see or experience the problem. + We may require further work from you who actually see or experience the + problem if we cannot reproduce it and cannot understand it even after having + gotten all the info we need and having studied the source code over again. ## Unresponsive - If the problem haven't been understood or reproduced, and there's nobody + If the problem have not been understood or reproduced, and there is nobody responding to follow-up questions or questions asking for clarifications or for discussing possible ways to move forward with the task, we take that as a - strong suggestion that the bug is not important. + strong suggestion that the bug is unimportant. - Unimportant issues will be closed as inactive sooner or later as they can't + Unimportant issues will be closed as inactive sooner or later as they cannot be fixed. The inactivity period (waiting for responses) should not be shorter than two weeks but may extend months. @@ -219,7 +218,7 @@ Bugs that are filed and are understood can unfortunately end up in the "nobody cares enough about it to work on it" category. Such bugs are - perfectly valid problems that *should* get fixed but apparently aren't. We + perfectly valid problems that *should* get fixed but apparently are not. We try to mark such bugs as `KNOWN_BUGS material` after a time of inactivity and if no activity is noticed after yet some time those bugs are added to the `KNOWN_BUGS` document and are closed in the issue tracker. @@ -227,7 +226,7 @@ ## `KNOWN_BUGS` This is a list of known bugs. Bugs we know exist and that have been pointed - out but that haven't yet been fixed. The reasons for why they haven't been + out but that have not yet been fixed. The reasons for why they have not been fixed can involve anything really, but the primary reason is that nobody has considered these problems to be important enough to spend the necessary time and effort to have them fixed. @@ -239,14 +238,14 @@ ## `TODO` - Issues that are filed or reported that aren't really bugs but more missing + Issues that are filed or reported that are not really bugs but more missing features or ideas for future improvements and so on are marked as 'enhancement' or 'feature-request' and will be added to the `TODO` document - and the issues are closed. We don't keep TODO items open in the issue + and the issues are closed. We do not keep TODO items open in the issue tracker. The `TODO` document is full of ideas and suggestions of what we can add or - fix one day. You're always encouraged and free to grab one of those items and + fix one day. you are always encouraged and free to grab one of those items and take up a discussion with the curl development team on how that could be implemented or provided in the project so that you can work on ticking it odd that document. @@ -257,8 +256,8 @@ ## Closing off stalled bugs The [issue and pull request trackers](https://github.com/curl/curl) only - holds "active" entries open (using a non-precise definition of what active - actually is, but they're at least not completely dead). Those that are + hold "active" entries open (using a non-precise definition of what active + actually is, but they are at least not completely dead). Those that are abandoned or in other ways dormant will be closed and sometimes added to `TODO` and `KNOWN_BUGS` instead. diff --git a/trunk/libs/libcurl/curl-7.x/docs/CHECKSRC.md b/trunk/libs/libcurl/curl-7.x/docs/CHECKSRC.md index 2f634c49..58a33d7b 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/CHECKSRC.md +++ b/trunk/libs/libcurl/curl-7.x/docs/CHECKSRC.md @@ -9,7 +9,7 @@ check that it adheres to our [Source Code Style guide](CODE_STYLE.md). ## Command line options -`-W[file]` skip that file and excludes it from being checked. Helpful +`-W[file]` skip that file and exclude it from being checked. Helpful when, for example, one of the files is generated. `-D[dir]` directory name to prepend to file names when accessing them. @@ -18,11 +18,11 @@ when, for example, one of the files is generated. ## What does checksrc warn for? -checksrc does not check and verify the code against the entire style guide, -but the script is instead an effort to detect the most common mistakes and -syntax mistakes that contributors make before they get accustomed to our code -style. Heck, many of us regulars do the mistakes too and this script helps us -keep the code in shape. +checksrc does not check and verify the code against the entire style guide. +The script is an effort to detect the most common mistakes and syntax mistakes +that contributors make before they get accustomed to our code style. Heck, +many of us regulars do the mistakes too and this script helps us keep the code +in shape. checksrc.pl -h @@ -41,7 +41,7 @@ warnings are: more appropriate `char *name` style. The asterisk should sit right next to the name without a space in between. -- `BADCOMMAND`: There's a bad !checksrc! instruction in the code. See the +- `BADCOMMAND`: There's a bad `!checksrc!` instruction in the code. See the **Ignore certain warnings** section below for details. - `BANNEDFUNC`: A banned function was used. The functions sprintf, vsprintf, @@ -58,7 +58,7 @@ warnings are: - `COPYRIGHT`: the file is missing a copyright statement! -- `CPPCOMMENTS`: `//` comment detected, that's not C89 compliant +- `CPPCOMMENTS`: `//` comment detected, that is not C89 compliant - `DOBRACE`: only use one space after do before open brace @@ -120,7 +120,7 @@ warnings are: - `TYPEDEFSTRUCT`: we frown upon (most) typedefed structs - `UNUSEDIGNORE`: a checksrc inlined warning ignore was asked for but not used, - that's an ignore that should be removed or changed to get used. + that is an ignore that should be removed or changed to get used. ### Extended warnings @@ -130,11 +130,13 @@ the directory where they should be activated with commands to enable the warnings you are interested in. The format of the file is to enable one warning per line like so: `enable ` -Currently there is one extended warning which can be enabled: +Currently these are the extended warnings which can be enabled: -- `COPYRIGHTYEAR`: the current changeset hasn't updated the copyright year in +- `COPYRIGHTYEAR`: the current changeset has not updated the copyright year in the source file +- `STRERROR`: use of banned function strerror() + ## Ignore certain warnings Due to the nature of the source code and the flaws of the checksrc tool, there @@ -159,11 +161,11 @@ This will ignore the warning for overly long lines until it is re-enabled with: /* !checksrc! enable LONGLINE */ -If the enabling isn't performed before the end of the file, it will be enabled +If the enabling is not performed before the end of the file, it will be enabled automatically for the next file. You can also opt to ignore just N violations so that if you have a single long -line you just can't shorten and is agreed to be fine anyway: +line you just cannot shorten and is agreed to be fine anyway: /* !checksrc! disable LONGLINE 1 */ @@ -174,7 +176,7 @@ instances are ignored and nothing extra. ### Directory wide ignore patterns -This is a method we've transitioned away from. Use inline ignores as far as +This is a method we have transitioned away from. Use inline ignores as far as possible. Make a `checksrc.skip` file in the directory of the source code with the diff --git a/trunk/libs/libcurl/curl-7.x/docs/CIPHERS.md b/trunk/libs/libcurl/curl-7.x/docs/CIPHERS.md index af8f2f4c..ff35ff28 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/CIPHERS.md +++ b/trunk/libs/libcurl/curl-7.x/docs/CIPHERS.md @@ -6,7 +6,8 @@ and [`--ciphers`](https://curl.se/docs/manpage.html#--ciphers) users can control which ciphers to consider when negotiating TLS connections. -TLS 1.3 ciphers are supported since curl 7.61 for OpenSSL 1.1.1+ with options +TLS 1.3 ciphers are supported since curl 7.61 for OpenSSL 1.1.1+, and since +curl 7.85 for SChannel with options [`CURLOPT_TLS13_CIPHERS`](https://curl.se/libcurl/c/CURLOPT_TLS13_CIPHERS.html) and [`--tls13-ciphers`](https://curl.se/docs/manpage.html#--tls13-ciphers) @@ -18,7 +19,7 @@ libcurl was built to use. This is an attempt to list known cipher names. ## OpenSSL -(based on [OpenSSL docs](https://www.openssl.org/docs/man1.1.0/apps/ciphers.html)) +(based on [OpenSSL docs](https://www.openssl.org/docs/manmaster/man1/openssl-ciphers.html)) When specifying multiple cipher names, separate them with colon (`:`). @@ -278,9 +279,9 @@ When specifying multiple cipher names, separate them with colon (`:`). ## GSKit -Ciphers are internally defined as -[numeric codes](https://www.ibm.com/support/knowledgecenter/ssw_ibm_i_73/apis/gsk_attribute_set_buffer.htm), -but libcurl maps them to the following case-insensitive names. +Ciphers are internally defined as [numeric +codes](https://www.ibm.com/support/knowledgecenter/ssw_ibm_i_73/apis/gsk_attribute_set_buffer.htm). libcurl +maps them to the following case-insensitive names. ### SSL2 cipher suites (insecure: disabled by default) @@ -518,5 +519,73 @@ and the request will fail. As of curl 7.77.0, you can also pass `SCH_USE_STRONG_CRYPTO` as a cipher name to [constrain the set of available ciphers as specified in the schannel documentation](https://docs.microsoft.com/en-us/windows/win32/secauthn/tls-cipher-suites-in-windows-server-2022). -Note that the supported ciphers in this case follows the OS version, so if you +Note that the supported ciphers in this case follow the OS version, so if you are running an outdated OS you might still be supporting weak ciphers. + +### TLS 1.3 cipher suites + +(Note these ciphers are set with `CURLOPT_TLS13_CIPHERS` and `--tls13-ciphers`) + +`TLS_AES_256_GCM_SHA384` +`TLS_AES_128_GCM_SHA256` +`TLS_CHACHA20_POLY1305_SHA256` +`TLS_AES_128_CCM_8_SHA256` +`TLS_AES_128_CCM_SHA256` + +## BearSSL + +BearSSL ciphers can be specified by either the OpenSSL name (`ECDHE-RSA-AES128-GCM-SHA256`) or the IANA name (`TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256`). + +Since BearSSL 0.1: + +`DES-CBC3-SHA` +`AES128-SHA` +`AES256-SHA` +`AES128-SHA256` +`AES256-SHA256` +`AES128-GCM-SHA256` +`AES256-GCM-SHA384` +`ECDH-ECDSA-DES-CBC3-SHA` +`ECDH-ECDSA-AES128-SHA` +`ECDH-ECDSA-AES256-SHA` +`ECDHE-ECDSA-DES-CBC3-SHA` +`ECDHE-ECDSA-AES128-SHA` +`ECDHE-ECDSA-AES256-SHA` +`ECDH-RSA-DES-CBC3-SHA` +`ECDH-RSA-AES128-SHA` +`ECDH-RSA-AES256-SHA` +`ECDHE-RSA-DES-CBC3-SHA` +`ECDHE-RSA-AES128-SHA` +`ECDHE-RSA-AES256-SHA` +`ECDHE-ECDSA-AES128-SHA256` +`ECDHE-ECDSA-AES256-SHA384` +`ECDH-ECDSA-AES128-SHA256` +`ECDH-ECDSA-AES256-SHA384` +`ECDHE-RSA-AES128-SHA256` +`ECDHE-RSA-AES256-SHA384` +`ECDH-RSA-AES128-SHA256` +`ECDH-RSA-AES256-SHA384` +`ECDHE-ECDSA-AES128-GCM-SHA256` +`ECDHE-ECDSA-AES256-GCM-SHA384` +`ECDH-ECDSA-AES128-GCM-SHA256` +`ECDH-ECDSA-AES256-GCM-SHA384` +`ECDHE-RSA-AES128-GCM-SHA256` +`ECDHE-RSA-AES256-GCM-SHA384` +`ECDH-RSA-AES128-GCM-SHA256` +`ECDH-RSA-AES256-GCM-SHA384` + +Since BearSSL 0.2: + +`ECDHE-RSA-CHACHA20-POLY1305` +`ECDHE-ECDSA-CHACHA20-POLY1305` + +Since BearSSL 0.6: + +`AES128-CCM` +`AES256-CCM` +`AES128-CCM8` +`AES256-CCM8` +`ECDHE-ECDSA-AES128-CCM` +`ECDHE-ECDSA-AES256-CCM` +`ECDHE-ECDSA-AES128-CCM8` +`ECDHE-ECDSA-AES256-CCM8` diff --git a/trunk/libs/libcurl/curl-7.x/docs/CMakeLists.txt b/trunk/libs/libcurl/curl-7.x/docs/CMakeLists.txt index b3230ec5..97101a48 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/CMakeLists.txt +++ b/trunk/libs/libcurl/curl-7.x/docs/CMakeLists.txt @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### #add_subdirectory(examples) add_subdirectory(libcurl) diff --git a/trunk/libs/libcurl/curl-7.x/docs/CODE_REVIEW.md b/trunk/libs/libcurl/curl-7.x/docs/CODE_REVIEW.md index e6a28a60..20d1be84 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/CODE_REVIEW.md +++ b/trunk/libs/libcurl/curl-7.x/docs/CODE_REVIEW.md @@ -36,17 +36,17 @@ Changing the API and the ABI may be fine in a change but it needs to be done deliberately and carefully. If not, a reviewer must help the author to realize the mistake. -curl and libcurl are similarly very strict on not modifying existing -behavior. API and ABI stability is not enough, the behavior should also remain -intact as far as possible. +curl and libcurl are similarly strict on not modifying existing behavior. API +and ABI stability is not enough, the behavior should also remain intact as far +as possible. ## Code style Most code style nits are detected by checksrc but not all. Only leave remarks -on style deviation once checksrc doesn't find anymore. +on style deviation once checksrc does not find anymore. Minor nits from fresh submitters can also be handled by the maintainer when -merging, in case it seems like the submitter isn't clear on what to do. We +merging, in case it seems like the submitter is not clear on what to do. We want to make the process fun and exciting for new contributors. ## Encourage consistency @@ -105,15 +105,15 @@ updated documentation. Submitting that in a separate follow-up pull request is not OK. A code review must also verify that the submitted documentation update matches the code submission. -English isn't everyone's first language, be mindful of this and help the +English is not everyone's first language, be mindful of this and help the submitter improve the text if it needs a rewrite to read better. -## Code shouldn't be hard to understand +## Code should not be hard to understand Source code should be written to maximize readability and be easy to understand. -## Functions shouldn't be large +## Functions should not be large A single function should never be large as that makes it hard to follow and understand all the exit points and state changes. Some existing functions in diff --git a/trunk/libs/libcurl/curl-7.x/docs/CODE_STYLE.md b/trunk/libs/libcurl/curl-7.x/docs/CODE_STYLE.md index 8ba1e038..5481aa50 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/CODE_STYLE.md +++ b/trunk/libs/libcurl/curl-7.x/docs/CODE_STYLE.md @@ -2,15 +2,16 @@ Source code that has a common style is easier to read than code that uses different styles in different places. It helps making the code feel like one -single code base. Easy-to-read is a very important property of code and helps +single code base. Easy-to-read is an important property of code and helps making it easier to review when new things are added and it helps debugging code when developers are trying to figure out why things go wrong. A unified style is more important than individual contributors having their own personal tastes satisfied. Our C code has a few style rules. Most of them are verified and upheld by the -`lib/checksrc.pl` script. Invoked with `make checksrc` or even by default by -the build system when built after `./configure --enable-debug` has been used. +`scripts/checksrc.pl` script. Invoked with `make checksrc` or even by default +by the build system when built after `./configure --enable-debug` has been +used. It is normally not a problem for anyone to follow the guidelines, as you just need to copy the style already used in the source code and there are no @@ -23,9 +24,9 @@ will cause warnings will not be accepted as-is. ## Naming Try using a non-confusing naming scheme for your new functions and variable -names. It doesn't necessarily have to mean that you should use the same as in +names. It does not necessarily have to mean that you should use the same as in other places of the code, just that the names should be logical, -understandable and be named according to what they're used for. File-local +understandable and be named according to what they are used for. File-local functions should be made static. We like lower case names. See the [INTERNALS](https://curl.se/dev/internals.html#symbols) document on @@ -46,7 +47,7 @@ if(something_is_true) { ## Comments -Since we write C89 code, **//** comments are not allowed. They weren't +Since we write C89 code, **//** comments are not allowed. They were not introduced in the C standard until C99. We use only __/* comments */__. ```c @@ -56,10 +57,10 @@ introduced in the C standard until C99. We use only __/* comments */__. ## Long lines Source code in curl may never be wider than 79 columns and there are two -reasons for maintaining this even in the modern era of very large and high +reasons for maintaining this even in the modern era of large and high resolution screens: -1. Narrower columns are easier to read than very wide ones. There's a reason +1. Narrower columns are easier to read than wide ones. There's a reason newspapers have used columns for decades or centuries. 2. Narrower columns allow developers to easier show multiple pieces of code @@ -154,8 +155,8 @@ if(!ptr) ## New block on a new line -We never write multiple statements on the same source line, even for very -short if() conditions. +We never write multiple statements on the same source line, even for short +if() conditions. ```c if(a) @@ -173,7 +174,7 @@ else if(b) return FALSE; ## Space around operators -Please use spaces on both sides of operators in C expressions. Postfix **(), +Please use spaces on both sides of operators in C expressions. Postfix **(), [], ->, ., ++, --** and Unary **+, -, !, ~, &** operators excluded they should have no space. @@ -230,7 +231,7 @@ if(Curl_pipeline_wanted(handle->multi, CURLPIPE_HTTP1) && (handle->set.httpversion != CURL_HTTP_VERSION_1_0) && (handle->set.httpreq == HTTPREQ_GET || handle->set.httpreq == HTTPREQ_HEAD)) - /* didn't ask for HTTP/1.0 and a GET or HEAD */ + /* did not ask for HTTP/1.0 and a GET or HEAD */ return TRUE; ``` diff --git a/trunk/libs/libcurl/curl-7.x/docs/CONTRIBUTE.md b/trunk/libs/libcurl/curl-7.x/docs/CONTRIBUTE.md index 4d278b21..506af9b4 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/CONTRIBUTE.md +++ b/trunk/libs/libcurl/curl-7.x/docs/CONTRIBUTE.md @@ -4,13 +4,11 @@ This document is intended to offer guidelines on how to best contribute to the curl project. This concerns new features as well as corrections to existing flaws or bugs. -## Learning curl - -### Join the Community +## Join the Community Skip over to [https://curl.se/mail/](https://curl.se/mail/) and join -the appropriate mailing list(s). Read up on details before you post -questions. Read this file before you start sending patches! We prefer +the appropriate mailing list(s). Read up on details before you post +questions. Read this file before you start sending patches. We prefer questions sent to and discussions being held on the mailing list(s), not sent to individuals. @@ -19,20 +17,20 @@ Before posting to one of the curl mailing lists, please read up on the We also hang out on IRC in #curl on libera.chat -If you're at all interested in the code side of things, consider clicking +If you are at all interested in the code side of things, consider clicking 'watch' on the [curl repo on GitHub](https://github.com/curl/curl) to be notified of pull requests and new issues posted there. -### License and copyright +## License and copyright When contributing with code, you agree to put your changes and new code under the same license curl and libcurl is already using unless stated and agreed otherwise. If you add a larger piece of code, you can opt to make that file or set of -files to use a different license as long as they don't enforce any changes to +files to use a different license as long as they do not enforce any changes to the rest of the package and they make sense. Such "separate parts" can not be -GPL licensed (as we don't want copyleft to affect users of libcurl) but they +GPL licensed (as we do not want copyleft to affect users of libcurl) but they must use "GPL compatible" licenses (as we want to allow users to use libcurl properly in GPL licensed environments). @@ -44,9 +42,9 @@ By submitting a patch to the curl project, you are assumed to have the right to the code and to be allowed by your employer or whatever to hand over that patch/code to us. We will credit you for your changes as far as possible, to give credit but also to keep a trace back to who made what changes. Please -always provide us with your full real name when contributing! +always provide us with your full real name when contributing, -### What To Read +## What To Read Source code, the man pages, the [INTERNALS document](https://curl.se/dev/internals.html), @@ -65,12 +63,12 @@ When writing C code, follow the [CODE_STYLE](https://curl.se/dev/code-style.html) already established in the project. Consistent style makes code easier to read and mistakes less likely to happen. Run `make checksrc` before you submit anything, to make sure -you follow the basic style. That script doesn't verify everything, but if it +you follow the basic style. That script does not verify everything, but if it complains you know you have work to do. ### Non-clobbering All Over -When you write new functionality or fix bugs, it is important that you don't +When you write new functionality or fix bugs, it is important that you do not fiddle all over the source files and functions. Remember that it is likely that other people have done changes in the same source files as you have and possibly even in the same functions. If you bring completely new @@ -80,7 +78,7 @@ fix one bug at a time and send them as separate patches. ### Write Separate Changes It is annoying when you get a huge patch from someone that is said to fix 511 -odd problems, but discussions and opinions don't agree with 510 of them - or +odd problems, but discussions and opinions do not agree with 510 of them - or 509 of them were already fixed in a different way. Then the person merging this change needs to extract the single interesting patch from somewhere within the huge pile of source, and that creates a lot of extra work. @@ -96,14 +94,14 @@ and regression in the future. ### Patch Against Recent Sources Please try to get the latest available sources to make your patches against. -It makes the lives of the developers so much easier. The very best is if you -get the most up-to-date sources from the git repository, but the latest -release archive is quite OK as well! +It makes the lives of the developers so much easier. The best is if you get +the most up-to-date sources from the git repository, but the latest release +archive is quite OK as well. ### Documentation Writing docs is dead boring and one of the big problems with many open source -projects. But someone's gotta do it! It makes things a lot easier if you +projects. But someone's gotta do it. It makes things a lot easier if you submit a small description of your fix or your new features with every contribution so that it can be swiftly added to the package documentation. @@ -114,17 +112,17 @@ generated from the nroff/ASCII versions. ### Test Cases Since the introduction of the test suite, we can quickly verify that the main -features are working as they're supposed to. To maintain this situation and +features are working as they are supposed to. To maintain this situation and improve it, all new features and functions that are added need to be tested in the test suite. Every feature that is added should get at least one valid test case that verifies that it works as documented. If every submitter also -posts a few test cases, it won't end up as a heavy burden on a single person! +posts a few test cases, it will not end up as a heavy burden on a single person! -If you don't have test cases or perhaps you have done something that is very -hard to write tests for, do explain exactly how you have otherwise tested and +If you do not have test cases or perhaps you have done something that is hard +to write tests for, do explain exactly how you have otherwise tested and verified your changes. -## Sharing Your Changes +## Submit Your Changes ### How to get your changes into the main sources @@ -133,15 +131,20 @@ GitHub](https://github.com/curl/curl/pulls), but you can also send your plain patch to [the curl-library mailing list](https://curl.se/mail/list.cgi?list=curl-library). -Either way, your change will be reviewed and discussed there and you will be -expected to correct flaws pointed out and update accordingly, or the change -risks stalling and eventually just getting deleted without action. As a -submitter of a change, you are the owner of that change until it has been merged. +If you opt to post a patch on the mailing list, chances are someone will +convert it into a pull request for you, to have the CI jobs verify it proper +before it can be merged. Be prepared that some feedback on the proposed change +might then come on GitHub. + +Your change will be reviewed and discussed and you will be expected to correct +flaws pointed out and update accordingly, or the change risks stalling and +eventually just getting deleted without action. As a submitter of a change, +you are the owner of that change until it has been merged. -Respond on the list or on github about the change and answer questions and/or -fix nits/flaws. This is very important. We will take lack of replies as a -sign that you're not very anxious to get your patch accepted and we tend to -simply drop such changes. +Respond on the list or on GitHub about the change and answer questions and/or +fix nits/flaws. This is important. We will take lack of replies as a sign that +you are not anxious to get your patch accepted and we tend to simply drop such +changes. ### About pull requests @@ -154,41 +157,9 @@ git commit that is easy to merge and they are easy to track and not that easy to lose in the flood of many emails, like they sometimes do on the mailing lists. -Every pull request submitted will automatically be tested in several different -ways. Every pull request is verified for each of the following: - - - ... it still builds, warning-free, on Linux and macOS, with both - clang and gcc - - ... it still builds fine on Windows with several MSVC versions - - ... it still builds with cmake on Linux, with gcc and clang - - ... it follows rudimentary code style rules - - ... the test suite still runs 100% fine - - ... the release tarball (the "dist") still works - - ... it builds fine in-tree as well as out-of-tree - - ... code coverage doesn't shrink drastically - -If the pull-request fails one of these tests, it will show up as a red X and -you are expected to fix the problem. If you don't understand when the issue is -or have other problems to fix the complaint, just ask and other project -members will likely be able to help out. - -Consider the following table while looking at pull request failures: - - | CI platform as shown in PR | State | What to look at next | - | ----------------------------------- | ------ | -------------------------- | - | CI / codeql | stable | quality check results | - | CI / fuzzing | stable | fuzzing results | - | CI / macos ... | stable | all errors and failures | - | Code scanning results / CodeQL | stable | quality check results | - | FreeBSD FreeBSD: ... | stable | all errors and failures | - | LGTM analysis: Python | stable | new findings | - | LGTM analysis: C/C++ | stable | new findings | - | buildbot/curl_winssl_ ... | stable | all errors and failures | - | continuous-integration/appveyor/pr | stable | all errors and failures | - | curl.curl (linux ...) | stable | all errors and failures | - | curl.curl (windows ...) | flaky | repetitive errors/failures | - | deepcode-ci-bot | stable | new findings | - | musedev | stable | new findings | +Every pull request submitted will automatically be +tested in several different ways. [See CI.md for more +information](https://github.com/curl/curl/blob/master/tests/CI.md). Sometimes the tests fail due to a dependency service temporarily being offline or otherwise unavailable, eg. package downloads. In this case you can just @@ -201,15 +172,21 @@ actual content changed also allows you to retrigger the tests for that commit. When you adjust your pull requests after review, consider squashing the commits so that we can review the full updated version more easily. -### Making quality patches +A pull request sent to the project might get labeled `needs-votes` by a +project maintainer. This label means that in addition to meeting all other +checks and qualifications this pull request must also receive more "votes" of +user support. More signs that people want this to happen. It could be in the +form of messages saying so, or thumbs-up reactions on GitHub. + +### Making quality changes Make the patch against as recent source versions as possible. -If you've followed the tips in this document and your patch still hasn't been -incorporated or responded to after some weeks, consider resubmitting it to the -list or better yet: change it to a pull request. +If you have followed the tips in this document and your patch still has not +been incorporated or responded to after some weeks, consider resubmitting it +to the list or better yet: change it to a pull request. -### Write good commit messages +### Commit messages A short guide to how to write commit messages in the curl project. @@ -229,24 +206,24 @@ A short guide to how to write commit messages in the curl project. The first line is a succinct description of the change: - use the imperative, present tense: "change" not "changed" nor "changes" - - don't capitalize first letter + - do not capitalize first letter - no dot (.) at the end The `[area]` in the first line can be `http2`, `cookies`, `openssl` or similar. There's no fixed list to select from but using the same "area" as other related changes could make sense. -Don't forget to use commit --author="" if you commit someone else's work, and +Do not forget to use commit --author="" if you commit someone else's work, and make sure that you have your own user and email setup correctly in git before you commit ### Write Access to git Repository -If you are a very frequent contributor, you may be given push access to the -git repository and then you'll be able to push your changes straight into the -git repo instead of sending changes as pull requests or by mail as patches. +If you are a frequent contributor, you may be given push access to the git +repository and then you will be able to push your changes straight into the git +repo instead of sending changes as pull requests or by mail as patches. -Just ask if this is what you'd want. You will be required to have posted +Just ask if this is what you would want. You will be required to have posted several high quality patches first, before you can be granted push access. ### How To Make a Patch with git @@ -263,7 +240,7 @@ local repository: As usual, group your commits so that you commit all changes at once that constitute a logical change. -Once you have done all your commits and you're happy with what you see, you +Once you have done all your commits and you are happy with what you see, you can make patches out of your changes that are suitable for mailing: git format-patch remotes/origin/master @@ -304,3 +281,21 @@ For Windows: ### Useful resources - [Webinar on getting code into cURL](https://www.youtube.com/watch?v=QmZ3W1d6LQI) + +## Update copyright and license information + +There is a CI job called **REUSE compliance / check** that will run on every +pull request and commit to verify that the *REUSE state* of all files are +still fine. + +This means that all files need to have their license and copyright information +clearly stated. Ideally by having the standard curl source code header, with +an accurate copyright year range and the SPDX-License-Identifier included. If +the header does not work, you can use a smaller header or as a last resort add +the information for a specific file to the `.reuse/dep5` file. + +We update copyright year ranges to end on the year of the most recent change +of the individual file. + +You can manually verify the copyright and compliance status by running the +`./scripts/copyright.pl` script in the root of the git repository. diff --git a/trunk/libs/libcurl/curl-7.x/docs/CURL-DISABLE.md b/trunk/libs/libcurl/curl-7.x/docs/CURL-DISABLE.md index a2e75f19..7ece3dc5 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/CURL-DISABLE.md +++ b/trunk/libs/libcurl/curl-7.x/docs/CURL-DISABLE.md @@ -37,6 +37,10 @@ about existing options to `curl_easy_setopt`. Disable the GOPHER protocol. +## CURL_DISABLE_HEADERS_API + +Disable the HTTP header API. + ## CURL_DISABLE_HSTS Disable the HTTP Strict Transport Security support. diff --git a/trunk/libs/libcurl/curl-7.x/docs/DEPRECATE.md b/trunk/libs/libcurl/curl-7.x/docs/DEPRECATE.md index 464974d1..b4014248 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/DEPRECATE.md +++ b/trunk/libs/libcurl/curl-7.x/docs/DEPRECATE.md @@ -4,9 +4,42 @@ If any of these deprecated features is a cause for concern for you, please email the [curl-library mailing list](https://lists.haxx.se/listinfo/curl-library) as soon as possible and explain to us why this is a problem for you and -how your use case can't be satisfied properly using a workaround. +how your use case cannot be satisfied properly using a workaround. -## Past removals +## NSS + +We remove support for building curl with the NSS TLS library in August 2023. + +- There are very few users left who use curl+NSS +- NSS has very few users outside of curl as well (primarily Firefox) +- NSS is harder than ever to find documentation for +- NSS was always "best" used with Red Hat Linux when they provided additional + features on top of the regular NSS that is not shipped by the vanilla library + +Starting in 7.82.0, building curl to use NSS configure requires the additional +flag --with-nss-deprecated in an attempt to highlight these plans. + +## NPN + +We make selecting NPN a no-op starting in August 2022. + +**Next Protocol Negotiation** is a TLS extension that was created and used for +agreeing to use the SPDY protocol (the precursor to HTTP/2) for HTTPS. In the +early days of HTTP/2, before the spec was finalized and shipped, the protocol +could be enabled using this extension with some servers. + +curl supports the NPN extension with some TLS backends since then, with a +command line option `--npn` and in libcurl with `CURLOPT_SSL_ENABLE_NPN`. + +HTTP/2 proper is made to use the ALPN (Application-Layer Protocol Negotiation) +extension and the NPN extension has no purposes anymore. The HTTP/2 spec was +published in May 2015. + +Today, use of NPN in the wild should be extremely rare and most likely totally +extinct. Chrome removed NPN support in Chrome 51, shipped in +June 2016. Removed in Firefox 53, April 2017. + +## past removals - Pipelining - axTLS diff --git a/trunk/libs/libcurl/curl-7.x/docs/DYNBUF.md b/trunk/libs/libcurl/curl-7.x/docs/DYNBUF.md index a30a058b..a984a41e 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/DYNBUF.md +++ b/trunk/libs/libcurl/curl-7.x/docs/DYNBUF.md @@ -1,7 +1,7 @@ # dynbuf This is the internal module for creating and handling "dynamic buffers". This -means buffers that can be appended to, dynamically and grow in size to adapt. +means buffers that can be appended to, dynamically and grow to adapt. There will always be a terminating zero put at the end of the dynamic buffer. @@ -15,7 +15,7 @@ without using the dedicated dynbuf API. void Curl_dyn_init(struct dynbuf *s, size_t toobig); ``` -This inits a struct to use for dynbuf and it can't fail. The `toobig` value +This inits a struct to use for dynbuf and it cannot fail. The `toobig` value **must** be set to the maximum size we allow this buffer instance to grow to. The functions below will return `CURLE_OUT_OF_MEMORY` when hitting this limit. @@ -84,9 +84,9 @@ larger than the buffer length. char *Curl_dyn_ptr(const struct dynbuf *s); ``` -Returns a `char *` to the buffer if it has a length, otherwise a NULL. Since -the buffer may be reallocated, this pointer should not be trusted or used -anymore after the next buffer manipulation call. +Returns a `char *` to the buffer if it has a length, otherwise may return +NULL. Since the buffer may be reallocated, this pointer should not be trusted +or used anymore after the next buffer manipulation call. ## uptr @@ -94,9 +94,9 @@ anymore after the next buffer manipulation call. unsigned char *Curl_dyn_uptr(const struct dynbuf *s); ``` -Returns an `unsigned char *` to the buffer if it has a length, otherwise a -NULL. Since the buffer may be reallocated, this pointer should not be trusted -or used anymore after the next buffer manipulation call. +Returns an `unsigned char *` to the buffer if it has a length, otherwise may +return NULL. Since the buffer may be reallocated, this pointer should not be +trusted or used anymore after the next buffer manipulation call. ## len diff --git a/trunk/libs/libcurl/curl-7.x/docs/ECH.md b/trunk/libs/libcurl/curl-7.x/docs/ECH.md deleted file mode 100644 index a09140e6..00000000 --- a/trunk/libs/libcurl/curl-7.x/docs/ECH.md +++ /dev/null @@ -1,135 +0,0 @@ -# TLS: ECH support in curl and libcurl - -## Summary - -**ECH** means **Encrypted Client Hello**, a TLS 1.3 extension which is -currently the subject of an [IETF Draft][tlsesni]. (ECH was formerly known as -ESNI). - -This file is intended to show the latest current state of ECH support -in **curl** and **libcurl**. - -At end of August 2019, an [experimental fork of curl][niallorcurl], built -using an [experimental fork of OpenSSL][sftcdopenssl], which in turn provided -an implementation of ECH, was demonstrated interoperating with a server -belonging to the [DEfO Project][defoproj]. - -Further sections here describe - -- resources needed for building and demonstrating **curl** support - for ECH, - -- progress to date, - -- TODO items, and - -- additional details of specific stages of the progress. - -## Resources needed - -To build and demonstrate ECH support in **curl** and/or **libcurl**, -you will need - -- a TLS library, supported by **libcurl**, which implements ECH; - -- an edition of **curl** and/or **libcurl** which supports the ECH - implementation of the chosen TLS library; - -- an environment for building and running **curl**, and at least - building **OpenSSL**; - -- a server, supporting ECH, against which to run a demonstration - and perhaps a specific target URL; - -- some instructions. - -The following set of resources is currently known to be available. - -| Set | Component | Location | Remarks | -|:-----|:-------------|:------------------------------|:-------------------------------------------| -| DEfO | TLS library | [sftcd/openssl][sftcdopenssl] | Tag *esni-2019-08-30* avoids bleeding edge | -| | curl fork | [niallor/curl][niallorcurl] | Tag *esni-2019-08-30* likewise | -| | instructions | [ESNI-README][niallorreadme] | | - -## Progress - -### PR 4011 (Jun 2019) expected in curl release 7.67.0 (Oct 2019) - -- Details [below](#pr-4011); - -- New configuration option: `--enable-ech`; - -- Build-time check for availability of resources needed for ECH - support; - -- Pre-processor symbol `USE_ECH` for conditional compilation of - ECH support code, subject to configuration option and - availability of needed resources. - -## TODO - -- (next PR) Add libcurl options to set ECH parameters. - -- (next PR) Add curl tool command line options to set ECH parameters. - -- (WIP) Extend DoH functions so that published ECH parameters can be - retrieved from DNS instead of being required as options. - -- (WIP) Work with OpenSSL community to finalize ECH API. - -- Track OpenSSL ECH API in libcurl - -- Identify and implement any changes needed for CMake. - -- Optimize build-time checking of available resources. - -- Encourage ECH support work on other TLS/SSL backends. - -## Additional detail - -### PR 4011 - -**TLS: Provide ECH support framework for curl and libcurl** - -The proposed change provides a framework to facilitate work to implement ECH -support in curl and libcurl. It is not intended either to provide ECH -functionality or to favour any particular TLS-providing backend. Specifically, -the change reserves a feature bit for ECH support (symbol -`CURL_VERSION_ECH`), implements setting and reporting of this bit, includes -dummy book-keeping for the symbol, adds a build-time configuration option -(`--enable-ech`), provides an extensible check for resources available to -provide ECH support, and defines a compiler pre-processor symbol (`USE_ECH`) -accordingly. - -Proposed-by: @niallor (Niall O'Reilly)\ -Encouraged-by: @sftcd (Stephen Farrell)\ -See-also: [this message](https://curl.se/mail/lib-2019-05/0108.html) - -Limitations: -- Book-keeping (symbols-in-versions) needs real release number, not 'DUMMY'. - -- Framework is incomplete, as it covers autoconf, but not CMake. - -- Check for available resources, although extensible, refers only to - specific work in progress ([described - here](https://github.com/sftcd/openssl/tree/master/esnistuff)) to - implement ECH for OpenSSL, as this is the immediate motivation - for the proposed change. - -## References - -Cloudflare blog: [Encrypting SNI: Fixing One of the Core Internet Bugs][corebug] - -Cloudflare blog: [Encrypt it or lose it: how encrypted SNI works][esniworks] - -IETF Draft: [Encrypted Server Name Indication for TLS 1.3][tlsesni] - ---- - -[tlsesni]: https://datatracker.ietf.org/doc/draft-ietf-tls-esni/ -[esniworks]: https://blog.cloudflare.com/encrypted-sni/ -[corebug]: https://blog.cloudflare.com/esni/ -[defoproj]: https://defo.ie/ -[sftcdopenssl]: https://github.com/sftcd/openssl/ -[niallorcurl]: https://github.com/niallor/curl/ -[niallorreadme]: https://github.com/niallor/curl/blob/master/ESNI-README.md diff --git a/trunk/libs/libcurl/curl-7.x/docs/EXPERIMENTAL.md b/trunk/libs/libcurl/curl-7.x/docs/EXPERIMENTAL.md index ce9a1b8e..42b6e214 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/EXPERIMENTAL.md +++ b/trunk/libs/libcurl/curl-7.x/docs/EXPERIMENTAL.md @@ -20,4 +20,5 @@ Experimental support in curl means: - The Hyper HTTP backend - HTTP/3 support and options - - CURLSSLOPT_NATIVE_CA (No configure option, feature built in when supported) + - `CURLSSLOPT_NATIVE_CA` (No configure option, feature built in when supported) + - The rustls backend diff --git a/trunk/libs/libcurl/curl-7.x/docs/FAQ b/trunk/libs/libcurl/curl-7.x/docs/FAQ index 2a969510..375715dc 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/FAQ +++ b/trunk/libs/libcurl/curl-7.x/docs/FAQ @@ -14,11 +14,11 @@ FAQ 1.5 Who makes curl? 1.6 What do you get for making curl? 1.7 What about CURL from curl.com? - 1.8 I have a problem who do I mail? + 1.8 I have a problem, who do I mail? 1.9 Where do I buy commercial support for curl? 1.10 How many are using curl? - 1.11 Why don't you update ca-bundle.crt - 1.12 I have a problem who can I chat with? + 1.11 Why do you not update ca-bundle.crt + 1.12 I have a problem, who can I chat with? 1.13 curl's ECCN number? 1.14 How do I submit my patch? 1.15 How do I port libcurl to my OS? @@ -31,7 +31,7 @@ FAQ 3. Usage Problems 3.1 curl: (1) SSL is disabled, https: not supported 3.2 How do I tell curl to resume a transfer? - 3.3 Why doesn't my posting using -F work? + 3.3 Why does my posting using -F not work? 3.4 How do I tell curl to run custom FTP commands? 3.5 How can I disable the Accept: */* header? 3.6 Does curl support ASP, XML, XHTML or HTML version Y? @@ -42,10 +42,10 @@ FAQ 3.11 How do I POST with a different Content-Type? 3.12 Why do FTP-specific features over HTTP proxy fail? 3.13 Why do my single/double quotes fail? - 3.14 Does curl support Javascript or PAC (automated proxy config)? + 3.14 Does curl support JavaScript or PAC (automated proxy config)? 3.15 Can I do recursive fetches with curl? 3.16 What certificates do I need when I use SSL? - 3.17 How do I list the root dir of an FTP server? + 3.17 How do I list the root directory of an FTP server? 3.18 Can I use curl to send a POST/PUT and not wait for a response? 3.19 How do I get HTTP from a host using a specific IP address? 3.20 How to SFTP from my user's home directory? @@ -55,8 +55,8 @@ FAQ 4. Running Problems 4.2 Why do I get problems when I use & or % in the URL? 4.3 How can I use {, }, [ or ] to specify multiple URLs? - 4.4 Why do I get downloaded data even though the web page doesn't exist? - 4.5 Why do I get return code XXX from a HTTP server? + 4.4 Why do I get downloaded data even though the web page does not exist? + 4.5 Why do I get return code XXX from an HTTP server? 4.5.1 "400 Bad Request" 4.5.2 "401 Unauthorized" 4.5.3 "403 Forbidden" @@ -65,19 +65,19 @@ FAQ 4.5.6 "301 Moved Permanently" 4.6 Can you tell me what error code 142 means? 4.7 How do I keep user names and passwords secret in curl command lines? - 4.8 I found a bug! - 4.9 curl can't authenticate to the server that requires NTLM? - 4.10 My HTTP request using HEAD, PUT or DELETE doesn't work! + 4.8 I found a bug + 4.9 curl cannot authenticate to a server that requires NTLM? + 4.10 My HTTP request using HEAD, PUT or DELETE does not work 4.11 Why do my HTTP range requests return the full document? 4.12 Why do I get "certificate verify failed" ? 4.13 Why is curl -R on Windows one hour off? - 4.14 Redirects work in browser but not with curl! - 4.15 FTPS doesn't work - 4.16 My HTTP POST or PUT requests are slow! + 4.14 Redirects work in browser but not with curl + 4.15 FTPS does not work + 4.16 My HTTP POST or PUT requests are slow 4.17 Non-functional connect timeouts on Windows 4.18 file:// URLs containing drive letters (Windows, NetWare) - 4.19 Why doesn't curl return an error when the network cable is unplugged? - 4.20 curl doesn't return error for HTTP non-200 responses! + 4.19 Why does not curl return an error when the network cable is unplugged? + 4.20 curl does not return error for HTTP non-200 responses 5. libcurl Issues 5.1 Is libcurl thread-safe? @@ -86,7 +86,7 @@ FAQ 5.4 Does libcurl do Winsock initialization on win32 systems? 5.5 Does CURLOPT_WRITEDATA and CURLOPT_READDATA work on win32 ? 5.6 What about Keep-Alive or persistent connections? - 5.7 Link errors when building libcurl on Windows! + 5.7 Link errors when building libcurl on Windows 5.8 libcurl.so.X: open failed: No such file or directory 5.9 How does libcurl resolve host names? 5.10 How do I prevent libcurl from writing the response to stdout? @@ -95,7 +95,7 @@ FAQ 5.13 How do I stop an ongoing transfer? 5.14 Using C++ non-static functions for callbacks? 5.15 How do I get an FTP directory listing? - 5.16 I want a different time-out! + 5.16 I want a different time-out 5.17 Can I write a server with libcurl? 5.18 Does libcurl use threads? @@ -126,7 +126,7 @@ FAQ cURL is the name of the project. The name is a play on 'Client for URLs', originally with URL spelled in uppercase to make it obvious it deals with - URLs. The fact it can also be pronounced 'see URL' also helped, it works as + URLs. The fact it can also be read as 'see URL' also helped, it works as an abbreviation for "Client URL Request Library" or why not the recursive version: "curl URL Request Library". @@ -134,20 +134,19 @@ FAQ libcurl - A free and easy-to-use client-side URL transfer library, supporting DICT, - FILE, FTP, FTPS, GOPHER, GOPHERS, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS, - MQTT, POP3, POP3S, RTMP, RTMPS, RTSP, SCP, SFTP, SMB, SMBS, SMTP, SMTPS, - TELNET and TFTP. + A client-side URL transfer library, supporting DICT, FILE, FTP, FTPS, + GOPHER, GOPHERS, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS, MQTT, POP3, POP3S, + RTMP, RTMPS, RTSP, SCP, SFTP, SMB, SMBS, SMTP, SMTPS, TELNET and TFTP. libcurl supports HTTPS certificates, HTTP POST, HTTP PUT, FTP uploading, Kerberos, SPNEGO, HTTP form based upload, proxies, cookies, user+password - authentication, file transfer resume, http proxy tunneling and more! + authentication, file transfer resume, http proxy tunneling and more. libcurl is highly portable, it builds and works identically on numerous platforms, including Solaris, NetBSD, FreeBSD, OpenBSD, Darwin, HP-UX, - IRIX, AIX, Tru64, Linux, UnixWare, HURD, Windows, Amiga, OS/2, BeOS, Mac - OS X, Ultrix, QNX, OpenVMS, RISC OS, Novell NetWare, DOS, Symbian, OSF, - Android, Minix, IBM TPF and more... + IRIX, AIX, Tru64, Linux, UnixWare, HURD, Windows, Amiga, OS/2, macOS, + Ultrix, QNX, OpenVMS, RISC OS, Novell NetWare, DOS, Symbian, OSF, Android, + Minix, IBM TPF and more... libcurl is free, thread-safe, IPv6 compatible, feature rich, well supported and fast. @@ -172,10 +171,10 @@ FAQ 1.2 What is libcurl? - libcurl is a reliable and portable library which provides you with an easy - interface to a range of common Internet protocols. + libcurl is a reliable and portable library for doing Internet data transfers + using one or more of its supported Internet protocols. - You can use libcurl for free in your application, be it open source, + You can use libcurl freely in your application, be it open source, commercial or closed-source. libcurl is most probably the most portable, most powerful and most often @@ -184,7 +183,7 @@ FAQ 1.3 What is curl not? - curl is not a wget clone. That is a common misconception. Never, during + curl is not a wget clone. That is a common misconception. Never, during curl's development, have we intended curl to replace wget or compete on its market. curl is targeted at single-shot file transfers. @@ -201,8 +200,8 @@ FAQ curl is not a program for a single operating system. curl exists, compiles, builds and runs under a wide range of operating systems, including all - modern Unixes (and a bunch of older ones too), Windows, Amiga, BeOS, OS/2, - OS X, QNX etc. + modern Unixes (and a bunch of older ones too), Windows, Amiga, OS/2, macOS, + QNX etc. 1.4 When will you make curl do XXXX ? @@ -215,18 +214,18 @@ FAQ another tool that uses libcurl. We do not add things to curl that other small and available tools already do - very well at the side. curl's output can be piped into another program or + well at the side. curl's output can be piped into another program or redirected to another file for the next program to interpret. We focus on protocol related issues and improvements. If you want to do more - magic with the supported protocols than curl currently does, chances are good - we will agree. If you want to add more protocols, we may very well agree. + magic with the supported protocols than curl currently does, chances are + good we will agree. If you want to add more protocols, we may agree. If you want someone else to do all the work while you wait for us to - implement it for you, that is not a very friendly attitude. We spend a + implement it for you, that is not a friendly attitude. We spend a considerable time already on maintaining and developing curl. In order to get more out of us, you should consider trading in some of your time and - effort in return. Simply go to the GitHub repo which resides at + effort in return. Simply go to the GitHub repository which resides at https://github.com/curl/curl, fork the project, and create pull requests with your proposed changes. @@ -247,9 +246,8 @@ FAQ 1.6 What do you get for making curl? Project cURL is entirely free and open. We do this voluntarily, mostly in - our spare time. Companies may pay individual developers to work on curl, - but that's up to each company and developer. This is not controlled by nor - supervised in any way by the curl project. + our spare time. Companies may pay individual developers to work on curl. + This is not controlled by nor supervised in any way by the curl project. We get help from companies. Haxx provides website, bandwidth, mailing lists etc, GitHub hosts the primary git repository and other services like the bug @@ -277,7 +275,7 @@ FAQ We recognize that we will be living in parallel with curl.com and wish them every success. - 1.8 I have a problem whom do I mail? + 1.8 I have a problem, who do I mail? Please do not mail any single individual unless you really need to. Keep curl-related questions on a suitable mailing list. All available mailing @@ -296,7 +294,7 @@ FAQ issue private while we investigate, confirm it, work and validate a fix and agree on a time schedule for publication etc. That way we produce a fix in a timely manner before the flaw is announced to the world, reducing the impact - the problem risk having on existing users. + the problem risks having on existing users. Security issues can also be taking to the curl security team by emailing security at curl.se (closed list of receivers, mails are not disclosed). @@ -313,23 +311,23 @@ FAQ It is impossible to tell. - We don't know how many users that knowingly have installed and use curl. + We do not know how many users that knowingly have installed and use curl. - We don't know how many users that use curl without knowing that they are in + We do not know how many users that use curl without knowing that they are in fact using it. - We don't know how many users that downloaded or installed curl and then + We do not know how many users that downloaded or installed curl and then never use it. In 2020, we estimate that curl runs in roughly ten billion installations world wide. - 1.11 Why don't you update ca-bundle.crt + 1.11 Why do you not update ca-bundle.crt - In the cURL project we've decided not to attempt to keep this file updated + In the cURL project we have decided not to attempt to keep this file updated (or even present) since deciding what to add to a ca cert bundle is an - undertaking we've not been ready to accept, and the one we can get from - Mozilla is perfectly fine so there's no need to duplicate that work. + undertaking we have not been ready to accept, and the one we can get from + Mozilla is perfectly fine so there is no need to duplicate that work. Today, with many services performed over HTTPS, every operating system should come with a default ca cert bundle that can be deemed somewhat @@ -341,10 +339,10 @@ FAQ Firefox (by running 'make ca-bundle), or by using our online service setup for this purpose: https://curl.se/docs/caextract.html - 1.12 I have a problem who can I chat with? + 1.12 I have a problem who, can I chat with? - There's a bunch of friendly people hanging out in the #curl channel on the - IRC network libera.chat. If you're polite and nice, chances are good that + There is a bunch of friendly people hanging out in the #curl channel on the + IRC network libera.chat. If you are polite and nice, chances are good that you can get -- or provide -- help instantly. 1.13 curl's ECCN number? @@ -372,10 +370,10 @@ FAQ 1.14 How do I submit my patch? We strongly encourage you to submit changes and improvements directly as - "pull requests" on github: https://github.com/curl/curl/pulls + "pull requests" on GitHub: https://github.com/curl/curl/pulls - If you for any reason can't or won't deal with github, send your patch to - the curl-library mailing list. We're many subscribers there and there are + If you for any reason cannot or will not deal with GitHub, send your patch to + the curl-library mailing list. We are many subscribers there and there are lots of people who can review patches, comment on them and "receive" them properly. @@ -405,16 +403,16 @@ FAQ configure checks for. The reason why static libraries is much harder to deal with is that for them - we don't get any help but the script itself must know or check what more + we do not get any help but the script itself must know or check what more libraries that are needed (with shared libraries, that dependency "chain" is - handled automatically). This is a very error-prone process and one that also + handled automatically). This is a error-prone process and one that also tends to vary over time depending on the release versions of the involved components and may also differ between operating systems. - For that reason, configure does very little attempts to actually figure this - out and you are instead encouraged to set LIBS and LDFLAGS accordingly when - you invoke configure, and point out the needed libraries and set the - necessary flags yourself. + For that reason, configure does few attempts to actually figure this out and + you are instead encouraged to set LIBS and LDFLAGS accordingly when you + invoke configure, and point out the needed libraries and set the necessary + flags yourself. 2.2 Does curl work with other SSL libraries? @@ -423,7 +421,7 @@ FAQ backends. curl can be built to use one of the following SSL alternatives: OpenSSL, - libressl, BoringSSL, GnuTLS, wolfSSL, NSS, mbedTLS, MesaLink, Secure + libressl, BoringSSL, GnuTLS, wolfSSL, NSS, mbedTLS, Secure Transport (native iOS/OS X), Schannel (native Windows), GSKit (native IBM i), BearSSL, or Rustls. They all have their pros and cons, and we try to maintain a comparison of them here: https://curl.se/docs/ssl-compared.html @@ -436,21 +434,21 @@ FAQ 3.1 curl: (1) SSL is disabled, https: not supported - If you get this output when trying to get anything from a https:// server, - it means that the instance of curl/libcurl that you're using was built + If you get this output when trying to get anything from an https:// server, + it means that the instance of curl/libcurl that you are using was built without support for this protocol. - This could've happened if the configure script that was run at build time - couldn't find all libs and include files curl requires for SSL to work. If + This could have happened if the configure script that was run at build time + could not find all libs and include files curl requires for SSL to work. If the configure script fails to find them, curl is simply built without SSL support. To get the https:// support into a curl that was previously built but that reports that https:// is not supported, you should dig through the document - and logs and check out why the configure script doesn't find the SSL libs + and logs and check out why the configure script does not find the SSL libs and/or include files. - Also, check out the other paragraph in this FAQ labeled "configure doesn't + Also, check out the other paragraph in this FAQ labeled "configure does not find OpenSSL even when it is installed". 3.2 How do I tell curl to resume a transfer? @@ -458,19 +456,19 @@ FAQ curl supports resumed transfers both ways on both FTP and HTTP. Try the -C option. - 3.3 Why doesn't my posting using -F work? + 3.3 Why does my posting using -F not work? - You can't arbitrarily use -F or -d, the choice between -F or -d depends on + You cannot arbitrarily use -F or -d, the choice between -F or -d depends on the HTTP operation you need curl to do and what the web server that will receive your post expects. - If the form you're trying to submit uses the type 'multipart/form-data', + If the form you are trying to submit uses the type 'multipart/form-data', then and only then you must use the -F type. In all the most common cases, you should use -d which then causes a posting with the type 'application/x-www-form-urlencoded'. This is described in some detail in the MANUAL and TheArtOfHttpScripting - documents, and if you don't understand it the first time, read it again + documents, and if you do not understand it the first time, read it again before you post questions about this to the mailing list. Also, try reading through the mailing list archives for old postings and questions regarding this. @@ -480,7 +478,7 @@ FAQ You can tell curl to perform optional commands both before and/or after a file transfer. Study the -Q/--quote option. - Since curl is used for file transfers, you don't normally use curl to + Since curl is used for file transfers, you do not normally use curl to perform FTP commands without transferring anything. Therefore you must always specify a URL to transfer to/from even when doing custom FTP commands, or use -I which implies the "no body" option sent to libcurl. @@ -493,12 +491,12 @@ FAQ 3.6 Does curl support ASP, XML, XHTML or HTML version Y? - To curl, all contents are alike. It doesn't matter how the page was + To curl, all contents are alike. It does not matter how the page was generated. It may be ASP, PHP, Perl, shell-script, SSI or plain HTML - files. There's no difference to curl and it doesn't even know what kind of + files. There is no difference to curl and it does not even know what kind of language that generated the page. - See also item 3.14 regarding javascript. + See also item 3.14 regarding JavaScript. 3.7 Can I use curl to delete/rename a file through FTP? @@ -515,7 +513,7 @@ FAQ 3.8 How do I tell curl to follow HTTP redirects? curl does not follow so-called redirects by default. The Location: header - that informs the client about this is only interpreted if you're using the + that informs the client about this is only interpreted if you are using the -L/--location option. As in: curl -L http://redirector.com @@ -534,18 +532,18 @@ FAQ All the various bindings to libcurl are made by other projects and people, outside of the cURL project. The cURL project itself only produces libcurl - with its plain C API. If you don't find anywhere else to ask you can ask + with its plain C API. If you do not find anywhere else to ask you can ask about bindings on the curl-library list too, but be prepared that people on that list may not know anything about bindings. - In February 2019, there were interfaces available for the following + In December 2021, there were interfaces available for the following languages: Ada95, Basic, C, C++, Ch, Cocoa, D, Delphi, Dylan, Eiffel, Euphoria, Falcon, Ferite, Gambas, glib/GTK+, Go, Guile, Harbour, Haskell, Java, Julia, Lisp, Lua, Mono, .NET, node.js, Object-Pascal, OCaml, Pascal, Perl, PHP, PostgreSQL, Python, R, Rexx, Ring, RPG, Ruby, Rust, Scheme, Scilab, S-Lang, Smalltalk, SP-Forth, SPL, Tcl, Visual Basic, Visual FoxPro, Q, wxwidgets, XBLite and Xoho. By the time you read this, additional ones - may have appeared! + may have appeared. 3.10 What about SOAP, WebDAV, XML-RPC or similar protocols over HTTP? @@ -554,7 +552,7 @@ FAQ XML-RPC are all such ones. You can use -X to set custom requests and -H to set custom headers (or replace internally generated ones). - Using libcurl is of course just as good and you'd just use the proper + Using libcurl is of course just as good and you would just use the proper library options to do the same. 3.11 How do I POST with a different Content-Type? @@ -566,9 +564,9 @@ FAQ 3.12 Why do FTP-specific features over HTTP proxy fail? - Because when you use a HTTP proxy, the protocol spoken on the network will - be HTTP, even if you specify a FTP URL. This effectively means that you - normally can't use FTP-specific features such as FTP upload and FTP quote + Because when you use an HTTP proxy, the protocol spoken on the network will + be HTTP, even if you specify an FTP URL. This effectively means that you + normally cannot use FTP-specific features such as FTP upload and FTP quote etc. There is one exception to this rule, and that is if you can "tunnel through" @@ -590,7 +588,14 @@ FAQ Exactly what kind of quotes and how to do this is entirely up to the shell or command line interpreter that you are using. For most unix shells, you can more or less pick either single (') or double (") quotes. For - Windows/DOS prompts I believe you're forced to use double (") quotes. + Windows/DOS command prompts you must use double (") quotes, and if the + option string contains inner double quotes you can escape them with a + backslash. + + For Windows powershell the arguments are not always passed on as expected + because curl is not a powershell script. You may or may not be able to use + single quotes. To escape inner double quotes seems to require a + backslash-backtick escape sequence and the outer quotes as double quotes. Please study the documentation for your particular environment. Examples in the curl docs will use a mix of both of these as shown above. You must @@ -599,27 +604,27 @@ FAQ Remember that curl works and runs on more operating systems than most single individuals have ever tried. - 3.14 Does curl support Javascript or PAC (automated proxy config)? + 3.14 Does curl support JavaScript or PAC (automated proxy config)? - Many web pages do magic stuff using embedded Javascript. curl and libcurl + Many web pages do magic stuff using embedded JavaScript. curl and libcurl have no built-in support for that, so it will be treated just like any other contents. - .pac files are a netscape invention and are sometimes used by organizations + .pac files are a Netscape invention and are sometimes used by organizations to allow them to differentiate which proxies to use. The .pac contents is - just a Javascript program that gets invoked by the browser and that returns - the name of the proxy to connect to. Since curl doesn't support Javascript, - it can't support .pac proxy configuration either. + just a JavaScript program that gets invoked by the browser and that returns + the name of the proxy to connect to. Since curl does not support JavaScript, + it cannot support .pac proxy configuration either. - Some workarounds usually suggested to overcome this Javascript dependency: + Some workarounds usually suggested to overcome this JavaScript dependency: - Depending on the Javascript complexity, write up a script that translates it + Depending on the JavaScript complexity, write up a script that translates it to another language and execute that. - Read the Javascript code and rewrite the same logic in another language. + Read the JavaScript code and rewrite the same logic in another language. - Implement a Javascript interpreter, people have successfully used the - Mozilla Javascript engine in the past. + Implement a JavaScript interpreter, people have successfully used the + Mozilla JavaScript engine in the past. Ask your admins to stop this, for a static proxy setup or similar. @@ -640,8 +645,8 @@ FAQ CLIENT CERTIFICATE The server you communicate with may require that you can provide this in - order to prove that you actually are who you claim to be. If the server - doesn't require this, you don't need a client certificate. + order to prove that you actually are who you claim to be. If the server + does not require this, you do not need a client certificate. A client certificate is always used together with a private key, and the private key has a pass phrase that protects it. @@ -670,10 +675,10 @@ FAQ refused access. You then need to explicitly disable the verification to connect to the server. - 3.17 How do I list the root dir of an FTP server? + 3.17 How do I list the root directory of an FTP server? There are two ways. The way defined in the RFC is to use an encoded slash - in the first path part. List the "/tmp" dir like this: + in the first path part. List the "/tmp" directory like this: curl ftp://ftp.sunet.se/%2ftmp/ @@ -686,11 +691,11 @@ FAQ No. - But you could easily write your own program using libcurl to do such stunts. + You can easily write your own program using libcurl to do such stunts. 3.19 How do I get HTTP from a host using a specific IP address? - For example, you may be trying out a website installation that isn't yet in + For example, you may be trying out a website installation that is not yet in the DNS. Or you have a site using multiple IP addresses for a given host name and you want to address a specific one out of the set. @@ -708,7 +713,7 @@ FAQ 3.20 How to SFTP from my user's home directory? Contrary to how FTP works, SFTP and SCP URLs specify the exact directory to - work with. It means that if you don't specify that you want the user's home + work with. It means that if you do not specify that you want the user's home directory, you get the actual root directory. To specify a file in your user's home directory, you need to use the correct @@ -724,7 +729,7 @@ FAQ When passing on a URL to curl to use, it may respond that the particular protocol is not supported or disabled. The particular way this error message - is phrased is because curl doesn't make a distinction internally of whether + is phrased is because curl does not make a distinction internally of whether a particular protocol is not supported (i.e. never got any code added that knows how to speak that protocol) or if it was explicitly disabled. curl can be built to only support a given set of protocols, and the rest would then @@ -739,11 +744,11 @@ FAQ In normal circumstances, -X should hardly ever be used. By default you use curl without explicitly saying which request method to - use when the URL identifies a HTTP transfer. If you just pass in a URL like + use when the URL identifies an HTTP transfer. If you just pass in a URL like "curl http://example.com" it will use GET. If you use -d or -F curl will use POST, -I will cause a HEAD and -T will make it a PUT. - If for whatever reason you're not happy with these default choices that curl + If for whatever reason you are not happy with these default choices that curl does for you, you can override those request methods by specifying -X [WHATEVER]. This way you can for example send a DELETE by doing "curl -X DELETE [URL]". @@ -754,7 +759,7 @@ FAQ request-body in a GET request with something like "curl -X GET -d data [URL]" - Note that -X doesn't actually change curl's behavior as it only modifies the + Note that -X does not actually change curl's behavior as it only modifies the actual string sent in the request, but that may of course trigger a different set of events. @@ -767,11 +772,11 @@ FAQ 4.2 Why do I get problems when I use & or % in the URL? - In general unix shells, the & symbol is treated specially and when used, it + In general Unix shells, the & symbol is treated specially and when used, it runs the specified command in the background. To safely send the & as a part of a URL, you should quote the entire URL by using single (') or double (") quotes around it. Similar problems can also occur on some shells with other - characters, including ?*!$~(){}<>\|;`. When in doubt, quote the URL. + characters, including ?*!$~(){}<>\|;`. When in doubt, quote the URL. An example that would invoke a remote CGI that uses &-symbols could be: @@ -799,17 +804,17 @@ FAQ curl -g 'www.site.com/weirdname[].html' - 4.4 Why do I get downloaded data even though the web page doesn't exist? + 4.4 Why do I get downloaded data even though the web page does not exist? - curl asks remote servers for the page you specify. If the page doesn't exist + curl asks remote servers for the page you specify. If the page does not exist at the server, the HTTP protocol defines how the server should respond and - that means that headers and a "page" will be returned. That's simply how + that means that headers and a "page" will be returned. That is simply how HTTP works. By using the --fail option you can tell curl explicitly to not get any data - if the HTTP return code doesn't say success. + if the HTTP return code does not say success. - 4.5 Why do I get return code XXX from a HTTP server? + 4.5 Why do I get return code XXX from an HTTP server? RFC2616 clearly explains the return codes. This is a short transcript. Go read the RFC for exact details: @@ -831,7 +836,7 @@ FAQ 4.5.4 "404 Not Found" The server has not found anything matching the Request-URI. No indication - is given of whether the condition is temporary or permanent. + is given as to whether the condition is temporary or permanent. 4.5.5 "405 Method Not Allowed" @@ -858,18 +863,18 @@ FAQ Error codes that are larger than the highest documented error code means that curl has exited due to a crash. This is a serious error, and we appreciate a detailed bug report from you that describes how we could go - ahead and repeat this! + ahead and repeat this. 4.7 How do I keep user names and passwords secret in curl command lines? This problem has two sides: The first part is to avoid having clear-text passwords in the command line - so that they don't appear in 'ps' outputs and similar. That is easily + so that they do not appear in 'ps' outputs and similar. That is easily avoided by using the "-K" option to tell curl to read parameters from a file or stdin to which you can pass the secret info. curl itself will also attempt to "hide" the given password by blanking out the option - this - doesn't work on all platforms. + does not work on all platforms. To keep the passwords in your account secret from the rest of the world is not a task that curl addresses. You could of course encrypt them somehow to @@ -878,31 +883,28 @@ FAQ Also note that regular HTTP (using Basic authentication) and FTP passwords are sent as cleartext across the network. All it takes for anyone to fetch - them is to listen on the network. Eavesdropping is very easy. Use more secure + them is to listen on the network. Eavesdropping is easy. Use more secure authentication methods (like Digest, Negotiate or even NTLM) or consider the SSL-based alternatives HTTPS and FTPS. - 4.8 I found a bug! + 4.8 I found a bug It is not a bug if the behavior is documented. Read the docs first. - Especially check out the KNOWN_BUGS file, it may be a documented bug! + Especially check out the KNOWN_BUGS file, it may be a documented bug. - If it is a problem with a binary you've downloaded or a package for your + If it is a problem with a binary you have downloaded or a package for your particular platform, try contacting the person who built the package/archive you have. If there is a bug, read the BUGS document first. Then report it as described in there. - 4.9 curl can't authenticate to the server that requires NTLM? + 4.9 curl cannot authenticate to a server that requires NTLM? NTLM support requires OpenSSL, GnuTLS, mbedTLS, NSS, Secure Transport, or Microsoft Windows libraries at build-time to provide this functionality. - NTLM is a Microsoft proprietary protocol. Proprietary formats are evil. You - should not use such ones. - - 4.10 My HTTP request using HEAD, PUT or DELETE doesn't work! + 4.10 My HTTP request using HEAD, PUT or DELETE does not work Many web servers allow or demand that the administrator configures the server properly for these requests to work on the web server. @@ -910,7 +912,7 @@ FAQ Some servers seem to support HEAD only on certain kinds of URLs. To fully grasp this, try the documentation for the particular server - software you're trying to interact with. This is not anything curl can do + software you are trying to interact with. This is not anything curl can do anything about. 4.11 Why do my HTTP range requests return the full document? @@ -921,16 +923,16 @@ FAQ 4.12 Why do I get "certificate verify failed" ? When you invoke curl and get an error 60 error back it means that curl - couldn't verify that the server's certificate was good. curl verifies the + could not verify that the server's certificate was good. curl verifies the certificate using the CA cert bundle and verifying for which names the certificate has been granted. To completely disable the certificate verification, use -k. This does however enable man-in-the-middle attacks and makes the transfer INSECURE. - We strongly advice against doing this for more than experiments. + We strongly advise against doing this for more than experiments. If you get this failure with a CA cert bundle installed and used, the - server's certificate might not be signed by one of the CA's in yout CA + server's certificate might not be signed by one of the CA's in your CA store. It might for example be self-signed. You then correct this problem by obtaining a valid CA cert for the server. Or again, decrease the security by disabling this check. @@ -938,7 +940,7 @@ FAQ At times, you find that the verification works in your favorite browser but fails in curl. When this happens, the reason is usually that the server sends an incomplete cert chain. The server is mandated to send all - "intermediate certificates" but doesn't. This typically works with browsers + "intermediate certificates" but does not. This typically works with browsers anyway since they A) cache such certs and B) supports AIA which downloads such missing certificates on demand. This is a server misconfiguration. A good way to figure out if this is the case it to use the SSL Labs server @@ -956,22 +958,22 @@ FAQ times and it is not easily worked around. For more details read this: https://www.codeproject.com/Articles/1144/Beating-the-Daylight-Savings-Time-bug-and-getting - 4.14 Redirects work in browser but not with curl! + 4.14 Redirects work in browser but not with curl curl supports HTTP redirects well (see item 3.8). Browsers generally support at least two other ways to perform redirects that curl does not: - Meta tags. You can write a HTML tag that will cause the browser to redirect + Meta tags. You can write an HTML tag that will cause the browser to redirect to another given URL after a certain time. - Javascript. You can write a Javascript program embedded in a HTML page that + JavaScript. You can write a JavaScript program embedded in an HTML page that redirects the browser to another given URL. There is no way to make curl follow these redirects. You must either manually figure out what the page is set to do, or write a script that parses the results and fetches the new URL. - 4.15 FTPS doesn't work + 4.15 FTPS does not work curl supports FTPS (sometimes known as FTP-SSL) both implicit and explicit mode. @@ -980,21 +982,21 @@ FAQ the control connection and will therefore immediately connect and try to speak SSL. FTPS:// connections default to port 990. - To use explicit FTPS, you use a FTP:// URL and the --ftp-ssl option (or one + To use explicit FTPS, you use an FTP:// URL and the --ftp-ssl option (or one of its related flavors). This is the most common method, and the one mandated by RFC4217. This kind of connection will then of course use the standard FTP port 21 by default. - 4.16 My HTTP POST or PUT requests are slow! + 4.16 My HTTP POST or PUT requests are slow libcurl makes all POST and PUT requests (except for POST requests with a - very tiny request body) use the "Expect: 100-continue" header. This header + tiny request body) use the "Expect: 100-continue" header. This header allows the server to deny the operation early so that libcurl can bail out before having to send any data. This is useful in authentication cases and others. - However, many servers don't implement the Expect: stuff properly and if the - server doesn't respond (positively) within 1 second libcurl will continue + However, many servers do not implement the Expect: stuff properly and if the + server does not respond (positively) within 1 second libcurl will continue and send off the data anyway. You can disable libcurl's use of the Expect: header the same way you disable @@ -1005,7 +1007,7 @@ FAQ In most Windows setups having a timeout longer than 21 seconds make no difference, as it will only send 3 TCP SYN packets and no more. The second packet sent three seconds after the first and the third six seconds after - the second. No more than three packets are sent, no matter how long the + the second. No more than three packets are sent, no matter how long the timeout is set. See option TcpMaxConnectRetransmissions on this page: @@ -1014,7 +1016,7 @@ FAQ Also, even on non-Windows systems there may run a firewall or anti-virus software or similar that accepts the connection but does not actually do anything else. This will make (lib)curl to consider the connection connected - and thus the connect timeout won't trigger. + and thus the connect timeout will not trigger. 4.18 file:// URLs containing drive letters (Windows, NetWare) @@ -1023,7 +1025,7 @@ FAQ file://D:/blah.txt - You'll find that even if D:\blah.txt does exist, curl returns a 'file + you will find that even if D:\blah.txt does exist, curl returns a 'file not found' error. According to RFC 1738 (https://www.ietf.org/rfc/rfc1738.txt), @@ -1031,7 +1033,7 @@ FAQ most implementations. In the above example, 'D:' is treated as the host component, and is taken away. Thus, curl tries to open '/blah.txt'. If your system is installed to drive C:, that will resolve to 'C:\blah.txt', - and if that doesn't exist you will get the not found error. + and if that does not exist you will get the not found error. To fix this problem, use file:// URLs with *three* leading slashes: @@ -1044,41 +1046,41 @@ FAQ In either case, curl should now be looking for the correct file. - 4.19 Why doesn't curl return an error when the network cable is unplugged? + 4.19 Why does not curl return an error when the network cable is unplugged? Unplugging a cable is not an error situation. The TCP/IP protocol stack was designed to be fault tolerant, so even though there may be a physical - break somewhere the connection shouldn't be affected, just possibly - delayed. Eventually, the physical break will be fixed or the data will be + break somewhere the connection should not be affected, just possibly + delayed. Eventually, the physical break will be fixed or the data will be re-routed around the physical problem through another path. In such cases, the TCP/IP stack is responsible for detecting when the network connection is irrevocably lost. Since with some protocols it is perfectly legal for the client to wait indefinitely for data, the stack may never report a problem, and even when it does, it can take up to 20 minutes - for it to detect an issue. The curl option --keepalive-time enables + for it to detect an issue. The curl option --keepalive-time enables keep-alive support in the TCP/IP stack which makes it periodically probe the connection to make sure it is still available to send data. That should reliably detect any TCP/IP network failure. - But even that won't detect the network going down before the TCP/IP + TCP keep alive will not detect the network going down before the TCP/IP connection is established (e.g. during a DNS lookup) or using protocols that - don't use TCP. To handle those situations, curl offers a number of timeouts + do not use TCP. To handle those situations, curl offers a number of timeouts on its own. --speed-limit/--speed-time will abort if the data transfer rate falls too low, and --connect-timeout and --max-time can be used to put an overall timeout on the connection phase or the entire transfer. A libcurl-using application running in a known physical environment (e.g. an embedded device with only a single network connection) may want to act - immediately if its lone network connection goes down. That can be achieved + immediately if its lone network connection goes down. That can be achieved by having the application monitor the network connection on its own using an OS-specific mechanism, then signaling libcurl to abort (see also item 5.13). - 4.20 curl doesn't return error for HTTP non-200 responses! + 4.20 curl does not return error for HTTP non-200 responses Correct. Unless you use -f (--fail). - When doing HTTP transfers, curl will perform exactly what you're asking it + When doing HTTP transfers, curl will perform exactly what you are asking it to do and if successful it will not return an error. You can use curl to test your web server's "file not found" page (that gets 404 back), you can use it to check your authentication protected web pages (that gets a 401 @@ -1087,7 +1089,7 @@ FAQ The specific HTTP response code does not constitute a problem or error for curl. It simply sends and delivers HTTP as you asked and if that worked, everything is fine and dandy. The response code is generally providing more - higher level error information that curl doesn't care about. The error was + higher level error information that curl does not care about. The error was not in the HTTP transfer. If you want your command line to treat error codes in the 400 and up range @@ -1106,7 +1108,7 @@ FAQ We have written the libcurl code specifically adjusted for multi-threaded programs. libcurl will use thread-safe functions instead of non-safe ones if - your system has such. Note that you must never share the same handle in + your system has such. Note that you must never share the same handle in multiple threads. There may be some exceptions to thread safety depending on how libcurl was @@ -1153,7 +1155,7 @@ FAQ libcurl has excellent support for transferring multiple files. You should just repeatedly set new URLs with curl_easy_setopt() and then transfer it with curl_easy_perform(). The handle you get from curl_easy_init() is not - only reusable, but you're even encouraged to reuse it if you can, as that + only reusable, but you are even encouraged to reuse it if you can, as that will enable libcurl to use persistent connections. 5.4 Does libcurl do Winsock initialization on win32 systems? @@ -1183,7 +1185,7 @@ FAQ kept within the multi handle and will be shared among all the easy handles that are used within the same multi handle. - 5.7 Link errors when building libcurl on Windows! + 5.7 Link errors when building libcurl on Windows You need to make sure that your project, and all the libraries (both static and dynamic) that it links against, are compiled/linked against the same run @@ -1195,12 +1197,12 @@ FAQ When building an application that uses the static libcurl library, you must add -DCURL_STATICLIB to your CFLAGS. Otherwise the linker will look for - dynamic import symbols. If you're using Visual Studio, you need to instead + dynamic import symbols. If you are using Visual Studio, you need to instead add CURL_STATICLIB in the "Preprocessor Definitions" section. - If you get linker error like "unknown symbol __imp__curl_easy_init ..." you - have linked against the wrong (static) library. If you want to use the - libcurl.dll and import lib, you don't need any extra CFLAGS, but use one of + If you get a linker error like "unknown symbol __imp__curl_easy_init ..." you + have linked against the wrong (static) library. If you want to use the + libcurl.dll and import lib, you do not need any extra CFLAGS, but use one of the import libraries below. These are the libraries produced by the various lib/Makefile.* files: @@ -1214,31 +1216,31 @@ FAQ 5.8 libcurl.so.X: open failed: No such file or directory This is an error message you might get when you try to run a program linked - with a shared version of libcurl and your run-time linker (ld.so) couldn't + with a shared version of libcurl and your runtime linker (ld.so) could not find the shared library named libcurl.so.X. (Where X is the number of the current libcurl ABI, typically 3 or 4). You need to make sure that ld.so finds libcurl.so.X. You can do that - multiple ways, and it differs somewhat between different operating systems, - but they are usually: + multiple ways, and it differs somewhat between different operating systems. + They are usually: * Add an option to the linker command line that specify the hard-coded path - the run-time linker should check for the lib (usually -R) + the runtime linker should check for the lib (usually -R) * Set an environment variable (LD_LIBRARY_PATH for example) where ld.so should check for libs - * Adjust the system's config to check for libs in the directory where you've - put the dir (like Linux's /etc/ld.so.conf) + * Adjust the system's config to check for libs in the directory where you have + put the library (like Linux's /etc/ld.so.conf) 'man ld.so' and 'man ld' will tell you more details 5.9 How does libcurl resolve host names? - libcurl supports a large a number of different name resolve functions. One - of them is picked at build-time and will be used unconditionally. Thus, if - you want to change name resolver function you must rebuild libcurl and tell - it to use a different function. + libcurl supports a large number of name resolve functions. One of them is + picked at build-time and will be used unconditionally. Thus, if you want to + change name resolver function you must rebuild libcurl and tell it to use a + different function. - The non-IPv6 resolver that can use one of four different host name resolve calls (depending on what your system supports): @@ -1277,7 +1279,7 @@ FAQ No. libcurl operates on a higher level. Besides, faking IP address would imply sending IP packets with a made-up source address, and then you normally get a problem with receiving the packet sent back as they would then not be - routed to you! + routed to you. If you use a proxy to access remote sites, the sites will not see your local IP address but instead the address of the proxy. @@ -1293,17 +1295,17 @@ FAQ one of the callbacks, but none of them are instant. There is no function you can call from another thread or similar that will stop it immediately. Instead, you need to make sure that one of the callbacks you use returns an - appropriate value that will stop the transfer. Suitable callbacks that you + appropriate value that will stop the transfer. Suitable callbacks that you can do this with include the progress callback, the read callback and the write callback. - If you're using the multi interface, you can also stop a transfer by + If you are using the multi interface, you can also stop a transfer by removing the particular easy handle from the multi stack at any moment you think the transfer is done or when you wish to abort the transfer. 5.14 Using C++ non-static functions for callbacks? - libcurl is a C library, it doesn't know anything about C++ member functions. + libcurl is a C library, it does not know anything about C++ member functions. You can overcome this "limitation" with relative ease using a static member function that is passed a pointer to the class: @@ -1327,15 +1329,16 @@ FAQ to list the files. The follow-up question tends to be how is a program supposed to parse the - directory listing. How does it know what's a file and what's a dir and what's - a symlink etc. If the FTP server supports the MLSD command then it will - return data in a machine-readable format that can be parsed for type. The - types are specified by RFC3659 section 7.5.1. If MLSD is not supported then - you have to work with what you're given. The LIST output format is entirely - at the server's own liking and the NLST output doesn't reveal any types and - in many cases doesn't even include all the directory entries. Also, both LIST - and NLST tend to hide unix-style hidden files (those that start with a dot) - by default so you need to do "LIST -a" or similar to see them. + directory listing. How does it know what's a file and what's a directory and + what's a symlink etc. If the FTP server supports the MLSD command then it + will return data in a machine-readable format that can be parsed for type. + The types are specified by RFC3659 section 7.5.1. If MLSD is not supported + then you have to work with what you are given. The LIST output format is + entirely at the server's own liking and the NLST output does not reveal any + types and in many cases does not even include all the directory entries. + Also, both LIST and NLST tend to hide unix-style hidden files (those that + start with a dot) by default so you need to do "LIST -a" or similar to see + them. Example - List only directories. ftp.funet.fi supports MLSD and ftp.kernel.org does not: @@ -1351,11 +1354,11 @@ FAQ libcurl since 7.21.0 also provide the ability to specify a wildcard to download multiple files from one FTP directory. - 5.16 I want a different time-out! + 5.16 I want a different time-out - Time and time again users realize that CURLOPT_TIMEOUT and - CURLOPT_CONNECTIMEOUT are not sufficiently advanced or flexible to cover all - the various use cases and scenarios applications end up with. + Sometimes users realize that CURLOPT_TIMEOUT and CURLOPT_CONNECTIMEOUT are + not sufficiently advanced or flexible to cover all the various use cases and + scenarios applications end up with. libcurl offers many more ways to time-out operations. A common alternative is to use the CURLOPT_LOW_SPEED_LIMIT and CURLOPT_LOW_SPEED_TIME options to @@ -1370,11 +1373,11 @@ FAQ 5.17 Can I write a server with libcurl? No. libcurl offers no functions or building blocks to build any kind of - internet protocol server. libcurl is only a client-side library. For server + Internet protocol server. libcurl is only a client-side library. For server libraries, you need to continue your search elsewhere but there exist many - good open source ones out there for most protocols you could possibly want a - server for. And there are really good stand-alone ones that have been tested - and proven for many years. There's no need for you to reinvent them! + good open source ones out there for most protocols you could want a server + for. There are also really good stand-alone servers that have been tested + and proven for many years. There is no need for you to reinvent them. 5.18 Does libcurl use threads? @@ -1382,20 +1385,20 @@ FAQ callbacks will be called in the same thread as the one you call libcurl in. If you want to avoid your thread to be blocked by the libcurl call, you make - sure you use the non-blocking API which will do transfers asynchronously - - but still in the same single thread. + sure you use the non-blocking multi API which will do transfers + asynchronously - still in the same single thread. libcurl will potentially internally use threads for name resolving, if it - was built to work like that, but in those cases it'll create the child + was built to work like that, but in those cases it will create the child threads by itself and they will only be used and then killed internally by libcurl and never exposed to the outside. 6. License Issues - curl and libcurl are released under a MIT/X derivative license. The license is - very liberal and should not impose a problem for your project. This section - is just a brief summary for the cases we get the most questions. (Parts of - this section was much enhanced by Bjorn Reese.) + curl and libcurl are released under a MIT/X derivative license. The license + is liberal and should not impose a problem for your project. This section is + just a brief summary for the cases we get the most questions. (Parts of this + section was much enhanced by Bjorn Reese.) We are not lawyers and this is not legal advice. You should probably consult one if you want true and accurate legal insights without our prejudice. Note @@ -1405,36 +1408,36 @@ FAQ 6.1 I have a GPL program, can I use the libcurl library? - Yes! + Yes - Since libcurl may be distributed under the MIT/X derivative license, it can be - used together with GPL in any software. + Since libcurl may be distributed under the MIT/X derivative license, it can + be used together with GPL in any software. 6.2 I have a closed-source program, can I use the libcurl library? - Yes! + Yes libcurl does not put any restrictions on the program that uses the library. 6.3 I have a BSD licensed program, can I use the libcurl library? - Yes! + Yes libcurl does not put any restrictions on the program that uses the library. 6.4 I have a program that uses LGPL libraries, can I use libcurl? - Yes! + Yes - The LGPL license doesn't clash with other licenses. + The LGPL license does not clash with other licenses. 6.5 Can I modify curl/libcurl for my program and keep the changes secret? - Yes! + Yes - The MIT/X derivative license practically allows you to do almost anything with - the sources, on the condition that the copyright texts in the sources are - left intact. + The MIT/X derivative license practically allows you to do almost anything + with the sources, on the condition that the copyright texts in the sources + are left intact. 6.6 Can you please change the curl/libcurl license to XXXX? @@ -1507,18 +1510,18 @@ FAQ 8.1 Why does curl use C89? - As with everything in curl, there's a history and we keep using what we've + As with everything in curl, there is a history and we keep using what we have used before until someone brings up the subject and argues for and works on changing it. We started out using C89 in the 1990s because that was the only way to write a truly portable C program and have it run as widely as possible. C89 was for a long time even necessary to make things work on otherwise considered modern - platforms such as Windows. Today, we don't really know how many users that + platforms such as Windows. Today, we do not really know how many users that still require the use of a C89 compiler. We will continue to use C89 for as long as nobody brings up a strong enough - reason for us to change our minds. The core developers of the project don't + reason for us to change our minds. The core developers of the project do not feel restricted by this and we are not convinced that going C99 will offer us enough of a benefit to warrant the risk of cutting off a share of users. @@ -1537,5 +1540,5 @@ FAQ stable, we will never risk anything by rewriting a lot of things in one go. That said, we can certainly offer more and more optional backends written in other languages, as long as those backends can be plugged in at build-time. - Back-ends can be written in any language, but should probably provide APIs + Backends can be written in any language, but should probably provide APIs usable from C to ease integration and transition. diff --git a/trunk/libs/libcurl/curl-7.x/docs/FEATURES.md b/trunk/libs/libcurl/curl-7.x/docs/FEATURES.md index 38e2ac3e..7451ee63 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/FEATURES.md +++ b/trunk/libs/libcurl/curl-7.x/docs/FEATURES.md @@ -22,7 +22,7 @@ - "standard" proxy environment variables support - compiles on win32 (reported builds on 70+ operating systems) - selectable network interface for outgoing traffic - - IPv6 support on unix and Windows + - IPv6 support on Unix and Windows - happy eyeballs dual-stack connects - persistent connections - SOCKS 4 + 5 support, with or without local name resolving @@ -31,7 +31,7 @@ - replaceable memory functions (malloc, free, realloc, etc) - asynchronous name resolving (6) - both a push and a pull style interface - - international domain names (11) + - international domain names (10) ## HTTP @@ -51,7 +51,7 @@ - maximum amount of redirects to follow - custom HTTP request - cookie get/send fully parsed - - reads/writes the netscape cookie file format + - reads/writes the Netscape cookie file format - custom headers (replace/remove internally generated headers) - custom user-agent string - custom referrer string @@ -62,7 +62,7 @@ - retrieve file modification date - Content-Encoding support for deflate and gzip - "Transfer-Encoding: chunked" support in uploads - - automatic data compression (12) + - automatic data compression (11) ## HTTPS (1) @@ -78,7 +78,7 @@ - download - authentication - - Kerberos 5 (13) + - Kerberos 5 (12) - active/passive using PORT, EPRT, PASV or EPSV - single file size information (compare to HTTP HEAD) - 'type=' URL support @@ -147,7 +147,7 @@ - authentication: Plain, Login, CRAM-MD5, Digest-MD5, NTLM (9), Kerberos 5 (4) and External. - - send e-mails + - send emails - mail from support - mail size support - mail auth support for trusted server-to-server relaying @@ -165,8 +165,8 @@ - authentication: Clear Text, APOP and SASL - SASL based authentication: Plain, Login, CRAM-MD5, Digest-MD5, NTLM (9), Kerberos 5 (4) and External. - - list e-mails - - retrieve e-mails + - list emails + - retrieve emails - enhanced command support for: CAPA, DELE, TOP, STAT, UIDL and NOOP via custom requests - via http-proxy @@ -184,8 +184,8 @@ Kerberos 5 (4) and External. - list the folders of a mailbox - select a mailbox with support for verifying the UIDVALIDITY - - fetch e-mails with support for specifying the UID and SECTION - - upload e-mails via the append command + - fetch emails with support for specifying the UID and SECTION + - upload emails via the append command - enhanced command support for: EXAMINE, CREATE, DELETE, RENAME, STATUS, STORE, COPY and UID via custom requests - via http-proxy @@ -198,7 +198,7 @@ ## MQTT - - Subscribe to and publish topics using url scheme `mqtt://broker/topic` + - Subscribe to and publish topics using URL scheme `mqtt://broker/topic` ## Footnotes @@ -212,9 +212,8 @@ 6. requires c-ares 7. requires libssh2, libssh or wolfSSH 8. requires libssh2 or libssh - 9. requires OpenSSL, GnuTLS, mbedTLS, NSS, yassl, Secure Transport or SSPI + 9. requires OpenSSL, GnuTLS, mbedTLS, NSS, Secure Transport or SSPI (native Windows) - 10. - - 11. requires libidn2 or Windows - 12. requires libz, brotli and/or zstd - 13. requires a GSS-API implementation (such as Heimdal or MIT Kerberos) + 10. requires libidn2 or Windows + 11. requires libz, brotli and/or zstd + 12. requires a GSS-API implementation (such as Heimdal or MIT Kerberos) diff --git a/trunk/libs/libcurl/curl-7.x/docs/GOVERNANCE.md b/trunk/libs/libcurl/curl-7.x/docs/GOVERNANCE.md index dfc2071d..0d6c5b2d 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/GOVERNANCE.md +++ b/trunk/libs/libcurl/curl-7.x/docs/GOVERNANCE.md @@ -8,7 +8,7 @@ This project was started by and has to some extent been pushed forward over the years with Daniel Stenberg as the driving force. It matches a standard BDFL (Benevolent Dictator For Life) style project. -This setup has been used due to convenience and the fact that is has worked +This setup has been used due to convenience and the fact that it has worked fine this far. It is not because someone thinks of it as a superior project leadership model. It will also only continue working as long as Daniel manages to listen in to what the project and the general user population wants and @@ -45,7 +45,7 @@ non-profit organization that holds on to funds for us. This fund is then used for paying the curl security bug bounties, to reimburse project related expenses etc. -Donations to the project can also come in form of server hosting, providing +Donations to the project can also come in the form of server hosting, providing services and paying for people to work on curl related code etc. Usually, such donations are services paid for directly by the sponsors. @@ -98,7 +98,7 @@ on maintaining curl is considered a hero, for all time hereafter. ## Security team members -We have a security team. That's the team of people who are subscribed to the +We have a security team. That is the team of people who are subscribed to the curl-security mailing list; the receivers of security reports from users and developers. This list of people will vary over time but should be skilled developers familiar with the curl project. @@ -123,7 +123,7 @@ primary curl contact with Fastly. ## BDFL -That's Daniel. +That is Daniel. # Maintainers @@ -152,14 +152,14 @@ within the area of personal expertise and experience. ### Merge advice -When you're merging patches/PRs... +When you are merging patches/PRs... - make sure the commit messages follow our template -- squash patch sets into a few logical commits even if the PR didn't, if +- squash patch sets into a few logical commits even if the PR did not, if necessary - avoid the "merge" button on GitHub, do it "manually" instead to get full control and full audit trail (github leaves out you as "Committer:") -- remember to credit the reporter and the helpers! +- remember to credit the reporter and the helpers. ## Who are maintainers? diff --git a/trunk/libs/libcurl/curl-7.x/docs/HELP-US.md b/trunk/libs/libcurl/curl-7.x/docs/HELP-US.md index 25784519..eabf8081 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/HELP-US.md +++ b/trunk/libs/libcurl/curl-7.x/docs/HELP-US.md @@ -18,17 +18,17 @@ down and report the bug. Or make your first pull request with a fix for that. ## Smaller tasks Some projects mark small issues as "beginner friendly", "bite-sized" or -similar. We don't do that in curl since such issues never linger around long -enough. Simple issues get handled very fast. +similar. We do not do that in curl since such issues never linger around long +enough. Simple issues get handled fast. -If you're looking for a smaller or simpler task in the project to help out +If you are looking for a smaller or simpler task in the project to help out with as an entry-point into the project, perhaps because you are a newcomer or even maybe not a terribly experienced developer, here's our advice: - Read through this document to get a grasp on a general approach to use - Consider adding a test case for something not currently tested (correctly) - Consider updating or adding documentation - - One way to get your feet wet gently in the project, is to participate in an + - One way to get started gently in the project, is to participate in an existing issue/PR and help out by reproducing the issue, review the code in the PR etc. @@ -43,7 +43,7 @@ one that piques your interest. ## Work on known bugs -Some bugs are known and haven't yet received attention and work enough to get +Some bugs are known and have not yet received attention and work enough to get fixed. We collect such known existing flaws in the [KNOWN_BUGS](https://curl.se/docs/knownbugs.html) page. Many of them link to the original bug report with some additional details, but some may also @@ -56,7 +56,7 @@ On the [autobuilds page](https://curl.se/dev/builds.html) we show a collection of test results from the automatic curl build and tests that are performed by volunteers. Fixing compiler warnings and errors shown there is something we value greatly. Also, if you own or run systems or architectures -that aren't already tested in the autobuilds, we also appreciate more +that are not already tested in the autobuilds, we also appreciate more volunteers running builds automatically to help us keep curl portable. ## TODO items @@ -64,7 +64,7 @@ volunteers running builds automatically to help us keep curl portable. Ideas for features and functions that we have considered worthwhile to implement and provide are kept in the [TODO](https://curl.se/docs/todo.html) file. Some of the ideas are -rough. Some are well thought out. Some probably aren't really suitable +rough. Some are well thought out. Some probably are not really suitable anymore. Before you invest a lot of time on a TODO item, do bring it up for discussion @@ -83,5 +83,5 @@ the specific implementation. Either way is fine. We offer [guidelines](https://curl.se/dev/contribute.html) that are suitable to be familiar with before you decide to contribute to curl. If -you're used to open source development, you'll probably not find many -surprises in there. +you are used to open source development, you will probably not find many +surprises there. diff --git a/trunk/libs/libcurl/curl-7.x/docs/HISTORY.md b/trunk/libs/libcurl/curl-7.x/docs/HISTORY.md index 373741c5..6268b87e 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/HISTORY.md +++ b/trunk/libs/libcurl/curl-7.x/docs/HISTORY.md @@ -26,7 +26,7 @@ command line. HttpGet 1.0 was released on April 8th 1997 with brand new HTTP proxy support. -We soon found and fixed support for getting currencies over GOPHER. Once FTP +We soon found and fixed support for getting currencies over GOPHER. Once FTP download support was added, the name of the project was changed and urlget 2.0 was released in August 1997. The http-only days were already passed. @@ -60,7 +60,7 @@ SSL support was added, powered by the SSLeay library. August: first announcement of curl on freshmeat.net. October: with the curl 4.9 release and the introduction of cookie support, -curl was no longer released under the GPL license. Now we're at 4000 lines of +curl was no longer released under the GPL license. Now we are at 4000 lines of code, we switched over to the MPL license to restrict the effects of "copyleft". @@ -145,7 +145,7 @@ June: the curl website gets 13000 visits weekly. curl and libcurl is 35000 lines of code. Reported successful compiles on more than 40 combinations of CPUs and operating systems. -To estimate number of users of the curl tool or libcurl library is next to +To estimate the number of users of the curl tool or libcurl library is next to impossible. Around 5000 downloaded packages each week from the main site gives a hint, but the packages are mirrored extensively, bundled with numerous OS distributions and otherwise retrieved as part of other software. @@ -406,9 +406,27 @@ April: added the cyassl backend (later renamed to WolfSSL) November: the website moves to curl.se. The website serves 10TB data monthly. + December: alt-svc support + 2021 ---- - February 3: curl 7.75.0 ships with support for Hyper is a HTTP backend + February 3: curl 7.75.0 ships with support for Hyper as an HTTP backend March 31: curl 7.76.0 ships with support for rustls + + July: HSTS is supported + +2022 +---- + + March: added --json, removed mesalink support + + Public curl releases: 206 + Command line options: 245 + curl_easy_setopt() options: 295 + Public functions in libcurl: 86 + Contributors: 2601 + + The curl.se website serves 16,500 GB/month over 462M requests, the + official docker image has been pulled 4,098,015,431 times. diff --git a/trunk/libs/libcurl/curl-7.x/docs/HSTS.md b/trunk/libs/libcurl/curl-7.x/docs/HSTS.md index f63cfe32..cecdc75c 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/HSTS.md +++ b/trunk/libs/libcurl/curl-7.x/docs/HSTS.md @@ -5,7 +5,7 @@ HTTP Strict-Transport-Security. Added as experimental in curl ## Standard -[HTTP Strict Transport Security](https://tools.ietf.org/html/rfc6797) +[HTTP Strict Transport Security](https://datatracker.ietf.org/doc/html/rfc6797) ## Behavior diff --git a/trunk/libs/libcurl/curl-7.x/docs/HTTP-COOKIES.md b/trunk/libs/libcurl/curl-7.x/docs/HTTP-COOKIES.md index 9d1e099d..73fa242b 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/HTTP-COOKIES.md +++ b/trunk/libs/libcurl/curl-7.x/docs/HTTP-COOKIES.md @@ -2,30 +2,30 @@ ## Cookie overview - Cookies are `name=contents` pairs that a HTTP server tells the client to + Cookies are `name=contents` pairs that an HTTP server tells the client to hold and then the client sends back those to the server on subsequent requests to the same domains and paths for which the cookies were set. Cookies are either "session cookies" which typically are forgotten when the session is over which is often translated to equal when browser quits, or - the cookies aren't session cookies they have expiration dates after which + the cookies are not session cookies they have expiration dates after which the client will throw them away. Cookies are set to the client with the Set-Cookie: header and are sent to servers with the Cookie: header. - For a very long time, the only spec explaining how to use cookies was the + For a long time, the only spec explaining how to use cookies was the original [Netscape spec from 1994](https://curl.se/rfc/cookie_spec.html). In 2011, [RFC6265](https://www.ietf.org/rfc/rfc6265.txt) was finally published and details how cookies work within HTTP. In 2016, an update which added support for prefixes was - [proposed](https://tools.ietf.org/html/draft-ietf-httpbis-cookie-prefixes-00), + [proposed](https://datatracker.ietf.org/doc/html/draft-ietf-httpbis-cookie-prefixes-00), and in 2017, another update was - [drafted](https://tools.ietf.org/html/draft-ietf-httpbis-cookie-alone-01) + [drafted](https://datatracker.ietf.org/doc/html/draft-ietf-httpbis-cookie-alone-01) to deprecate modification of 'secure' cookies from non-secure origins. Both of these drafts have been incorporated into a proposal to - [replace](https://tools.ietf.org/html/draft-ietf-httpbis-rfc6265bis-02) + [replace](https://datatracker.ietf.org/doc/html/draft-ietf-httpbis-rfc6265bis-02) RFC6265. Cookie prefixes and secure cookie modification protection has been implemented by curl. @@ -36,7 +36,7 @@ sharing the cookies with browsers, only to see browsers move away from that format. Modern browsers no longer use it, while curl still does. - The netscape cookie file format stores one cookie per physical line in the + The Netscape cookie file format stores one cookie per physical line in the file with a bunch of associated meta data, each field separated with TAB. That file is called the cookiejar in curl terminology. @@ -48,7 +48,7 @@ The cookie file format is text based and stores one cookie per line. Lines that start with `#` are treated as comments. - Each line that each specifies a single cookie consists of seven text fields + Each line that specifies a single cookie consists of seven text fields separated with TAB characters. A valid line must end with a newline character. @@ -74,7 +74,7 @@ `-b, --cookie` tell curl a file to read cookies from and start the cookie engine, or if it - isn't a file it will pass on the given string. -b name=var works and so does + is not a file it will pass on the given string. -b name=var works and so does -b cookiefile. `-j, --junk-session-cookies` @@ -111,23 +111,28 @@ `CURLOPT_COOKIELIST` Provide detailed information about a single cookie to add to the internal - storage of cookies. Pass in the cookie as a HTTP header with all the details - set, or pass in a line from a netscape cookie file. This option can also be - used to flush the cookies etc. + storage of cookies. Pass in the cookie as an HTTP header with all the + details set, or pass in a line from a Netscape cookie file. This option can + also be used to flush the cookies etc. + + `CURLOPT_COOKIESESSION` + + Tell libcurl to ignore all cookies it is about to load that are session + cookies. `CURLINFO_COOKIELIST` Extract cookie information from the internal cookie storage as a linked list. -## Cookies with javascript +## Cookies with JavaScript - These days a lot of the web is built up by javascript. The webbrowser loads - complete programs that render the page you see. These javascript programs + These days a lot of the web is built up by JavaScript. The webbrowser loads + complete programs that render the page you see. These JavaScript programs can also set and access cookies. Since curl and libcurl are plain HTTP clients without any knowledge of or - capability to handle javascript, such cookies will not be detected or used. + capability to handle JavaScript, such cookies will not be detected or used. Often, if you want to mimic what a browser does on such websites, you can record web browser HTTP traffic when using such a site and then repeat the diff --git a/trunk/libs/libcurl/curl-7.x/docs/HTTP2.md b/trunk/libs/libcurl/curl-7.x/docs/HTTP2.md index d4430676..35b45ed2 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/HTTP2.md +++ b/trunk/libs/libcurl/curl-7.x/docs/HTTP2.md @@ -77,8 +77,8 @@ To take advantage of multiplexing, you need to use the multi interface and set attempt to re-use existing HTTP/2 connections and just add a new stream over that when doing subsequent parallel requests. -While libcurl sets up a connection to a HTTP server there is a period during -which it doesn't know if it can pipeline or do multiplexing and if you add new +While libcurl sets up a connection to an HTTP server there is a period during +which it does not know if it can pipeline or do multiplexing and if you add new transfers in that period, libcurl will default to start new connections for those transfers. With the new option `CURLOPT_PIPEWAIT` (added in 7.43.0), you can ask that a transfer should rather wait and see in case there's a @@ -105,7 +105,7 @@ Since 7.47.0, the curl tool enables HTTP/2 by default for HTTPS connections. curl tool limitations --------------------- -The command line tool doesn't support HTTP/2 server push. It supports +The command line tool does not support HTTP/2 server push. It supports multiplexing when the parallel transfer option is used. HTTP Alternative Services @@ -114,8 +114,8 @@ HTTP Alternative Services Alt-Svc is an extension with a corresponding frame (ALTSVC) in HTTP/2 that tells the client about an alternative "route" to the same content for the same origin server that you get the response from. A browser or long-living client -can use that hint to create a new connection asynchronously. For libcurl, we +can use that hint to create a new connection asynchronously. For libcurl, we may introduce a way to bring such clues to the application and/or let a subsequent request use the alternate route automatically. -[Detailed in RFC 7838](https://tools.ietf.org/html/rfc7838) +[Detailed in RFC 7838](https://datatracker.ietf.org/doc/html/rfc7838) diff --git a/trunk/libs/libcurl/curl-7.x/docs/HTTP3.md b/trunk/libs/libcurl/curl-7.x/docs/HTTP3.md index 2f377fd3..bf2c5e1d 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/HTTP3.md +++ b/trunk/libs/libcurl/curl-7.x/docs/HTTP3.md @@ -2,30 +2,28 @@ ## Resources -[HTTP/3 Explained](https://daniel.haxx.se/http3-explained/) - the online free +[HTTP/3 Explained](https://http3-explained.haxx.se/en/) - the online free book describing the protocols involved. -[QUIC implementation](https://github.com/curl/curl/wiki/QUIC-implementation) - -the wiki page describing the plan for how to support QUIC and HTTP/3 in curl -and libcurl. - [quicwg.org](https://quicwg.org/) - home of the official protocol drafts ## QUIC libraries -QUIC libraries we're experimenting with: +QUIC libraries we are experimenting with: [ngtcp2](https://github.com/ngtcp2/ngtcp2) [quiche](https://github.com/cloudflare/quiche) -## Experimental! +[msquic](https://github.com/microsoft/msquic) & [msh3](https://github.com/nibanks/msh3) + +## Experimental HTTP/3 and QUIC support in curl is considered **EXPERIMENTAL** until further notice. It needs to be enabled at build-time. Further development and tweaking of the HTTP/3 support in curl will happen in -in the master branch using pull-requests, just like ordinary changes. +the master branch using pull-requests, just like ordinary changes. # ngtcp2 version @@ -33,18 +31,18 @@ in the master branch using pull-requests, just like ordinary changes. Build (patched) OpenSSL - % git clone --depth 1 -b OpenSSL_1_1_1k+quic https://github.com/quictls/openssl + % git clone --depth 1 -b openssl-3.0.0+quic https://github.com/quictls/openssl % cd openssl % ./config enable-tls1_3 --prefix= % make - % make install_sw + % make install Build nghttp3 % cd .. % git clone https://github.com/ngtcp2/nghttp3 % cd nghttp3 - % autoreconf -i + % autoreconf -fi % ./configure --prefix= --enable-lib-only % make % make install @@ -54,7 +52,7 @@ Build ngtcp2 % cd .. % git clone https://github.com/ngtcp2/ngtcp2 % cd ngtcp2 - % autoreconf -i + % autoreconf -fi % ./configure PKG_CONFIG_PATH=/lib/pkgconfig:/lib/pkgconfig LDFLAGS="-Wl,-rpath,/lib" --prefix= --enable-lib-only % make % make install @@ -64,9 +62,12 @@ Build curl % cd .. % git clone https://github.com/curl/curl % cd curl - % ./buildconf + % autoreconf -fi % LDFLAGS="-Wl,-rpath,/lib" ./configure --with-openssl= --with-nghttp3= --with-ngtcp2= % make + % make install + +For OpenSSL 3.0.0 or later builds on Linux for x86_64 architecture, substitute all occurrences of "/lib" with "/lib64" ## Build with GnuTLS @@ -75,7 +76,7 @@ Build GnuTLS % git clone --depth 1 https://gitlab.com/gnutls/gnutls.git % cd gnutls % ./bootstrap - % ./configure --disable-doc --prefix= + % ./configure --prefix= % make % make install @@ -84,7 +85,7 @@ Build nghttp3 % cd .. % git clone https://github.com/ngtcp2/nghttp3 % cd nghttp3 - % autoreconf -i + % autoreconf -fi % ./configure --prefix= --enable-lib-only % make % make install @@ -94,7 +95,7 @@ Build ngtcp2 % cd .. % git clone https://github.com/ngtcp2/ngtcp2 % cd ngtcp2 - % autoreconf -i + % autoreconf -fi % ./configure PKG_CONFIG_PATH=/lib/pkgconfig:/lib/pkgconfig LDFLAGS="-Wl,-rpath,/lib" --prefix= --enable-lib-only --with-gnutls % make % make install @@ -104,9 +105,51 @@ Build curl % cd .. % git clone https://github.com/curl/curl % cd curl - % ./buildconf + % autoreconf -fi % ./configure --without-openssl --with-gnutls= --with-nghttp3= --with-ngtcp2= % make + % make install + +## Build with wolfSSL + +Build wolfSSL + + % git clone https://github.com/wolfSSL/wolfssl.git + % cd wolfssl + % autoreconf -fi + % ./configure --prefix= --enable-quic --enable-session-ticket --enable-earlydata --enable-psk --enable-harden --enable-altcertchains + % make + % make install + +Build nghttp3 + + % cd .. + % git clone https://github.com/ngtcp2/nghttp3 + % cd nghttp3 + % autoreconf -fi + % ./configure --prefix= --enable-lib-only + % make + % make install + +Build ngtcp2 (once https://github.com/ngtcp2/ngtcp2/pull/505 is merged) + + % cd .. + % git clone https://github.com/ngtcp2/ngtcp2 + % cd ngtcp2 + % autoreconf -fi + % ./configure PKG_CONFIG_PATH=/lib/pkgconfig:/lib/pkgconfig LDFLAGS="-Wl,-rpath,/lib" --prefix= --enable-lib-only --with-wolfssl + % make + % make install + +Build curl + + % cd .. + % git clone https://github.com/curl/curl + % cd curl + % autoreconf -fi + % ./configure --without-openssl --with-wolfssl= --with-nghttp3= --with-ngtcp2= + % make + % make install # quiche version @@ -116,20 +159,77 @@ Build quiche and BoringSSL: % git clone --recursive https://github.com/cloudflare/quiche % cd quiche - % cargo build --release --features ffi,pkg-config-meta,qlog - % mkdir deps/boringssl/src/lib - % ln -vnf $(find target/release -name libcrypto.a -o -name libssl.a) deps/boringssl/src/lib/ + % cargo build --package quiche --release --features ffi,pkg-config-meta,qlog + % mkdir quiche/deps/boringssl/src/lib + % ln -vnf $(find target/release -name libcrypto.a -o -name libssl.a) quiche/deps/boringssl/src/lib/ Build curl: % cd .. % git clone https://github.com/curl/curl % cd curl - % ./buildconf - % ./configure LDFLAGS="-Wl,-rpath,$PWD/../quiche/target/release" --with-openssl=$PWD/../quiche/deps/boringssl/src --with-quiche=$PWD/../quiche/target/release + % autoreconf -fi + % ./configure LDFLAGS="-Wl,-rpath,$PWD/../quiche/target/release" --with-openssl=$PWD/../quiche/quiche/deps/boringssl/src --with-quiche=$PWD/../quiche/target/release % make + % make install -## Run + If `make install` results in `Permission denied` error, you will need to prepend it with `sudo`. + +# msh3 (msquic) version + +## Build Linux (with quictls fork of OpenSSL) + +Build msh3: + + % git clone -b v0.4.0 --depth 1 --recursive https://github.com/nibanks/msh3 + % cd msh3 && mkdir build && cd build + % cmake -G 'Unix Makefiles' -DCMAKE_BUILD_TYPE=RelWithDebInfo .. + % cmake --build . + % cmake --install . + +Build curl: + + % git clone https://github.com/curl/curl + % cd curl + % autoreconf -fi + % ./configure LDFLAGS="-Wl,-rpath,/usr/local/lib" --with-msh3=/usr/local --with-openssl + % make + % make install + +Run from `/usr/local/bin/curl`. + +## Build Windows + +Build msh3: + + % git clone -b v0.4.0 --depth 1 --recursive https://github.com/nibanks/msh3 + % cd msh3 && mkdir build && cd build + % cmake -G 'Visual Studio 17 2022' -DCMAKE_BUILD_TYPE=RelWithDebInfo .. + % cmake --build . --config Release + % cmake --install . --config Release + +**Note** - On Windows, Schannel will be used for TLS support by default. If +you with to use (the quictls fork of) OpenSSL, specify the `-DQUIC_TLS=openssl` +option to the generate command above. Also note that OpenSSL brings with it an +additional set of build dependencies not specified here. + +Build curl (in [Visual Studio Command prompt](../winbuild/README.md#open-a-command-prompt)): + + % git clone https://github.com/curl/curl + % cd curl/winbuild + % nmake /f Makefile.vc mode=dll WITH_MSH3=dll MSH3_PATH="C:/Program Files/msh3" MACHINE=x64 + +**Note** - If you encounter a build error with `tool_hugehelp.c` being missing, +rename `tool_hugehelp.c.cvs` in the same directory to `tool_hugehelp.c` and +then run `nmake` again. + +Run in the `C:/Program Files/msh3/lib` directory, copy `curl.exe` to that +directory, or copy `msquic.dll` and `msh3.dll` from that directory to the +`curl.exe` directory. For example: + + % C:\Program Files\msh3\lib> F:\curl\builds\libcurl-vc-x64-release-dll-ipv6-sspi-schannel-msh3\bin\curl.exe --http3 https://www.google.com + +# `--http3` Use HTTP/3 directly: @@ -140,3 +240,77 @@ Upgrade via Alt-Svc: curl --alt-svc altsvc.cache https://quic.aiortc.org/ See this [list of public HTTP/3 servers](https://bagder.github.io/HTTP3-test/) + +## Known Bugs + +Check out the [list of known HTTP3 bugs](https://curl.se/docs/knownbugs.html#HTTP3). + +# HTTP/3 Test server + +This is not advice on how to run anything in production. This is for +development and experimenting. + +## Prerequisite(s) + +An existing local HTTP/1.1 server that hosts files. Preferably also a few huge +ones. You can easily create huge local files like `truncate -s=8G 8GB` - they +are huge but do not occupy that much space on disk since they are just big +holes. + +In my Debian setup I just installed **apache2**. It runs on port 80 and has a +document root in `/var/www/html`. I can get the 8GB file from it with `curl +localhost/8GB -o dev/null` + +In this description we setup and run an HTTP/3 reverse-proxy in front of the +HTTP/1 server. + +## Setup + +You can select either or both of these server solutions. + +### nghttpx + +Get, build and install **quictls**, **nghttp3** and **ngtcp2** as described +above. + +Get, build and install **nghttp2**: + + git clone https://github.com/nghttp2/nghttp2.git + cd nghttp2 + autoreconf -fi + PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/home/daniel/build-quictls/lib/pkgconfig:/home/daniel/build-nghttp3/lib/pkgconfig:/home/daniel/build-ngtcp2/lib/pkgconfig LDFLAGS=-L/home/daniel/build-quictls/lib CFLAGS=-I/home/daniel/build-quictls/include ./configure --enable-maintainer-mode --prefix=/home/daniel/build-nghttp2 --disable-shared --enable-app --enable-http3 --without-jemalloc --without-libxml2 --without-systemd + make && make install + +Run the local h3 server on port 9443, make it proxy all traffic through to +HTTP/1 on localhost port 80. For local toying, we can just use the test cert +that exists in curl's test dir. + + CERT=$CURLSRC/tests/stunnel.pem + $HOME/bin/nghttpx $CERT $CERT --backend=localhost,80 \ + --frontend="localhost,9443;quic" + +### Caddy + +[Install caddy](https://caddyserver.com/docs/install), you can even put the +single binary in a separate directory if you prefer. + +In the same directory you put caddy, create a `Caddyfile` with the following +content to run an HTTP/3 reverse-proxy on port 7443: +~~~ +{ + auto_https disable_redirects + servers :7443 { + protocol { + experimental_http3 + } + } +} + +localhost:7443 { + reverse_proxy localhost:80 +} +~~~ + +Then run caddy: + + ./caddy start diff --git a/trunk/libs/libcurl/curl-7.x/docs/HYPER.md b/trunk/libs/libcurl/curl-7.x/docs/HYPER.md index da6c6633..ad23a903 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/HYPER.md +++ b/trunk/libs/libcurl/curl-7.x/docs/HYPER.md @@ -18,17 +18,22 @@ The C API for Hyper is brand new and is still under development. ## build curl with hyper -Build hyper and enable the C API: +Since March 3 2022, hyper needs the nightly rustc to build, which you may need +to install first with: + + % rustup toolchain install nightly + +Then build hyper and enable its C API like this: % git clone https://github.com/hyperium/hyper % cd hyper - % RUSTFLAGS="--cfg hyper_unstable_ffi" cargo build --features client,http1,http2,ffi + % RUSTFLAGS="--cfg hyper_unstable_ffi" cargo +nightly rustc --features client,http1,http2,ffi -Z unstable-options --crate-type cdylib Build curl to use hyper's C API: % git clone https://github.com/curl/curl % cd curl - % ./buildconf + % autoreconf -fi % ./configure --with-hyper= % make @@ -46,10 +51,14 @@ over the wire with Hyper. ## Limitations -The hyper backend doesn't support +The hyper backend does not support - `CURLOPT_IGNORE_CONTENT_LENGTH` +- `--raw` and disabling `CURLOPT_HTTP_TRANSFER_DECODING` - RTSP +- hyper is much stricter about what HTTP header contents it allows +- HTTP/0.9 +- HTTP/2 upgrade using HTTP:// URLs. Aka 'h2c' ## Remaining issues @@ -59,11 +68,6 @@ still need attention and verification include: - multiplexed HTTP/2 - h2 Upgrade: - pausing transfers -- co-exist with a HTTP/3 build - receiving HTTP/1 trailers - sending HTTP/1 trailers -- accept-encoding -- transfer encoding -- alt-svc -- hsts -- DoH ([#6389](https://github.com/curl/curl/issues/6389)) + diff --git a/trunk/libs/libcurl/curl-7.x/docs/INSTALL.cmake b/trunk/libs/libcurl/curl-7.x/docs/INSTALL.cmake index 828d9b9c..3f905d79 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/INSTALL.cmake +++ b/trunk/libs/libcurl/curl-7.x/docs/INSTALL.cmake @@ -26,14 +26,14 @@ Current flaws in the curl CMake build - Builds libcurl without large file support - Does not support all SSL libraries (only OpenSSL, Schannel, Secure Transport, and mbed TLS, NSS, WolfSSL) - - Doesn't allow different resolver backends (no c-ares build support) + - Does not allow different resolver backends (no c-ares build support) - No RTMP support built - - Doesn't allow build curl and libcurl debug enabled - - Doesn't allow a custom CA bundle path - - Doesn't allow you to disable specific protocols from the build - - Doesn't find or use krb4 or GSS - - Rebuilds test files too eagerly, but still can't run the tests - - Doesn't detect the correct strerror_r flavor when cross-compiling (issue #1123) + - Does not allow build curl and libcurl debug enabled + - Does not allow a custom CA bundle path + - Does not allow you to disable specific protocols from the build + - Does not find or use krb4 or GSS + - Rebuilds test files too eagerly, but still cannot run the tests + - Does not detect the correct strerror_r flavor when cross-compiling (issue #1123) Command Line CMake diff --git a/trunk/libs/libcurl/curl-7.x/docs/INSTALL.md b/trunk/libs/libcurl/curl-7.x/docs/INSTALL.md index 84fe8291..03d73843 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/INSTALL.md +++ b/trunk/libs/libcurl/curl-7.x/docs/INSTALL.md @@ -27,7 +27,7 @@ proceed. # Unix -A normal Unix installation is made in three or four steps (after you've +A normal Unix installation is made in three or four steps (after you have unpacked the source archive): ./configure --with-openssl [--with-gnutls --with-wolfssl] @@ -58,7 +58,7 @@ your own home directory: The configure script always tries to find a working SSL library unless explicitly told not to. If you have OpenSSL installed in the default search -path for your compiler/linker, you don't need to do anything special. If you +path for your compiler/linker, you do not need to do anything special. If you have OpenSSL installed in `/usr/local/ssl`, you can run configure like: ./configure --with-openssl @@ -79,14 +79,14 @@ have OpenSSL installed in your system, you can run configure like this: If you have OpenSSL installed, but with the libraries in one place and the header files somewhere else, you have to set the `LDFLAGS` and `CPPFLAGS` -environment variables prior to running configure. Something like this should +environment variables prior to running configure. Something like this should work: CPPFLAGS="-I/path/to/ssl/include" LDFLAGS="-L/path/to/ssl/lib" ./configure -If you have shared SSL libs installed in a directory where your run-time -linker doesn't find them (which usually causes configure failures), you can -provide this option to gcc to set a hard-coded path to the run-time linker: +If you have shared SSL libs installed in a directory where your runtime +linker does not find them (which usually causes configure failures), you can +provide this option to gcc to set a hard-coded path to the runtime linker: LDFLAGS=-Wl,-R/usr/local/ssl/lib ./configure --with-openssl @@ -102,7 +102,7 @@ an option like: ./configure --disable-thread -If you're a curl developer and use gcc, you might want to enable more debug +If you are a curl developer and use gcc, you might want to enable more debug options with the `--enable-debug` option. curl can be built to use a whole range of libraries to provide various useful @@ -111,13 +111,12 @@ want to alter it, you can select how to deal with each individual library. ## Select TLS backend -These options are provided to select TLS backend to use. +These options are provided to select the TLS backend to use. - AmiSSL: `--with-amissl` - BearSSL: `--with-bearssl` - GnuTLS: `--with-gnutls`. - mbedTLS: `--with-mbedtls` - - MesaLink: `--with-mesalink` - NSS: `--with-nss` - OpenSSL: `--with-openssl` (also for BoringSSL and libressl) - rustls: `--with-rustls` @@ -127,7 +126,7 @@ These options are provided to select TLS backend to use. # Windows -## Building Windows DLLs and C run-time (CRT) linkage issues +## Building Windows DLLs and C runtime (CRT) linkage issues As a general rule, building a DLL with static CRT linkage is highly discouraged, and intermixing CRTs in the same app is something to avoid at @@ -150,7 +149,7 @@ debug multithreaded dynamic C runtime. ## MingW32 -Make sure that MinGW32's bin dir is in the search path, for example: +Make sure that MinGW32's bin directory is in the search path, for example: ```cmd set PATH=c:\mingw32\bin;%PATH% @@ -195,9 +194,9 @@ If you want to enable LDAPS support then set LDAPS=1. ## Cygwin -Almost identical to the unix installation. Run the configure script in the +Almost identical to the Unix installation. Run the configure script in the curl source tree root with `sh configure`. Make sure you have the `sh` -executable in `/bin/` or you'll see the configure fail toward the end. +executable in `/bin/` or you will see the configure fail toward the end. Run `make` @@ -218,25 +217,23 @@ If you want to set any of these defines you have the following options: - Modify the "Preprocessor Definitions" in the libcurl project Note: The pre-processor settings can be found using the Visual Studio IDE -under "Project -> Settings -> C/C++ -> General" in VC6 and "Project -> -Properties -> Configuration Properties -> C/C++ -> Preprocessor" in later -versions. +under "Project -> Properties -> Configuration Properties -> C/C++ -> +Preprocessor". ## Using BSD-style lwIP instead of Winsock TCP/IP stack in Win32 builds In order to compile libcurl and curl using BSD-style lwIP TCP/IP stack it is -necessary to make definition of preprocessor symbol `USE_LWIPSOCK` visible to -libcurl and curl compilation processes. To set this definition you have the -following alternatives: +necessary to make the definition of the preprocessor symbol `USE_LWIPSOCK` +visible to libcurl and curl compilation processes. To set this definition you +have the following alternatives: - Modify `lib/config-win32.h` and `src/config-win32.h` - Modify `winbuild/Makefile.vc` - Modify the "Preprocessor Definitions" in the libcurl project Note: The pre-processor settings can be found using the Visual Studio IDE -under "Project -> Settings -> C/C++ -> General" in VC6 and "Project -> -Properties -> Configuration Properties -> C/C++ -> Preprocessor" in later -versions. +under "Project -> Properties -> Configuration Properties -> C/C++ -> +Preprocessor". Once that libcurl has been built with BSD-style lwIP TCP/IP stack support, in order to use it with your program it is mandatory that your program includes @@ -255,7 +252,7 @@ might yet need some additional adjustment, caveat emptor. ## Important static libcurl usage note When building an application that uses the static libcurl library on Windows, -you must add `-DCURL_STATICLIB` to your `CFLAGS`. Otherwise the linker will +you must add `-DCURL_STATICLIB` to your `CFLAGS`. Otherwise the linker will look for dynamic import symbols. ## Legacy Windows and SSL @@ -324,7 +321,8 @@ make -j8 make install ``` -In all above, the built libraries and executables can be found in `artifacts` folder. +In all above, the built libraries and executables can be found in the +`artifacts` folder. # Android @@ -355,7 +353,7 @@ to adjust those variables accordingly. After that you can build curl like this: ./configure --host aarch64-linux-android --with-pic --disable-shared -Note that this won't give you SSL/TLS support. If you need SSL/TLS, you have +Note that this will not give you SSL/TLS support. If you need SSL/TLS, you have to build curl against a SSL/TLS layer, e.g. OpenSSL, because it's impossible for curl to access Android's native SSL/TLS layer. To build curl for Android using OpenSSL, follow the OpenSSL build instructions and then install `libssl.a` and @@ -366,7 +364,7 @@ OpenSSL like this: ./configure --host aarch64-linux-android --with-pic --disable-shared --with-openssl="$TOOLCHAIN/sysroot/usr" Note, however, that you must target at least Android M (API level 23) or `configure` -won't be able to detect OpenSSL since `stderr` (and the like) weren't defined +will not be able to detect OpenSSL since `stderr` (and the like) were not defined before Android M. # IBM i @@ -387,16 +385,16 @@ they affect both environments. ## Multithreading notes -By default, jobs in IBM i won't start with threading enabled. (Exceptions +By default, jobs in IBM i will not start with threading enabled. (Exceptions include interactive PASE sessions started by `QP2TERM` or SSH.) If you use curl in an environment without threading when options like async DNS were -enabled, you'll messages like: +enabled, you will get messages like: ``` getaddrinfo() thread failed to start ``` -Don't panic! curl and your program aren't broken. You can fix this by: +Do not panic. curl and your program are not broken. You can fix this by: - Set the environment variable `QIBM_MULTI_THREADED` to `Y` before starting your program. This can be done at whatever scope you feel is appropriate. @@ -409,8 +407,8 @@ Download and unpack the curl package. `cd` to the new directory. (e.g. `cd curl-7.12.3`) Set environment variables to point to the cross-compile toolchain and call -configure with any options you need. Be sure and specify the `--host` and -`--build` parameters at configuration time. The following script is an +configure with any options you need. Be sure and specify the `--host` and +`--build` parameters at configuration time. The following script is an example of cross-compiling for the IBM 405GP PowerPC processor using the toolchain from MonteVista for Hardhat Linux. @@ -435,8 +433,8 @@ export NM=ppc_405-nm You may also need to provide a parameter like `--with-random=/dev/urandom` to configure as it cannot detect the presence of a random number generating -device for a target system. The `--prefix` parameter specifies where curl -will be installed. If `configure` completes successfully, do `make` and `make +device for a target system. The `--prefix` parameter specifies where curl +will be installed. If `configure` completes successfully, do `make` and `make install` as usual. In some cases, you may be able to simplify the above commands to as little as: @@ -448,7 +446,7 @@ In some cases, you may be able to simplify the above commands to as little as: There are a number of configure options that can be used to reduce the size of libcurl for embedded applications where binary size is an important factor. First, be sure to set the `CFLAGS` variable when configuring with any relevant -compiler optimization flags to reduce the size of the binary. For gcc, this +compiler optimization flags to reduce the size of the binary. For gcc, this would mean at minimum the -Os option, and potentially the `-march=X`, `-mdynamic-no-pic` and `-flto` options as well, e.g. @@ -459,24 +457,45 @@ due to improved optimization. Be sure to specify as many `--disable-` and `--without-` flags on the configure command-line as you can to disable all the libcurl features that you -know your application is not going to need. Besides specifying the +know your application is not going to need. Besides specifying the `--disable-PROTOCOL` flags for all the types of URLs your application will not -use, here are some other flags that can reduce the size of the library: - - - `--disable-ares` (disables support for the C-ARES DNS library) - - `--disable-cookies` (disables support for HTTP cookies) - - `--disable-crypto-auth` (disables HTTP cryptographic authentication) - - `--disable-ipv6` (disables support for IPv6) - - `--disable-manual` (disables support for the built-in documentation) - - `--disable-proxy` (disables support for HTTP and SOCKS proxies) - - `--disable-unix-sockets` (disables support for UNIX sockets) +use, here are some other flags that can reduce the size of the library by +disabling support for some feature: + + - `--disable-alt-svc` (HTTP Alt-Srv) + - `--disable-ares` (the C-ARES DNS library) + - `--disable-cookies` (HTTP cookies) + - `--disable-crypto-auth` (cryptographic authentication) + - `--disable-dateparse` (date parsing for time conditionals) + - `--disable-dnsshuffle` (internal server load spreading) + - `--disable-doh` (DNS-over-HTTP) + - `--disable-get-easy-options` (lookup easy options at runtime) + - `--disable-hsts` (HTTP Strict Transport Security) + - `--disable-http-auth` (all HTTP authentication) + - `--disable-ipv6` (IPv6) + - `--disable-libcurl-option` (--libcurl C code generation support) + - `--disable-manual` (built-in documentation) + - `--disable-netrc` (.netrc file) + - `--disable-ntlm-wb` (NTLM WinBind) + - `--disable-progress-meter` (graphical progress meter in library) + - `--disable-proxy` (HTTP and SOCKS proxies) + - `--disable-pthreads` (multithreading) + - `--disable-socketpair` (socketpair for async name resolving) + - `--disable-threaded-resolver` (threaded name resolver) + - `--disable-tls-srp` (Secure Remote Password authentication for TLS) + - `--disable-unix-sockets` (UNIX sockets) - `--disable-verbose` (eliminates debugging strings and error code strings) - - `--disable-versioned-symbols` (disables support for versioned symbols) - - `--enable-hidden-symbols` (eliminates unneeded symbols in the shared library) - - `--without-libidn` (disables support for the libidn DNS library) - - `--without-librtmp` (disables support for RTMP) - - `--without-openssl` (disables support for SSL/TLS) - - `--without-zlib` (disables support for on-the-fly decompression) + - `--disable-versioned-symbols` (versioned symbols) + - `--enable-symbol-hiding` (eliminates unneeded symbols in the shared library) + - `--without-brotli` (Brotli on-the-fly decompression) + - `--without-libpsl` (Public Suffix List in cookies) + - `--without-nghttp2` (HTTP/2 using nghttp2) + - `--without-ngtcp2` (HTTP/2 using ngtcp2) + - `--without-zstd` (Zstd on-the-fly decompression) + - `--without-libidn2` (internationalized domain names) + - `--without-librtmp` (RTMP) + - `--without-ssl` (SSL/TLS) + - `--without-zlib` (on-the-fly decompression) The GNU compiler and linker have a number of options that can reduce the size of the libcurl dynamic libraries on some platforms even further. @@ -488,33 +507,34 @@ the configure command-line, e.g. LDFLAGS="-Wl,-s -Wl,-Bsymbolic -Wl,--gc-sections" Be sure also to strip debugging symbols from your binaries after compiling -using 'strip' (or the appropriate variant if cross-compiling). If space is +using 'strip' (or the appropriate variant if cross-compiling). If space is really tight, you may be able to remove some unneeded sections of the shared library using the -R option to objcopy (e.g. the .comment section). -Using these techniques it is possible to create a basic HTTP-only shared -libcurl library for i386 Linux platforms that is only 113 KiB in size, and an -FTP-only library that is 113 KiB in size (as of libcurl version 7.50.3, using -gcc 5.4.0). +Using these techniques it is possible to create a basic HTTP-only libcurl +shared library for i386 Linux platforms that is only 133 KiB in size +(as of libcurl version 7.80.0, using gcc 11.2.0). You may find that statically linking libcurl to your application will result in a lower total size than dynamically linking. Note that the curl test harness can detect the use of some, but not all, of the `--disable` statements suggested above. Use will cause tests relying on -those features to fail. The test harness can be manually forced to skip the +those features to fail. The test harness can be manually forced to skip the relevant tests by specifying certain key words on the `runtests.pl` command -line. Following is a list of appropriate key words: +line. Following is a list of appropriate key words for those configure options +that are not automatically detected: - `--disable-cookies` !cookies - - `--disable-manual` !--manual - - `--disable-proxy` !HTTP\ proxy !proxytunnel !SOCKS4 !SOCKS5 + - `--disable-dateparse` !RETRY-AFTER !CURLOPT_TIMECONDITION !CURLINFO_FILETIME !If-Modified-Since !getdate !-z + - `--disable-libcurl-option` !--libcurl + - `--disable-verbose` !verbose\ logs # PORTS This is a probably incomplete list of known CPU architectures and operating systems that curl has been compiled for. If you know a system curl compiles -and runs on, that isn't listed, please let us know! +and runs on, that is not listed, please let us know! ## 85 Operating Systems diff --git a/trunk/libs/libcurl/curl-7.x/docs/INTERNALS.md b/trunk/libs/libcurl/curl-7.x/docs/INTERNALS.md index 176ca525..7da0be5a 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/INTERNALS.md +++ b/trunk/libs/libcurl/curl-7.x/docs/INTERNALS.md @@ -1,88 +1,22 @@ -curl internals -============== +# curl internals - - [Intro](#intro) - - [git](#git) - - [Portability](#Portability) - - [Windows vs Unix](#winvsunix) - - [Library](#Library) - - [`Curl_connect`](#Curl_connect) - - [`multi_do`](#multi_do) - - [`Curl_readwrite`](#Curl_readwrite) - - [`multi_done`](#multi_done) - - [`Curl_disconnect`](#Curl_disconnect) - - [HTTP(S)](#http) - - [FTP](#ftp) - - [Kerberos](#kerberos) - - [TELNET](#telnet) - - [FILE](#file) - - [SMB](#smb) - - [LDAP](#ldap) - - [E-mail](#email) - - [General](#general) - - [Persistent Connections](#persistent) - - [multi interface/non-blocking](#multi) - - [SSL libraries](#ssl) - - [Library Symbols](#symbols) - - [Return Codes and Informationals](#returncodes) - - [AP/ABI](#abi) - - [Client](#client) - - [Memory Debugging](#memorydebug) - - [Test Suite](#test) - - [Asynchronous name resolves](#asyncdns) - - [c-ares](#cares) - - [`curl_off_t`](#curl_off_t) - - [curlx](#curlx) - - [Content Encoding](#contentencoding) - - [`hostip.c` explained](#hostip) - - [Track Down Memory Leaks](#memoryleak) - - [`multi_socket`](#multi_socket) - - [Structs in libcurl](#structs) - - [Curl_easy](#Curl_easy) - - [connectdata](#connectdata) - - [Curl_multi](#Curl_multi) - - [Curl_handler](#Curl_handler) - - [conncache](#conncache) - - [Curl_share](#Curl_share) - - [CookieInfo](#CookieInfo) +The canonical libcurl internals documentation is now in the [everything +curl](https://everything.curl.dev/internals) book. This file lists supported +versions of libs, tools and operating systems. - -Intro -===== +## Portability - This project is split in two. The library and the client. The client part - uses the library, but the library is designed to allow other applications to - use it. - - The largest amount of code and complexity is in the library part. - - - -git -=== - - All changes to the sources are committed to the git repository as soon as - they're somewhat verified to work. Changes shall be committed as independently - as possible so that individual changes can be easily spotted and tracked - afterwards. - - Tagging shall be used extensively, and by the time we release new archives we - should tag the sources with a name similar to the released version number. - - -Portability -=========== - - We write curl and libcurl to compile with C89 compilers. On 32-bit and up - machines. Most of libcurl assumes more or less POSIX compliance but that's + We write curl and libcurl to compile with C89 compilers. On 32-bit and up + machines. Most of libcurl assumes more or less POSIX compliance but that is not a requirement. We write libcurl to build and work with lots of third party tools, and we want it to remain functional and buildable with these and later versions (older versions may still work but is not what we work hard to maintain): -Dependencies ------------- +## Dependencies + + We aim to support these or later versions. - OpenSSL 0.9.7 - GnuTLS 3.1.10 @@ -99,12 +33,11 @@ Dependencies - nghttp2 1.12.0 - WinSock 2.2 (on Windows 95+ and Windows CE .NET 4.1+) -Operating Systems ------------------ +## Operating Systems On systems where configure runs, we aim at working on them all - if they have - a suitable C compiler. On systems that don't run configure, we strive to keep - curl running correctly on: + a suitable C compiler. On systems that do not run configure, we strive to + keep curl running correctly on: - Windows 98 - AS/400 V5R3M0 @@ -112,8 +45,7 @@ Operating Systems - Windows CE ? - TPF ? -Build tools ------------ +## Build tools When writing code (mostly for generating stuff included in release tarballs) we use a few "build tools" and we make sure that we remain functional with @@ -126,982 +58,13 @@ Build tools - perl 5.004 - roffit 0.5 - groff ? (any version that supports `groff -Tps -man [in] [out]`) - - ps2pdf (gs) ? - - -Windows vs Unix -=============== - - There are a few differences in how to program curl the Unix way compared to - the Windows way. Perhaps the four most notable details are: - - 1. Different function names for socket operations. - - In curl, this is solved with defines and macros, so that the source looks - the same in all places except for the header file that defines them. The - macros in use are `sclose()`, `sread()` and `swrite()`. - - 2. Windows requires a couple of init calls for the socket stuff. - - That's taken care of by the `curl_global_init()` call, but if other libs - also do it etc there might be reasons for applications to alter that - behavior. - - We require WinSock version 2.2 and load this version during global init. - - 3. The file descriptors for network communication and file operations are - not as easily interchangeable as in Unix. - - We avoid this by not trying any funny tricks on file descriptors. - - 4. When writing data to stdout, Windows makes end-of-lines the DOS way, thus - destroying binary data, although you do want that conversion if it is - text coming through... (sigh) - - We set stdout to binary under windows - - Inside the source code, We make an effort to avoid `#ifdef [Your OS]`. All - conditionals that deal with features *should* instead be in the format - `#ifdef HAVE_THAT_WEIRD_FUNCTION`. Since Windows can't run configure scripts, - we maintain a `curl_config-win32.h` file in lib directory that is supposed to - look exactly like a `curl_config.h` file would have looked like on a Windows - machine! - - Generally speaking: always remember that this will be compiled on dozens of - operating systems. Don't walk on the edge! - - -Library -======= - - (See [Structs in libcurl](#structs) for the separate section describing all - major internal structs and their purposes.) - - There are plenty of entry points to the library, namely each publicly defined - function that libcurl offers to applications. All of those functions are - rather small and easy-to-follow. All the ones prefixed with `curl_easy` are - put in the `lib/easy.c` file. - - `curl_global_init()` and `curl_global_cleanup()` should be called by the - application to initialize and clean up global stuff in the library. As of - today, it can handle the global SSL initialization if SSL is enabled and it - can initialize the socket layer on Windows machines. libcurl itself has no - "global" scope. - - All printf()-style functions use the supplied clones in `lib/mprintf.c`. This - makes sure we stay absolutely platform independent. - - [ `curl_easy_init()`][2] allocates an internal struct and makes some - initializations. The returned handle does not reveal internals. This is the - `Curl_easy` struct which works as an "anchor" struct for all `curl_easy` - functions. All connections performed will get connect-specific data allocated - that should be used for things related to particular connections/requests. - - [`curl_easy_setopt()`][1] takes three arguments, where the option stuff must - be passed in pairs: the parameter-ID and the parameter-value. The list of - options is documented in the man page. This function mainly sets things in - the `Curl_easy` struct. - - `curl_easy_perform()` is just a wrapper function that makes use of the multi - API. It basically calls `curl_multi_init()`, `curl_multi_add_handle()`, - `curl_multi_wait()`, and `curl_multi_perform()` until the transfer is done - and then returns. - - Some of the most important key functions in `url.c` are called from - `multi.c` when certain key steps are to be made in the transfer operation. - - -Curl_connect() --------------- - - Analyzes the URL, it separates the different components and connects to the - remote host. This may involve using a proxy and/or using SSL. The - `Curl_resolv()` function in `lib/hostip.c` is used for looking up host - names (it does then use the proper underlying method, which may vary - between platforms and builds). - - When `Curl_connect` is done, we are connected to the remote site. Then it - is time to tell the server to get a document/file. `Curl_do()` arranges - this. - - This function makes sure there's an allocated and initiated `connectdata` - struct that is used for this particular connection only (although there may - be several requests performed on the same connect). A bunch of things are - initialized/inherited from the `Curl_easy` struct. - - -multi_do() ---------- - - `multi_do()` makes sure the proper protocol-specific function is called. - The functions are named after the protocols they handle. - - The protocol-specific functions of course deal with protocol-specific - negotiations and setup. When they're ready to start the actual file - transfer they call the `Curl_setup_transfer()` function (in - `lib/transfer.c`) to setup the transfer and returns. - - If this DO function fails and the connection is being re-used, libcurl will - then close this connection, setup a new connection and re-issue the DO - request on that. This is because there is no way to be perfectly sure that - we have discovered a dead connection before the DO function and thus we - might wrongly be re-using a connection that was closed by the remote peer. - - -Curl_readwrite() ----------------- - - Called during the transfer of the actual protocol payload. - - During transfer, the progress functions in `lib/progress.c` are called at - frequent intervals (or at the user's choice, a specified callback might get - called). The speedcheck functions in `lib/speedcheck.c` are also used to - verify that the transfer is as fast as required. - - -multi_done() ------------ - - Called after a transfer is done. This function takes care of everything - that has to be done after a transfer. This function attempts to leave - matters in a state so that `multi_do()` should be possible to call again on - the same connection (in a persistent connection case). It might also soon - be closed with `Curl_disconnect()`. - - -Curl_disconnect() ------------------ - - When doing normal connections and transfers, no one ever tries to close any - connections so this is not normally called when `curl_easy_perform()` is - used. This function is only used when we are certain that no more transfers - are going to be made on the connection. It can be also closed by force, or - it can be called to make sure that libcurl doesn't keep too many - connections alive at the same time. - - This function cleans up all resources that are associated with a single - connection. - - -HTTP(S) -======= - - HTTP offers a lot and is the protocol in curl that uses the most lines of - code. There is a special file `lib/formdata.c` that offers all the - multipart post functions. - - base64-functions for user+password stuff (and more) is in `lib/base64.c` - and all functions for parsing and sending cookies are found in - `lib/cookie.c`. - - HTTPS uses in almost every case the same procedure as HTTP, with only two - exceptions: the connect procedure is different and the function used to read - or write from the socket is different, although the latter fact is hidden in - the source by the use of `Curl_read()` for reading and `Curl_write()` for - writing data to the remote server. - - `http_chunks.c` contains functions that understands HTTP 1.1 chunked transfer - encoding. - - An interesting detail with the HTTP(S) request, is the `Curl_add_buffer()` - series of functions we use. They append data to one single buffer, and when - the building is finished the entire request is sent off in one single write. - This is done this way to overcome problems with flawed firewalls and lame - servers. - - -FTP -=== - - The `Curl_if2ip()` function can be used for getting the IP number of a - specified network interface, and it resides in `lib/if2ip.c`. - - `Curl_ftpsendf()` is used for sending FTP commands to the remote server. It - was made a separate function to prevent us programmers from forgetting that - they must be CRLF terminated. They must also be sent in one single `write()` - to make firewalls and similar happy. - - -Kerberos -======== - - Kerberos support is mainly in `lib/krb5.c` but also `curl_sasl_sspi.c` and - `curl_sasl_gssapi.c` for the email protocols and `socks_gssapi.c` and - `socks_sspi.c` for SOCKS5 proxy specifics. - - -TELNET -====== - - Telnet is implemented in `lib/telnet.c`. - - -FILE -==== - - The `file://` protocol is dealt with in `lib/file.c`. - - -SMB -=== - The `smb://` protocol is dealt with in `lib/smb.c`. - - -LDAP -==== - - Everything LDAP is in `lib/ldap.c` and `lib/openldap.c`. - - -E-mail -====== - - The e-mail related source code is in `lib/imap.c`, `lib/pop3.c` and - `lib/smtp.c`. - - -General -======= - - URL encoding and decoding, called escaping and unescaping in the source code, - is found in `lib/escape.c`. - - While transferring data in `Transfer()` a few functions might get used. - `curl_getdate()` in `lib/parsedate.c` is for HTTP date comparisons (and - more). - - `lib/getenv.c` offers `curl_getenv()` which is for reading environment - variables in a neat platform independent way. That's used in the client, but - also in `lib/url.c` when checking the proxy environment variables. Note that - contrary to the normal unix `getenv()`, this returns an allocated buffer that - must be `free()`ed after use. - - `lib/netrc.c` holds the `.netrc` parser. - - `lib/timeval.c` features replacement functions for systems that don't have - `gettimeofday()` and a few support functions for timeval conversions. - - A function named `curl_version()` that returns the full curl version string - is found in `lib/version.c`. - - -Persistent Connections -====================== - - The persistent connection support in libcurl requires some considerations on - how to do things inside of the library. - - - The `Curl_easy` struct returned in the [`curl_easy_init()`][2] call - must never hold connection-oriented data. It is meant to hold the root data - as well as all the options etc that the library-user may choose. - - - The `Curl_easy` struct holds the "connection cache" (an array of - pointers to `connectdata` structs). - - - This enables the 'curl handle' to be reused on subsequent transfers. - - - When libcurl is told to perform a transfer, it first checks for an already - existing connection in the cache that we can use. Otherwise it creates a - new one and adds that to the cache. If the cache is full already when a new - connection is added, it will first close the oldest unused one. - - - When the transfer operation is complete, the connection is left - open. Particular options may tell libcurl not to, and protocols may signal - closure on connections and then they won't be kept open, of course. - - - When `curl_easy_cleanup()` is called, we close all still opened connections, - unless of course the multi interface "owns" the connections. - - The curl handle must be re-used in order for the persistent connections to - work. - - -multi interface/non-blocking -============================ - - The multi interface is a non-blocking interface to the library. To make that - interface work as well as possible, no low-level functions within libcurl - must be written to work in a blocking manner. (There are still a few spots - violating this rule.) - - One of the primary reasons we introduced c-ares support was to allow the name - resolve phase to be perfectly non-blocking as well. - - The FTP and the SFTP/SCP protocols are examples of how we adapt and adjust - the code to allow non-blocking operations even on multi-stage command- - response protocols. They are built around state machines that return when - they would otherwise block waiting for data. The DICT, LDAP and TELNET - protocols are crappy examples and they are subject for rewrite in the future - to better fit the libcurl protocol family. - - -SSL libraries -============= - - Originally libcurl supported SSLeay for SSL/TLS transports, but that was then - extended to its successor OpenSSL but has since also been extended to several - other SSL/TLS libraries and we expect and hope to further extend the support - in future libcurl versions. - - To deal with this internally in the best way possible, we have a generic SSL - function API as provided by the `vtls/vtls.[ch]` system, and they are the only - SSL functions we must use from within libcurl. vtls is then crafted to use - the appropriate lower-level function calls to whatever SSL library that is in - use. For example `vtls/openssl.[ch]` for the OpenSSL library. - - Library Symbols =============== - All symbols used internally in libcurl must use a `Curl_` prefix if they're + All symbols used internally in libcurl must use a `Curl_` prefix if they are used in more than a single file. Single-file symbols must be made static. Public ("exported") symbols must use a `curl_` prefix. (There are exceptions, but they are to be changed to follow this pattern in future versions.) Public API functions are marked with `CURL_EXTERN` in the public header files so that all others can be hidden on platforms where this is possible. - - -Return Codes and Informationals -=============================== - - I've made things simple. Almost every function in libcurl returns a CURLcode, - that must be `CURLE_OK` if everything is OK or otherwise a suitable error - code as the `curl/curl.h` include file defines. The very spot that detects an - error must use the `Curl_failf()` function to set the human-readable error - description. - - In aiding the user to understand what's happening and to debug curl usage, we - must supply a fair number of informational messages by using the - `Curl_infof()` function. Those messages are only displayed when the user - explicitly asks for them. They are best used when revealing information that - isn't otherwise obvious. - - -API/ABI -======= - - We make an effort to not export or show internals or how internals work, as - that makes it easier to keep a solid API/ABI over time. See docs/libcurl/ABI - for our promise to users. - - -Client -====== - - `main()` resides in `src/tool_main.c`. - - `src/tool_hugehelp.c` is automatically generated by the `mkhelp.pl` perl - script to display the complete "manual" and the `src/tool_urlglob.c` file - holds the functions used for the URL-"globbing" support. Globbing in the - sense that the `{}` and `[]` expansion stuff is there. - - The client mostly sets up its `config` struct properly, then - it calls the `curl_easy_*()` functions of the library and when it gets back - control after the `curl_easy_perform()` it cleans up the library, checks - status and exits. - - When the operation is done, the `ourWriteOut()` function in `src/writeout.c` - may be called to report about the operation. That function is mostly using the - `curl_easy_getinfo()` function to extract useful information from the curl - session. - - It may loop and do all this several times if many URLs were specified on the - command line or config file. - - -Memory Debugging -================ - - The file `lib/memdebug.c` contains debug-versions of a few functions. - Functions such as `malloc()`, `free()`, `fopen()`, `fclose()`, etc that - somehow deal with resources that might give us problems if we "leak" them. - The functions in the memdebug system do nothing fancy, they do their normal - function and then log information about what they just did. The logged data - can then be analyzed after a complete session, - - `memanalyze.pl` is the perl script present in `tests/` that analyzes a log - file generated by the memory tracking system. It detects if resources are - allocated but never freed and other kinds of errors related to resource - management. - - Internally, definition of preprocessor symbol `DEBUGBUILD` restricts code - which is only compiled for debug enabled builds. And symbol `CURLDEBUG` is - used to differentiate code which is _only_ used for memory - tracking/debugging. - - Use `-DCURLDEBUG` when compiling to enable memory debugging, this is also - switched on by running configure with `--enable-curldebug`. Use - `-DDEBUGBUILD` when compiling to enable a debug build or run configure with - `--enable-debug`. - - `curl --version` will list 'Debug' feature for debug enabled builds, and - will list 'TrackMemory' feature for curl debug memory tracking capable - builds. These features are independent and can be controlled when running - the configure script. When `--enable-debug` is given both features will be - enabled, unless some restriction prevents memory tracking from being used. - - -Test Suite -========== - - The test suite is placed in its own subdirectory directly off the root in the - curl archive tree, and it contains a bunch of scripts and a lot of test case - data. - - The main test script is `runtests.pl` that will invoke test servers like - `httpserver.pl` and `ftpserver.pl` before all the test cases are performed. - The test suite currently only runs on Unix-like platforms. - - You'll find a description of the test suite in the `tests/README` file, and - the test case data files in the `tests/FILEFORMAT` file. - - The test suite automatically detects if curl was built with the memory - debugging enabled, and if it was, it will detect memory leaks, too. - - -Asynchronous name resolves -========================== - - libcurl can be built to do name resolves asynchronously, using either the - normal resolver in a threaded manner or by using c-ares. - - -[c-ares][3] ------- - -### Build libcurl to use a c-ares - -1. ./configure --enable-ares=/path/to/ares/install -2. make - -### c-ares on win32 - - First I compiled c-ares. I changed the default C runtime library to be the - single-threaded rather than the multi-threaded (this seems to be required to - prevent linking errors later on). Then I simply build the areslib project - (the other projects adig/ahost seem to fail under MSVC). - - Next was libcurl. I opened `lib/config-win32.h` and I added a: - `#define USE_ARES 1` - - Next thing I did was I added the path for the ares includes to the include - path, and the libares.lib to the libraries. - - Lastly, I also changed libcurl to be single-threaded rather than - multi-threaded, again this was to prevent some duplicate symbol errors. I'm - not sure why I needed to change everything to single-threaded, but when I - didn't I got redefinition errors for several CRT functions (`malloc()`, - `stricmp()`, etc.) - - -`curl_off_t` -========== - - `curl_off_t` is a data type provided by the external libcurl include - headers. It is the type meant to be used for the [`curl_easy_setopt()`][1] - options that end with LARGE. The type is 64-bit large on most modern - platforms. - - -curlx -===== - - The libcurl source code offers a few functions by source only. They are not - part of the official libcurl API, but the source files might be useful for - others so apps can optionally compile/build with these sources to gain - additional functions. - - We provide them through a single header file for easy access for apps: - `curlx.h` - -`curlx_strtoofft()` -------------------- - A macro that converts a string containing a number to a `curl_off_t` number. - This might use the `curlx_strtoll()` function which is provided as source - code in strtoofft.c. Note that the function is only provided if no - `strtoll()` (or equivalent) function exist on your platform. If `curl_off_t` - is only a 32-bit number on your platform, this macro uses `strtol()`. - -Future ------- - - Several functions will be removed from the public `curl_` name space in a - future libcurl release. They will then only become available as `curlx_` - functions instead. To make the transition easier, we already today provide - these functions with the `curlx_` prefix to allow sources to be built - properly with the new function names. The concerned functions are: - - - `curlx_getenv` - - `curlx_strequal` - - `curlx_strnequal` - - `curlx_mvsnprintf` - - `curlx_msnprintf` - - `curlx_maprintf` - - `curlx_mvaprintf` - - `curlx_msprintf` - - `curlx_mprintf` - - `curlx_mfprintf` - - `curlx_mvsprintf` - - `curlx_mvprintf` - - `curlx_mvfprintf` - - -Content Encoding -================ - -## About content encodings - - [HTTP/1.1][4] specifies that a client may request that a server encode its - response. This is usually used to compress a response using one (or more) - encodings from a set of commonly available compression techniques. These - schemes include `deflate` (the zlib algorithm), `gzip`, `br` (brotli) and - `compress`. A client requests that the server perform an encoding by including - an `Accept-Encoding` header in the request document. The value of the header - should be one of the recognized tokens `deflate`, ... (there's a way to - register new schemes/tokens, see sec 3.5 of the spec). A server MAY honor - the client's encoding request. When a response is encoded, the server - includes a `Content-Encoding` header in the response. The value of the - `Content-Encoding` header indicates which encodings were used to encode the - data, in the order in which they were applied. - - It's also possible for a client to attach priorities to different schemes so - that the server knows which it prefers. See sec 14.3 of RFC 2616 for more - information on the `Accept-Encoding` header. See sec - [3.1.2.2 of RFC 7231][15] for more information on the `Content-Encoding` - header. - -## Supported content encodings - - The `deflate`, `gzip` and `br` content encodings are supported by libcurl. - Both regular and chunked transfers work fine. The zlib library is required - for the `deflate` and `gzip` encodings, while the brotli decoding library is - for the `br` encoding. - -## The libcurl interface - - To cause libcurl to request a content encoding use: - - [`curl_easy_setopt`][1](curl, [`CURLOPT_ACCEPT_ENCODING`][5], string) - - where string is the intended value of the `Accept-Encoding` header. - - Currently, libcurl does support multiple encodings but only - understands how to process responses that use the `deflate`, `gzip` and/or - `br` content encodings, so the only values for [`CURLOPT_ACCEPT_ENCODING`][5] - that will work (besides `identity`, which does nothing) are `deflate`, - `gzip` and `br`. If a response is encoded using the `compress` or methods, - libcurl will return an error indicating that the response could - not be decoded. If `` is NULL no `Accept-Encoding` header is - generated. If `` is a zero-length string, then an `Accept-Encoding` - header containing all supported encodings will be generated. - - The [`CURLOPT_ACCEPT_ENCODING`][5] must be set to any non-NULL value for - content to be automatically decoded. If it is not set and the server still - sends encoded content (despite not having been asked), the data is returned - in its raw form and the `Content-Encoding` type is not checked. - -## The curl interface - - Use the [`--compressed`][6] option with curl to cause it to ask servers to - compress responses using any format supported by curl. - - -`hostip.c` explained -==================== - - The main compile-time defines to keep in mind when reading the `host*.c` - source file are these: - -## `CURLRES_IPV6` - - this host has `getaddrinfo()` and family, and thus we use that. The host may - not be able to resolve IPv6, but we don't really have to take that into - account. Hosts that aren't IPv6-enabled have `CURLRES_IPV4` defined. - -## `CURLRES_ARES` - - is defined if libcurl is built to use c-ares for asynchronous name - resolves. This can be Windows or \*nix. - -## `CURLRES_THREADED` - - is defined if libcurl is built to use threading for asynchronous name - resolves. The name resolve will be done in a new thread, and the supported - asynch API will be the same as for ares-builds. This is the default under - (native) Windows. - - If any of the two previous are defined, `CURLRES_ASYNCH` is defined too. If - libcurl is not built to use an asynchronous resolver, `CURLRES_SYNCH` is - defined. - -## `host*.c` sources - - The `host*.c` sources files are split up like this: - - - `hostip.c` - method-independent resolver functions and utility functions - - `hostasyn.c` - functions for asynchronous name resolves - - `hostsyn.c` - functions for synchronous name resolves - - `asyn-ares.c` - functions for asynchronous name resolves using c-ares - - `asyn-thread.c` - functions for asynchronous name resolves using threads - - `hostip4.c` - IPv4 specific functions - - `hostip6.c` - IPv6 specific functions - - The `hostip.h` is the single united header file for all this. It defines the - `CURLRES_*` defines based on the `config*.h` and `curl_setup.h` defines. - - -Track Down Memory Leaks -======================= - -## Single-threaded - - Please note that this memory leak system is not adjusted to work in more - than one thread. If you want/need to use it in a multi-threaded app. Please - adjust accordingly. - -## Build - - Rebuild libcurl with `-DCURLDEBUG` (usually, rerunning configure with - `--enable-debug` fixes this). `make clean` first, then `make` so that all - files are actually rebuilt properly. It will also make sense to build - libcurl with the debug option (usually `-g` to the compiler) so that - debugging it will be easier if you actually do find a leak in the library. - - This will create a library that has memory debugging enabled. - -## Modify Your Application - - Add a line in your application code: - -```c - curl_dbg_memdebug("dump"); -``` - - This will make the malloc debug system output a full trace of all resource - using functions to the given file name. Make sure you rebuild your program - and that you link with the same libcurl you built for this purpose as - described above. - -## Run Your Application - - Run your program as usual. Watch the specified memory trace file grow. - - Make your program exit and use the proper libcurl cleanup functions etc. So - that all non-leaks are returned/freed properly. - -## Analyze the Flow - - Use the `tests/memanalyze.pl` perl script to analyze the dump file: - - tests/memanalyze.pl dump - - This now outputs a report on what resources that were allocated but never - freed etc. This report is very fine for posting to the list! - - If this doesn't produce any output, no leak was detected in libcurl. Then - the leak is mostly likely to be in your code. - - -`multi_socket` -============== - - Implementation of the `curl_multi_socket` API - - The main ideas of this API are simply: - - 1. The application can use whatever event system it likes as it gets info - from libcurl about what file descriptors libcurl waits for what action - on. (The previous API returns `fd_sets` which is very - `select()`-centric). - - 2. When the application discovers action on a single socket, it calls - libcurl and informs that there was action on this particular socket and - libcurl can then act on that socket/transfer only and not care about - any other transfers. (The previous API always had to scan through all - the existing transfers.) - - The idea is that [`curl_multi_socket_action()`][7] calls a given callback - with information about what socket to wait for what action on, and the - callback only gets called if the status of that socket has changed. - - We also added a timer callback that makes libcurl call the application when - the timeout value changes, and you set that with [`curl_multi_setopt()`][9] - and the [`CURLMOPT_TIMERFUNCTION`][10] option. To get this to work, - Internally, there's an added struct to each easy handle in which we store - an "expire time" (if any). The structs are then "splay sorted" so that we - can add and remove times from the linked list and yet somewhat swiftly - figure out both how long there is until the next nearest timer expires - and which timer (handle) we should take care of now. Of course, the upside - of all this is that we get a [`curl_multi_timeout()`][8] that should also - work with old-style applications that use [`curl_multi_perform()`][11]. - - We created an internal "socket to easy handles" hash table that given - a socket (file descriptor) returns the easy handle that waits for action on - that socket. This hash is made using the already existing hash code - (previously only used for the DNS cache). - - To make libcurl able to report plain sockets in the socket callback, we had - to re-organize the internals of the [`curl_multi_fdset()`][12] etc so that - the conversion from sockets to `fd_sets` for that function is only done in - the last step before the data is returned. I also had to extend c-ares to - get a function that can return plain sockets, as that library too returned - only `fd_sets` and that is no longer good enough. The changes done to c-ares - are available in c-ares 1.3.1 and later. - - -Structs in libcurl -================== - -This section should cover 7.32.0 pretty accurately, but will make sense even -for older and later versions as things don't change drastically that often. - - -## Curl_easy - - The `Curl_easy` struct is the one returned to the outside in the external API - as a `CURL *`. This is usually known as an easy handle in API documentations - and examples. - - Information and state that is related to the actual connection is in the - `connectdata` struct. When a transfer is about to be made, libcurl will - either create a new connection or re-use an existing one. The particular - connectdata that is used by this handle is pointed out by - `Curl_easy->easy_conn`. - - Data and information that regard this particular single transfer is put in - the `SingleRequest` sub-struct. - - When the `Curl_easy` struct is added to a multi handle, as it must be in - order to do any transfer, the `->multi` member will point to the `Curl_multi` - struct it belongs to. The `->prev` and `->next` members will then be used by - the multi code to keep a linked list of `Curl_easy` structs that are added to - that same multi handle. libcurl always uses multi so `->multi` *will* point - to a `Curl_multi` when a transfer is in progress. - - `->mstate` is the multi state of this particular `Curl_easy`. When - `multi_runsingle()` is called, it will act on this handle according to which - state it is in. The mstate is also what tells which sockets to return for a - specific `Curl_easy` when [`curl_multi_fdset()`][12] is called etc. - - The libcurl source code generally use the name `data` for the variable that - points to the `Curl_easy`. - - When doing multiplexed HTTP/2 transfers, each `Curl_easy` is associated with - an individual stream, sharing the same connectdata struct. Multiplexing - makes it even more important to keep things associated with the right thing! - - -## connectdata - - A general idea in libcurl is to keep connections around in a connection - "cache" after they have been used in case they will be used again and then - re-use an existing one instead of creating a new as it creates a significant - performance boost. - - Each `connectdata` identifies a single physical connection to a server. If - the connection can't be kept alive, the connection will be closed after use - and then this struct can be removed from the cache and freed. - - Thus, the same `Curl_easy` can be used multiple times and each time select - another `connectdata` struct to use for the connection. Keep this in mind, - as it is then important to consider if options or choices are based on the - connection or the `Curl_easy`. - - Functions in libcurl will assume that `connectdata->data` points to the - `Curl_easy` that uses this connection (for the moment). - - As a special complexity, some protocols supported by libcurl require a - special disconnect procedure that is more than just shutting down the - socket. It can involve sending one or more commands to the server before - doing so. Since connections are kept in the connection cache after use, the - original `Curl_easy` may no longer be around when the time comes to shut down - a particular connection. For this purpose, libcurl holds a special dummy - `closure_handle` `Curl_easy` in the `Curl_multi` struct to use when needed. - - FTP uses two TCP connections for a typical transfer but it keeps both in - this single struct and thus can be considered a single connection for most - internal concerns. - - The libcurl source code generally use the name `conn` for the variable that - points to the connectdata. - - -## Curl_multi - - Internally, the easy interface is implemented as a wrapper around multi - interface functions. This makes everything multi interface. - - `Curl_multi` is the multi handle struct exposed as `CURLM *` in external - APIs. - - This struct holds a list of `Curl_easy` structs that have been added to this - handle with [`curl_multi_add_handle()`][13]. The start of the list is - `->easyp` and `->num_easy` is a counter of added `Curl_easy`s. - - `->msglist` is a linked list of messages to send back when - [`curl_multi_info_read()`][14] is called. Basically a node is added to that - list when an individual `Curl_easy`'s transfer has completed. - - `->hostcache` points to the name cache. It is a hash table for looking up - name to IP. The nodes have a limited life time in there and this cache is - meant to reduce the time for when the same name is wanted within a short - period of time. - - `->timetree` points to a tree of `Curl_easy`s, sorted by the remaining time - until it should be checked - normally some sort of timeout. Each `Curl_easy` - has one node in the tree. - - `->sockhash` is a hash table to allow fast lookups of socket descriptor for - which `Curl_easy` uses that descriptor. This is necessary for the - `multi_socket` API. - - `->conn_cache` points to the connection cache. It keeps track of all - connections that are kept after use. The cache has a maximum size. - - `->closure_handle` is described in the `connectdata` section. - - The libcurl source code generally use the name `multi` for the variable that - points to the `Curl_multi` struct. - - -## Curl_handler - - Each unique protocol that is supported by libcurl needs to provide at least - one `Curl_handler` struct. It defines what the protocol is called and what - functions the main code should call to deal with protocol specific issues. - In general, there's a source file named `[protocol].c` in which there's a - `struct Curl_handler Curl_handler_[protocol]` declared. In `url.c` there's - then the main array with all individual `Curl_handler` structs pointed to - from a single array which is scanned through when a URL is given to libcurl - to work with. - - The concrete function pointer prototypes can be found in `lib/urldata.h`. - - `->scheme` is the URL scheme name, usually spelled out in uppercase. That's - "HTTP" or "FTP" etc. SSL versions of the protocol need their own - `Curl_handler` setup so HTTPS separate from HTTP. - - `->setup_connection` is called to allow the protocol code to allocate - protocol specific data that then gets associated with that `Curl_easy` for - the rest of this transfer. It gets freed again at the end of the transfer. - It will be called before the `connectdata` for the transfer has been - selected/created. Most protocols will allocate its private `struct - [PROTOCOL]` here and assign `Curl_easy->req.p.[protocol]` to it. - - `->connect_it` allows a protocol to do some specific actions after the TCP - connect is done, that can still be considered part of the connection phase. - - Some protocols will alter the `connectdata->recv[]` and - `connectdata->send[]` function pointers in this function. - - `->connecting` is similarly a function that keeps getting called as long as - the protocol considers itself still in the connecting phase. - - `->do_it` is the function called to issue the transfer request. What we call - the DO action internally. If the DO is not enough and things need to be kept - getting done for the entire DO sequence to complete, `->doing` is then - usually also provided. Each protocol that needs to do multiple commands or - similar for do/doing need to implement their own state machines (see SCP, - SFTP, FTP). Some protocols (only FTP and only due to historical reasons) has - a separate piece of the DO state called `DO_MORE`. - - `->doing` keeps getting called while issuing the transfer request command(s) - - `->done` gets called when the transfer is complete and DONE. That's after the - main data has been transferred. - - `->do_more` gets called during the `DO_MORE` state. The FTP protocol uses - this state when setting up the second connection. - - `->proto_getsock` - `->doing_getsock` - `->domore_getsock` - `->perform_getsock` - Functions that return socket information. Which socket(s) to wait for which - I/O action(s) during the particular multi state. - - `->disconnect` is called immediately before the TCP connection is shutdown. - - `->readwrite` gets called during transfer to allow the protocol to do extra - reads/writes - - `->attach` attaches a transfer to the connection. - - `->defport` is the default report TCP or UDP port this protocol uses - - `->protocol` is one or more bits in the `CURLPROTO_*` set. The SSL versions - have their "base" protocol set and then the SSL variation. Like - "HTTP|HTTPS". - - `->flags` is a bitmask with additional information about the protocol that will - make it get treated differently by the generic engine: - - - `PROTOPT_SSL` - will make it connect and negotiate SSL - - - `PROTOPT_DUAL` - this protocol uses two connections - - - `PROTOPT_CLOSEACTION` - this protocol has actions to do before closing the - connection. This flag is no longer used by code, yet still set for a bunch - of protocol handlers. - - - `PROTOPT_DIRLOCK` - "direction lock". The SSH protocols set this bit to - limit which "direction" of socket actions that the main engine will - concern itself with. - - - `PROTOPT_NONETWORK` - a protocol that doesn't use network (read `file:`) - - - `PROTOPT_NEEDSPWD` - this protocol needs a password and will use a default - one unless one is provided - - - `PROTOPT_NOURLQUERY` - this protocol can't handle a query part on the URL - (?foo=bar) - - -## conncache - - Is a hash table with connections for later re-use. Each `Curl_easy` has a - pointer to its connection cache. Each multi handle sets up a connection - cache that all added `Curl_easy`s share by default. - - -## Curl_share - - The libcurl share API allocates a `Curl_share` struct, exposed to the - external API as `CURLSH *`. - - The idea is that the struct can have a set of its own versions of caches and - pools and then by providing this struct in the `CURLOPT_SHARE` option, those - specific `Curl_easy`s will use the caches/pools that this share handle - holds. - - Then individual `Curl_easy` structs can be made to share specific things - that they otherwise wouldn't, such as cookies. - - The `Curl_share` struct can currently hold cookies, DNS cache and the SSL - session cache. - - -## CookieInfo - - This is the main cookie struct. It holds all known cookies and related - information. Each `Curl_easy` has its own private `CookieInfo` even when - they are added to a multi handle. They can be made to share cookies by using - the share API. - - -[1]: https://curl.se/libcurl/c/curl_easy_setopt.html -[2]: https://curl.se/libcurl/c/curl_easy_init.html -[3]: https://c-ares.org/ -[4]: https://tools.ietf.org/html/rfc7230 "RFC 7230" -[5]: https://curl.se/libcurl/c/CURLOPT_ACCEPT_ENCODING.html -[6]: https://curl.se/docs/manpage.html#--compressed -[7]: https://curl.se/libcurl/c/curl_multi_socket_action.html -[8]: https://curl.se/libcurl/c/curl_multi_timeout.html -[9]: https://curl.se/libcurl/c/curl_multi_setopt.html -[10]: https://curl.se/libcurl/c/CURLMOPT_TIMERFUNCTION.html -[11]: https://curl.se/libcurl/c/curl_multi_perform.html -[12]: https://curl.se/libcurl/c/curl_multi_fdset.html -[13]: https://curl.se/libcurl/c/curl_multi_add_handle.html -[14]: https://curl.se/libcurl/c/curl_multi_info_read.html -[15]: https://tools.ietf.org/html/rfc7231#section-3.1.2.2 diff --git a/trunk/libs/libcurl/curl-7.x/docs/KNOWN_BUGS b/trunk/libs/libcurl/curl-7.x/docs/KNOWN_BUGS index ed944fb3..976cf325 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/KNOWN_BUGS +++ b/trunk/libs/libcurl/curl-7.x/docs/KNOWN_BUGS @@ -7,9 +7,9 @@ Known Bugs These are problems and bugs known to exist at the time of this release. Feel -free to join in and help us correct one or more of these! Also be sure to +free to join in and help us correct one or more of these. Also be sure to check the changelog of the current development status, as one or more of these -problems may have been fixed or changed somewhat since this was written! +problems may have been fixed or changed somewhat since this was written. 1. HTTP 1.2 Multiple methods in a single WWW-Authenticate: header @@ -18,22 +18,23 @@ problems may have been fixed or changed somewhat since this was written! 1.5 Expect-100 meets 417 1.6 Unnecessary close when 401 received waiting for 100 1.7 Deflate error after all content was received - 1.8 DoH isn't used for all name resolves when enabled + 1.8 DoH is not used for all name resolves when enabled 1.11 CURLOPT_SEEKFUNCTION not called with CURLFORM_STREAM 2. TLS 2.1 CURLINFO_SSL_VERIFYRESULT has limited support 2.2 DER in keychain 2.3 Unable to use PKCS12 certificate with Secure Transport - 2.4 Secure Transport won't import PKCS#12 client certificates without a password + 2.4 Secure Transport will not import PKCS#12 client certificates without a password 2.5 Client cert handling with Issuer DN differs between backends 2.6 CURL_GLOBAL_SSL 2.7 Client cert (MTLS) issues with Schannel 2.8 Schannel disable CURLOPT_SSL_VERIFYPEER and verify hostname - 2.9 TLS session cache doesn't work with TFO + 2.9 TLS session cache does not work with TFO 2.10 Store TLS context per transfer instead of per connection 2.11 Schannel TLS 1.2 handshake bug in old Windows versions 2.12 FTPS with Schannel times out file list operation + 2.13 CURLOPT_CERTINFO results in CURLE_OUT_OF_MEMORY with Schannel 2.14 Secure Transport disabling hostname validation also disables SNI 2.15 Renegotiate from server may cause hang for OpenSSL backend @@ -53,27 +54,31 @@ problems may have been fixed or changed somewhat since this was written! 5.2 curl-config --libs contains private details 5.3 curl compiled on OSX 10.13 failed to run on OSX 10.10 5.4 Build with statically built dependency - 5.5 can't handle Unicode arguments in non-Unicode builds on Windows + 5.5 cannot handle Unicode arguments in non-Unicode builds on Windows + 5.6 make distclean loops forever 5.7 Visual Studio project gaps 5.8 configure finding libs in wrong directory 5.9 Utilize Requires.private directives in libcurl.pc - 5.10 SMB tests fail with Python 2 + 5.10 curl hangs on SMB upload over stdin 5.11 configure --with-gssapi with Heimdal is ignored on macOS 5.12 flaky Windows CI builds + 5.13 long paths are not fully supported on Windows + 5.14 Windows Unicode builds use homedir in current locale 6. Authentication 6.1 NTLM authentication and unicode 6.2 MIT Kerberos for Windows build 6.3 NTLM in system context uses wrong name 6.4 Negotiate and Kerberos V5 need a fake user name - 6.5 NTLM doesn't support password with § character + 6.5 NTLM does not support password with § character 6.6 libcurl can fail to try alternatives with --proxy-any - 6.7 Don't clear digest for single realm + 6.7 Do not clear digest for single realm 6.8 RTSP authentication breaks without redirect support 6.9 SHA-256 digest not supported in Windows SSPI builds 6.10 curl never completes Negotiate over HTTP 6.11 Negotiate on Windows fails - 6.12 Can't use Secure Transport with Crypto Token Kit + 6.12 cannot use Secure Transport with Crypto Token Kit + 6.13 Negotiate against Hadoop HDFS 7. FTP 7.1 FTP without or slow 220 response @@ -87,15 +92,17 @@ problems may have been fixed or changed somewhat since this was written! 7.9 Passive transfer tries only one IP address 7.10 FTPS needs session reuse 7.11 FTPS upload data loss with TLS 1.3 + 7.12 FTPS directory listing hangs on Windows with Schannel 8. TELNET - 8.1 TELNET and time limitations don't work + 8.1 TELNET and time limitations do not work 8.2 Microsoft telnet server 9. SFTP and SCP - 9.1 SFTP doesn't do CURLOPT_POSTQUOTE correct - 9.2 wolfssh: publickey auth doesn't work + 9.1 SFTP does not do CURLOPT_POSTQUOTE correct + 9.2 wolfssh: publickey auth does not work 9.3 Remote recursive folder creation with SFTP + 9.4 libssh blocking and infinite loop problem 10. SOCKS 10.3 FTPS over SOCKS @@ -104,17 +111,15 @@ problems may have been fixed or changed somewhat since this was written! 11. Internals 11.1 Curl leaks .onion hostnames in DNS 11.2 error buffer not set if connection to multiple addresses fails - 11.3 Disconnects don't do verbose + 11.3 Disconnects do not do verbose 11.4 HTTP test server 'connection-monitor' problems 11.5 Connection information when using TCP Fast Open - 11.6 slow connect to localhost on Windows 11.7 signal-based resolver timeouts 11.8 DoH leaks memory after followlocation - 11.9 DoH doesn't inherit all transfer options + 11.9 DoH does not inherit all transfer options 11.10 Blocking socket operations in non-blocking API 11.11 A shared connection cache is not thread-safe 11.12 'no_proxy' string-matches IPv6 numerical addresses - 11.13 wakeup socket disconnect causes havoc 11.14 Multi perform hangs waiting for threaded resolver 11.15 CURLOPT_OPENSOCKETPAIRFUNCTION is missing 11.16 libcurl uses renames instead of locking for atomic operations @@ -122,11 +127,12 @@ problems may have been fixed or changed somewhat since this was written! 12. LDAP 12.1 OpenLDAP hangs after returning results 12.2 LDAP on Windows does authentication wrong? - 12.3 LDAP on Windows doesn't work + 12.3 LDAP on Windows does not work 12.4 LDAPS with NSS is slow 13. TCP/IP 13.1 --interface for ipv6 binds to unusable IP address + 13.2 Trying local ports fails on Windows 14. DICT 14.1 DICT responses show the underlying protocol @@ -141,30 +147,26 @@ problems may have been fixed or changed somewhat since this was written! 15.7 generated .pc file contains strange entries 15.8 libcurl.pc uses absolute library paths 15.9 cert paths autodetected when cross-compiling - 15.10 libspsl is not supported + 15.10 libpsl is not supported 15.11 ExternalProject_Add does not set CURL_CA_PATH 15.12 cannot enable LDAPS on Windows 15.13 CMake build with MIT Kerberos does not work + 15.14 cmake build is not thread-safe 16. Applications - 16.1 pulseUI VPN client 17. HTTP/2 17.1 Excessive HTTP/2 packets with TCP_NODELAY 17.2 HTTP/2 frames while in the connection pool kill reuse 17.3 ENHANCE_YOUR_CALM causes infinite retries 17.4 Connection failures with parallel HTTP/2 + 17.5 HTTP/2 connections through HTTPS proxy frequently stall 18. HTTP/3 18.1 If the HTTP/3 server closes connection during upload curl hangs - 18.2 Uploading HTTP/3 files gets interrupted at certain file sizes - 18.3 HTTP/3 download is 5x times slower than HTTP/2 - 18.4 Downloading with HTTP/3 produces broken files - 18.5 HTTP/3 download with quiche halts after a while - 18.6 HTTP/3 multipart POST with quiche fails - 18.7 HTTP/3 quiche upload large file fails - 18.8 HTTP/3 doesn't support client certs - 18.9 connection migration doesn't work + 18.2 Transfer closed with n bytes remaining to read + 18.4 timeout when reusing a http3 connection + 18.9 connection migration does not work ============================================================================== @@ -193,12 +195,12 @@ problems may have been fixed or changed somewhat since this was written! something beyond ascii but currently libcurl will only pass in the verbatim string the app provides. There are several browsers that already do this encoding. The key seems to be the updated draft to RFC2231: - https://tools.ietf.org/html/draft-reschke-rfc2231-in-http-02 + https://datatracker.ietf.org/doc/html/draft-reschke-rfc2231-in-http-02 1.5 Expect-100 meets 417 If an upload using Expect: 100-continue receives an HTTP 417 response, it - ought to be automatically resent without the Expect:. A workaround is for + ought to be automatically resent without the Expect:. A workaround is for the client application to redo the transfer after disabling Expect:. https://curl.se/mail/archive-2008-02/0043.html @@ -210,18 +212,18 @@ problems may have been fixed or changed somewhat since this was written! 1.7 Deflate error after all content was received - There's a situation where we can get an error in a HTTP response that is + There's a situation where we can get an error in an HTTP response that is compressed, when that error is detected after all the actual body contents have been received and delivered to the application. This is tricky, but is ultimately a broken server. See https://github.com/curl/curl/issues/2719 -1.8 DoH isn't used for all name resolves when enabled +1.8 DoH is not used for all name resolves when enabled Even if DoH is specified to be used, there are some name resolves that are done without it. This should be fixed. When the internal function - `Curl_resolver_wait_resolv()` is called, it doesn't use DoH to complete the + `Curl_resolver_wait_resolv()` is called, it does not use DoH to complete the resolve as it otherwise should. See https://github.com/curl/curl/pull/3857 and @@ -229,14 +231,13 @@ problems may have been fixed or changed somewhat since this was written! 1.11 CURLOPT_SEEKFUNCTION not called with CURLFORM_STREAM - I'm using libcurl to POST form data using a FILE* with the CURLFORM_STREAM - option of curl_formadd(). I've noticed that if the connection drops at just - the right time, the POST is reattempted without the data from the file. It - seems like the file stream position isn't getting reset to the beginning of - the file. I found the CURLOPT_SEEKFUNCTION option and set that with a - function that performs an fseek() on the FILE*. However, setting that didn't - seem to fix the issue or even get called. See - https://github.com/curl/curl/issues/768 + When using libcurl to POST form data using a FILE* with the CURLFORM_STREAM + option of curl_formadd(). I notice that if the connection drops at just the + right time, the POST is reattempted without the data from the file. It seems + like the file stream position is not getting reset to the beginning of the + file. I found the CURLOPT_SEEKFUNCTION option and set that with a function + that performs an fseek() on the FILE*. However, setting that did not seem to + fix the issue or even get called. See https://github.com/curl/curl/issues/768 2. TLS @@ -248,14 +249,14 @@ problems may have been fixed or changed somewhat since this was written! 2.2 DER in keychain - Curl doesn't recognize certificates in DER format in keychain, but it works + Curl does not recognize certificates in DER format in keychain, but it works with PEM. https://curl.se/bug/view.cgi?id=1065 2.3 Unable to use PKCS12 certificate with Secure Transport See https://github.com/curl/curl/issues/5403 -2.4 Secure Transport won't import PKCS#12 client certificates without a password +2.4 Secure Transport will not import PKCS#12 client certificates without a password libcurl calls SecPKCS12Import with the PKCS#12 client certificate, but that function rejects certificates that do not have a password. @@ -263,7 +264,7 @@ problems may have been fixed or changed somewhat since this was written! 2.5 Client cert handling with Issuer DN differs between backends - When the specified client certificate doesn't match any of the + When the specified client certificate does not match any of the server-specified DNs, the OpenSSL and GnuTLS backends behave differently. The github discussion may contain a solution. @@ -287,7 +288,7 @@ problems may have been fixed or changed somewhat since this was written! get "good" random) so applications trying to avoid the init for performance reasons would do wrong anyway - D) never very carefully documented so all this mostly just happened to work + D) not documented carefully so all this mostly just happened to work for some users However, in spite of the problems with the feature, there were some users who @@ -307,7 +308,7 @@ problems may have been fixed or changed somewhat since this was written! https://github.com/curl/curl/issues/3284 -2.9 TLS session cache doesn't work with TFO +2.9 TLS session cache does not work with TFO See https://github.com/curl/curl/issues/4301 @@ -335,6 +336,10 @@ problems may have been fixed or changed somewhat since this was written! expires." - the same command line seems to work with other TLS backends and other operating systems. See https://github.com/curl/curl/issues/5284. +2.13 CURLOPT_CERTINFO results in CURLE_OUT_OF_MEMORY with Schannel + + https://github.com/curl/curl/issues/8741 + 2.14 Secure Transport disabling hostname validation also disables SNI SNI is the hostname that is sent by the TLS library to the server as part of @@ -355,7 +360,7 @@ problems may have been fixed or changed somewhat since this was written! handshake, curl has sent an HTTP request to the server and at the same time the server has sent a TLS hello request (renegotiate) to curl. Both are waiting for the other to respond. OpenSSL is supposed to send a handshake - response but doesn't. + response but does not. https://github.com/curl/curl/issues/6785 https://github.com/openssl/openssl/issues/14722 @@ -382,7 +387,7 @@ problems may have been fixed or changed somewhat since this was written! 3.4 AUTH PLAIN for SMTP is not working on all servers - Specifying "--login-options AUTH=PLAIN" on the command line doesn't seem to + Specifying "--login-options AUTH=PLAIN" on the command line does not seem to work correctly. See https://github.com/curl/curl/issues/4080 @@ -391,7 +396,7 @@ problems may have been fixed or changed somewhat since this was written! 4.1 -J and -O with %-encoded file names - -J/--remote-header-name doesn't decode %-encoded file names. RFC6266 details + -J/--remote-header-name does not decode %-encoded file names. RFC6266 details how it should be done. The can of worm is basically that we have no charset handling in curl and ascii >=128 is a challenge for us. Not to mention that decoding also means that we need to check for nastiness that is attempted, @@ -399,25 +404,25 @@ problems may have been fixed or changed somewhat since this was written! embedded slashes should be cut off. https://curl.se/bug/view.cgi?id=1294 - -O also doesn't decode %-encoded names, and while it has even less + -O also does not decode %-encoded names, and while it has even less information about the charset involved the process is similar to the -J case. - Note that we won't add decoding to -O without the user asking for it with + Note that we will not add decoding to -O without the user asking for it with some other means as well, since -O has always been documented to use the name exactly as specified in the URL. 4.2 -J with -C - fails When using -J (with -O), automatically resumed downloading together with "-C - -" fails. Without -J the same command line works! This happens because the + -" fails. Without -J the same command line works. This happens because the resume logic is worked out before the target file name (and thus its - pre-transfer size) has been figured out! + pre-transfer size) has been figured out. https://curl.se/bug/view.cgi?id=1169 4.3 --retry and transfer timeouts If using --retry and the transfer timeouts (possibly due to using -m or - -y/-Y) the next attempt doesn't resume the transfer properly from what was + -y/-Y) the next attempt does not resume the transfer properly from what was downloaded in the previous attempt but will truncate and restart at the original position where it was at before the previous failed attempt. See https://curl.se/mail/lib-2008-01/0080.html and Mandriva bug report @@ -465,19 +470,26 @@ problems may have been fixed or changed somewhat since this was written! We welcome help to improve curl's ability to link with static libraries, but it is likely a task that we can never fully support. -5.5 can't handle Unicode arguments in non-Unicode builds on Windows +5.5 cannot handle Unicode arguments in non-Unicode builds on Windows - If a URL or filename can't be encoded using the user's current codepage then + If a URL or filename cannot be encoded using the user's current codepage then it can only be encoded properly in the Unicode character set. Windows uses UTF-16 encoding for Unicode and stores it in wide characters, however curl and libcurl are not equipped for that at the moment except when built with - _UNICODE and UNICODE defined. And, except for Cygwin, Windows can't use UTF-8 + _UNICODE and UNICODE defined. And, except for Cygwin, Windows cannot use UTF-8 as a locale. https://curl.se/bug/?i=345 https://curl.se/bug/?i=731 https://curl.se/bug/?i=3747 +5.6 make distclean loops forever + + Due to an issue (probably) in automake, "make distclean" can end up in a + never-ending loop. + + See https://github.com/curl/curl/issues/7716 + 5.7 Visual Studio project gaps The Visual Studio projects lack some features that the autoconf and nmake @@ -502,7 +514,7 @@ problems may have been fixed or changed somewhat since this was written! This can make subsequent checks for libraries wrongly detect another installation in a directory that was previously added to LDFLAGS by another - library check! + library check. A possibly better way to do these checks would be to keep the pristine LDFLAGS even after successful checks and instead add those verified paths to a @@ -513,11 +525,9 @@ problems may have been fixed or changed somewhat since this was written! https://github.com/curl/curl/issues/864 -5.10 SMB tests fail with Python 2 - - The error message says "TreeConnectAndX not found". +5.10 curl hangs on SMB upload over stdin - See https://github.com/curl/curl/issues/5983 + See https://github.com/curl/curl/issues/7896 5.11 configure --with-gssapi with Heimdal is ignored on macOS @@ -528,13 +538,32 @@ problems may have been fixed or changed somewhat since this was written! 5.12 flaky Windows CI builds We run many CI builds for each commit and PR on github, and especially a - number of the Windows builds are very flaky. This means that we rarely get - all CI builds go green and complete without errors. This is very unfortunate - as it makes us sometimes miss actual build problems and it is surprising to - newcomers to the project who (rightfully) don't expect this. + number of the Windows builds are flaky. This means that we rarely get all CI + builds go green and complete without errors. This is unfortunate as it makes + us sometimes miss actual build problems and it is surprising to newcomers to + the project who (rightfully) do not expect this. See https://github.com/curl/curl/issues/6972 +5.13 long paths are not fully supported on Windows + + curl on Windows cannot access long paths (paths longer than 260 characters). + However, as a workaround, the Windows path prefix \\?\ which disables all path + interpretation may work to allow curl to access the path. For example: + \\?\c:\longpath. + + See https://github.com/curl/curl/issues/8361 + +5.14 Windows Unicode builds use homedir in current locale + + The Windows Unicode builds of curl use the current locale, but expect Unicode + UTF-8 encoded paths for internal use such as open, access and stat. The user's + home directory is retrieved via curl_getenv in the current locale and not as + UTF-8 encoded Unicode. + + See https://github.com/curl/curl/pull/7252 and + https://github.com/curl/curl/pull/7281 + 6. Authentication 6.1 NTLM authentication and unicode @@ -563,7 +592,7 @@ problems may have been fixed or changed somewhat since this was written! 6.4 Negotiate and Kerberos V5 need a fake user name In order to get Negotiate (SPNEGO) authentication to work in HTTP or Kerberos - V5 in the e-mail protocols, you need to provide a (fake) user name (this + V5 in the email protocols, you need to provide a (fake) user name (this concerns both curl and the lib) because the code wrongly only considers authentication if there's a user name provided by setting conn->bits.user_passwd in url.c https://curl.se/bug/view.cgi?id=440 How? @@ -572,7 +601,7 @@ problems may have been fixed or changed somewhat since this was written! new conn->bits.want_authentication which is set when any of the authentication options are set. -6.5 NTLM doesn't support password with § character +6.5 NTLM does not support password with § character https://github.com/curl/curl/issues/2120 @@ -582,12 +611,12 @@ problems may have been fixed or changed somewhat since this was written! authentication will cause libcurl to abort trying other options if the failed method has a higher preference than the alternatives. As an example, --proxy-any against a proxy which advertise Negotiate and NTLM, but which - fails to set up Kerberos authentication won't proceed to try authentication + fails to set up Kerberos authentication will not proceed to try authentication using NTLM. https://github.com/curl/curl/issues/876 -6.7 Don't clear digest for single realm +6.7 Do not clear digest for single realm https://github.com/curl/curl/issues/3267 @@ -613,27 +642,31 @@ problems may have been fixed or changed somewhat since this was written! 6.10 curl never completes Negotiate over HTTP - Apparently it isn't working correctly...? + Apparently it is not working correctly...? See https://github.com/curl/curl/issues/5235 6.11 Negotiate on Windows fails - When using --negotiate (or NTLM) with curl on Windows, SSL/TSL handshake + When using --negotiate (or NTLM) with curl on Windows, SSL/TLS handshake fails despite having a valid kerberos ticket cached. Works without any issue in Unix/Linux. https://github.com/curl/curl/issues/5881 -6.12 Can't use Secure Transport with Crypto Token Kit +6.12 cannot use Secure Transport with Crypto Token Kit https://github.com/curl/curl/issues/7048 +6.13 Negotiate authentication against Hadoop HDFS + + https://github.com/curl/curl/issues/8264 + 7. FTP 7.1 FTP without or slow 220 response - If a connection is made to a FTP server but the server then just never sends + If a connection is made to an FTP server but the server then just never sends the 220 response or otherwise is dead slow, libcurl will not acknowledge the connection timeout during that phase but only the "real" timeout - which may surprise users as it is probably considered to be the connect phase to most @@ -644,7 +677,7 @@ problems may have been fixed or changed somewhat since this was written! When doing FTP over a socks proxy or CONNECT through HTTP proxy and the multi interface is used, libcurl will fail if the (passive) TCP connection for the - data transfer isn't more or less instant as the code does not properly wait + data transfer is not more or less instant as the code does not properly wait for the connect to be confirmed. See test case 564 for a first shot at a test case. @@ -657,19 +690,19 @@ problems may have been fixed or changed somewhat since this was written! 7.4 FTP with ACCT When doing an operation over FTP that requires the ACCT command (but not when - logging in), the operation will fail since libcurl doesn't detect this and + logging in), the operation will fail since libcurl does not detect this and thus fails to issue the correct command: https://curl.se/bug/view.cgi?id=635 7.5 ASCII FTP - FTP ASCII transfers do not follow RFC959. They don't convert the data + FTP ASCII transfers do not follow RFC959. They do not convert the data accordingly (not for sending nor for receiving). RFC 959 section 3.1.1.1 clearly describes how this should be done: The sender converts the data from an internal character representation to the standard 8-bit NVT-ASCII representation (see the Telnet - specification). The receiver will convert the data from the standard + specification). The receiver will convert the data from the standard form to his own internal form. Since 7.15.4 at least line endings are converted. @@ -677,19 +710,19 @@ problems may have been fixed or changed somewhat since this was written! 7.6 FTP with NULs in URL parts FTP URLs passed to curl may contain NUL (0x00) in the RFC 1738 , - , and components, encoded as "%00". The problem is that + , and components, encoded as "%00". The problem is that curl_unescape does not detect this, but instead returns a shortened C string. From a strict FTP protocol standpoint, NUL is a valid character within RFC 959 , so the way to handle this correctly in curl would be to use a data structure other than a plain C string, one that can handle embedded NUL - characters. From a practical standpoint, most FTP servers would not + characters. From a practical standpoint, most FTP servers would not meaningfully support NUL characters within RFC 959 , anyway (e.g., Unix pathnames may not contain NUL). 7.7 FTP and empty path parts in the URL libcurl ignores empty path parts in FTP URLs, whereas RFC1738 states that - such parts should be sent to the server as 'CWD ' (without an argument). The + such parts should be sent to the server as 'CWD ' (without an argument). The only exception to this rule, is that we knowingly break this if the empty part is first in the path, as then we use the double slashes to indicate that the user wants to reach the root dir (this exception SHALL remain even when @@ -699,12 +732,12 @@ problems may have been fixed or changed somewhat since this was written! When 'multi_done' is called before the transfer has been completed the normal way, it is considered a "premature" transfer end. In this situation, libcurl - closes the connection assuming it doesn't know the state of the connection so - it can't be reused for subsequent requests. + closes the connection assuming it does not know the state of the connection so + it cannot be reused for subsequent requests. - With FTP however, this isn't necessarily true but there are a bunch of + With FTP however, this is not necessarily true but there are a bunch of situations (listed in the ftp_done code) where it *could* keep the connection - alive even in this situation - but the current code doesn't. Fixing this would + alive even in this situation - but the current code does not. Fixing this would allow libcurl to reuse FTP connections better. 7.9 Passive transfer tries only one IP address @@ -733,7 +766,7 @@ problems may have been fixed or changed somewhat since this was written! message. When curl closes the upload connection if unread data has been received (such as a TLS handshake message) then the TCP protocol sends an RST to the server, which may cause the server to discard or truncate the - upload if it hasn't read all sent data yet, and then return an error to curl + upload if it has not read all sent data yet, and then return an error to curl on the control channel connection. Since 7.78.0 this is mostly fixed. curl will do a single read before closing @@ -743,11 +776,15 @@ problems may have been fixed or changed somewhat since this was written! https://github.com/curl/curl/issues/6149 +7.12 FTPS directory listing hangs on Windows with Schannel + + https://github.com/curl/curl/issues/9161 + 8. TELNET -8.1 TELNET and time limitations don't work +8.1 TELNET and time limitations do not work - When using telnet, the time limitation options don't work. + When using telnet, the time limitation options do not work. https://curl.se/bug/view.cgi?id=846 8.2 Microsoft telnet server @@ -758,7 +795,7 @@ problems may have been fixed or changed somewhat since this was written! 9. SFTP and SCP -9.1 SFTP doesn't do CURLOPT_POSTQUOTE correct +9.1 SFTP does not do CURLOPT_POSTQUOTE correct When libcurl sends CURLOPT_POSTQUOTE commands when connected to a SFTP server using the multi interface, the commands are not being sent correctly and @@ -767,10 +804,10 @@ problems may have been fixed or changed somewhat since this was written! report but it cannot be accepted as-is. See https://curl.se/bug/view.cgi?id=748 -9.2 wolfssh: publickey auth doesn't work +9.2 wolfssh: publickey auth does not work When building curl to use the wolfSSH backend for SFTP, the publickey - authentication doesn't work. This is simply functionality not written for curl + authentication does not work. This is simply functionality not written for curl yet, the necessary API for make this work is provided by wolfSSH. See https://github.com/curl/curl/issues/4820 @@ -778,20 +815,28 @@ problems may have been fixed or changed somewhat since this was written! 9.3 Remote recursive folder creation with SFTP On this servers, the curl fails to create directories on the remote server - even when CURLOPT_FTP_CREATE_MISSING_DIRS option is set. + even when the CURLOPT_FTP_CREATE_MISSING_DIRS option is set. See https://github.com/curl/curl/issues/5204 +9.4 libssh blocking and infinite loop problem + + In the SSH_SFTP_INIT state for libssh, the ssh session working mode is set to + blocking mode. If the network is suddenly disconnected during sftp + transmission, curl will be stuck, even if curl is configured with a timeout. + + https://github.com/curl/curl/issues/8632 + 10. SOCKS 10.3 FTPS over SOCKS - libcurl doesn't support FTPS over a SOCKS proxy. + libcurl does not support FTPS over a SOCKS proxy. 10.4 active FTP over a SOCKS - libcurl doesn't support active FTP over a SOCKS proxy + libcurl does not support active FTP over a SOCKS proxy 11. Internals @@ -800,7 +845,7 @@ problems may have been fixed or changed somewhat since this was written! Curl sends DNS requests for hostnames with a .onion TLD. This leaks information about what the user is attempting to access, and violates this - requirement of RFC7686: https://tools.ietf.org/html/rfc7686 + requirement of RFC7686: https://datatracker.ietf.org/doc/html/rfc7686 Issue: https://github.com/curl/curl/issues/543 @@ -811,17 +856,17 @@ problems may have been fixed or changed somewhat since this was written! CURLE_COULDNT_CONNECT. But the error buffer set by CURLOPT_ERRORBUFFER remains empty. Issue: https://github.com/curl/curl/issues/544 -11.3 Disconnects don't do verbose +11.3 Disconnects do not do verbose Due to how libcurl keeps connections alive in the "connection pool" after use to potentially transcend the life-time of the initial easy handle that was used to drive the transfer over that connection, it uses a *separate* and internal easy handle when it shuts down the connection. That separate - connection might not have the exact same settings as the original easy - handle, and in particular it is often note-worthy that it doesn't have the - same VERBOSE and debug callbacks setup so that an application will not get - the protocol data for the disconnect phase of a transfer the same way it got - all the other data. + connection might not have the same settings as the original easy handle, and + in particular it is often note-worthy that it does not have the same VERBOSE + and debug callbacks setup so that an application will not get the protocol + data for the disconnect phase of a transfer the same way it got all the other + data. This is because the original easy handle might have already been freed at that point and the application might not at all be prepared that the callback @@ -831,7 +876,7 @@ problems may have been fixed or changed somewhat since this was written! 11.4 HTTP test server 'connection-monitor' problems - The 'connection-monitor' feature of the sws HTTP test server doesn't work + The 'connection-monitor' feature of the sws HTTP test server does not work properly if some tests are run in unexpected order. Like 1509 and then 1525. See https://github.com/curl/curl/issues/868 @@ -844,20 +889,6 @@ problems may have been fixed or changed somewhat since this was written! See https://github.com/curl/curl/issues/1332 and https://github.com/curl/curl/issues/4296 -11.6 slow connect to localhost on Windows - - When connecting to "localhost" on Windows, curl will resolve the name for - both ipv4 and ipv6 and try to connect to both happy eyeballs-style. Something - in there does however make it take 200 milliseconds to succeed - which is the - HAPPY_EYEBALLS_TIMEOUT define exactly. Lowering that define speeds up the - connection, suggesting a problem in the HE handling. - - If we can *know* that we're talking to a local host, we should lower the - happy eyeballs delay timeout for IPv6 (related: hardcode the "localhost" - addresses, mentioned in TODO). Possibly we should reduce that delay for all. - - https://github.com/curl/curl/issues/2281 - 11.7 signal-based resolver timeouts libcurl built without an asynchronous resolver library uses alarm() to time @@ -874,7 +905,7 @@ problems may have been fixed or changed somewhat since this was written! https://github.com/curl/curl/issues/4592 -11.9 DoH doesn't inherit all transfer options +11.9 DoH does not inherit all transfer options Some options are not inherited because they are not relevant for the DoH SSL connections, or inheriting the option may result in unexpected behavior. For @@ -902,23 +933,11 @@ problems may have been fixed or changed somewhat since this was written! 11.12 'no_proxy' string-matches IPv6 numerical addresses - This has the downside that "::1" for example doesn't match "::0:1" even + This has the downside that "::1" for example does not match "::0:1" even though they are in fact the same address. See https://github.com/curl/curl/issues/5745 -11.13 wakeup socket disconnect causes havoc - - waking an iPad breaks the wakeup socket pair, triggering a POLLIN event and - resulting in SOCKERRNO being set to ENOTCONN. - - This condition, and other possible error conditions on the wakeup socket, are - not handled, so the condition remains on the FD and curl_multi_poll will - never block again. - - See https://github.com/curl/curl/issues/6132 and - https://github.com/curl/curl/pull/6133 - 11.14 Multi perform hangs waiting for threaded resolver If a threaded resolver takes a long time to complete, libcurl can be blocked @@ -932,7 +951,7 @@ problems may have been fixed or changed somewhat since this was written! When libcurl creates sockets with socketpair(), those are not "exposed" in CURLOPT_OPENSOCKETFUNCTION and therefore might surprise and be unknown to - applications that expects and wants all sockets known beforehand. One way to + applications that expect and want all sockets known beforehand. One way to address this issue is to introduce a CURLOPT_OPENSOCKETPAIRFUNCTION callback. https://github.com/curl/curl/issues/5747 @@ -971,7 +990,7 @@ problems may have been fixed or changed somewhat since this was written! https://github.com/curl/curl/issues/3116 -12.3 LDAP on Windows doesn't work +12.3 LDAP on Windows does not work A simple curl command line getting "ldap://ldap.forumsys.com" returns an error that says "no memory" ! @@ -987,16 +1006,24 @@ problems may have been fixed or changed somewhat since this was written! 13.1 --interface for ipv6 binds to unusable IP address Since IPv6 provides a lot of addresses with different scope, binding to an - IPv6 address needs to take the proper care so that it doesn't bind to a + IPv6 address needs to take the proper care so that it does not bind to a locally scoped address as that is bound to fail. https://github.com/curl/curl/issues/686 +13.2 Trying local ports fails on Windows + + This makes '--local-port [range]' to not work since curl can't properly + detect if a port is already in use, so it'll try the first port, use that and + then subsequently fail anyway if that was actually in use. + + https://github.com/curl/curl/issues/8112 + 14. DICT 14.1 DICT responses show the underlying protocol - When getting a DICT response, the protocol parts of DICT aren't stripped off + When getting a DICT response, the protocol parts of DICT are not stripped off from the output. https://github.com/curl/curl/issues/1809 @@ -1018,13 +1045,13 @@ problems may have been fixed or changed somewhat since this was written! 15.4 build docs/curl.1 - The cmake build doesn't create the docs/curl.1 file and therefor must rely on + The cmake build does not create the docs/curl.1 file and therefore must rely on it being there already. This makes the --manual option not work and test - cases like 1139 can't function. + cases like 1139 cannot function. 15.5 build on Linux links libcurl to libdl - ... which it shouldn't need to! + ... which it should not need to! See https://github.com/curl/curl/issues/6165 @@ -1054,7 +1081,7 @@ problems may have been fixed or changed somewhat since this was written! See https://github.com/curl/curl/issues/6178 -15.10 libspsl is not supported +15.10 libpsl is not supported See https://github.com/curl/curl/issues/6214 @@ -1072,7 +1099,7 @@ problems may have been fixed or changed somewhat since this was written! 15.13 CMake build with MIT Kerberos does not work Minimum CMake version was bumped in curl 7.71.0 (#5358) Since CMake 3.2 - try_compile started respecting the CMAKE_EXE_FLAGS. The code dealing with + try_compile started respecting the CMAKE_EXE_FLAGS. The code dealing with MIT Kerberos detection sets few variables to potentially weird mix of space, and ;-separated flags. It had to blow up at some point. All the CMake checks that involve compilation are doomed from that point, the configured tree @@ -1080,20 +1107,16 @@ problems may have been fixed or changed somewhat since this was written! https://github.com/curl/curl/issues/6904 -16. Applications +15.14 cmake build is not thread-safe -16.1 pulseUI VPN client + The cmake build does not check for and verify presence of a working Atomic + type, which then makes curl_global_init() to not build thread-safe on + non-Windows platforms. - This application crashes at startup with libcurl 7.74.0 (and presumably later - versions too) after we cleaned up OpenSSL initialization. Since this is the - only known application to do this, we suspect it is related to something they - are doing in their setup that isn't kosher. We have not been able to get in - contact with them nor got any technical details to help us debug this - further. + Bug: https://github.com/curl/curl/issues/8973 + Partial fix: https://github.com/curl/curl/pull/8982 - See - https://community.pulsesecure.net/t5/Pulse-Desktop-Clients/Linux-Pulse-Client-does-not-work-with-curl-7-74/m-p/44378 - and https://github.com/curl/curl/issues/6306 +16. Applications 17. HTTP/2 @@ -1128,6 +1151,9 @@ problems may have been fixed or changed somewhat since this was written! See https://github.com/curl/curl/issues/5611 +17.5 HTTP/2 connections through HTTPS proxy frequently stall + + See https://github.com/curl/curl/issues/6936 18. HTTP/3 @@ -1135,36 +1161,19 @@ problems may have been fixed or changed somewhat since this was written! See https://github.com/curl/curl/issues/6606 -18.2 Uploading HTTP/3 files gets interrupted at certain file sizes - - See https://github.com/curl/curl/issues/6510 - -18.3 HTTP/3 download is 5x times slower than HTTP/2 - - See https://github.com/curl/curl/issues/6494 - -18.4 Downloading with HTTP/3 produces broken files - - See https://github.com/curl/curl/issues/7351 - -18.5 HTTP/3 download with quiche halts after a while - - See https://github.com/curl/curl/issues/7339 - -18.6 HTTP/3 multipart POST with quiche fails - - https://github.com/curl/curl/issues/7125 +18.2 Transfer closed with n bytes remaining to read -18.7 HTTP/3 quiche upload large file fails + HTTP/3 transfers with the Jetty HTTP/3 server seem to not work. - https://github.com/curl/curl/issues/7532 + https://github.com/curl/curl/issues/8523 -18.8 HTTP/3 doesn't support client certs +18.4 timeout when reusing a http3 connection - aka "mutual authentication". + HTTP/3 with quiche seems to not work and always timeout a subsequent transfer + that reuses an already established connection - https://github.com/curl/curl/issues/7625 + https://github.com/curl/curl/issues/8764 -18.9 connection migration doesn't work +18.9 connection migration does not work https://github.com/curl/curl/issues/7695 diff --git a/trunk/libs/libcurl/curl-7.x/docs/MAIL-ETIQUETTE b/trunk/libs/libcurl/curl-7.x/docs/MAIL-ETIQUETTE index 80d06b64..ccd3e01f 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/MAIL-ETIQUETTE +++ b/trunk/libs/libcurl/curl-7.x/docs/MAIL-ETIQUETTE @@ -25,7 +25,7 @@ MAIL ETIQUETTE 2.5 HTML is not for mails 2.6 Quoting 2.7 Digest - 2.8 Please Tell Us How You Solved The Problem! + 2.8 Please Tell Us How You Solved The Problem ============================================================================== @@ -39,13 +39,13 @@ MAIL ETIQUETTE Each mailing list is targeted to a specific set of users and subjects, please use the one or the ones that suit you the most. - Each mailing list has hundreds up to thousands of readers, meaning that - each mail sent will be received and read by a very large number of people. - People from various cultures, regions, religions and continents. + Each mailing list has hundreds up to thousands of readers, meaning that each + mail sent will be received and read by a large number of people. People + from various cultures, regions, religions and continents. 1.2 Netiquette - Netiquette is a common term for how to behave on the internet. Of course, in + Netiquette is a common term for how to behave on the Internet. Of course, in each particular group and subculture there will be differences in what is acceptable and what is considered good manners. @@ -80,7 +80,7 @@ MAIL ETIQUETTE 1.5 Moderation of new posters Several of the curl mailing lists automatically make all posts from new - subscribers be moderated. This means that after you've subscribed and + subscribers be moderated. This means that after you have subscribed and sent your first mail to a list, that mail will not be let through to the list until a mailing list administrator has verified that it is OK and permits it to get posted. @@ -105,18 +105,18 @@ MAIL ETIQUETTE messages" No matter what, we NEVER EVER respond to trolls or spammers on the list. If - you believe the list admin should do something in particular, contact him/her + you believe the list admin should do something in particular, contact them off-list. The subject will be taken care of as much as possible to prevent repeated offenses, but responding on the list to such messages never leads to anything good and only puts the light even more on the offender: which was the entire purpose of it getting sent to the list in the first place. - Don't feed the trolls! + Do not feed the trolls. 1.7 How to unsubscribe You can unsubscribe the same way you subscribed in the first place. You go - to the page for the particular mailing list you're subscribed to and you enter + to the page for the particular mailing list you are subscribed to and you enter your email address and password and press the unsubscribe button. Also, the instructions to unsubscribe are included in the headers of every @@ -129,27 +129,27 @@ MAIL ETIQUETTE 1.8 I posted, now what? - If you aren't subscribed with the exact same email address that you used to - send the email, your post will just be silently discarded. + If you are not subscribed with the same email address that you used to send + the email, your post will just be silently discarded. If you posted for the first time to the mailing list, you first need to wait - for an administrator to allow your email to go through (moderated). This normally - happens very quickly but in case we're asleep, you may have to wait a few - hours. + for an administrator to allow your email to go through (moderated). This + normally happens quickly but in case we are asleep, you may have to wait a + few hours. Once your email goes through it is sent out to several hundred or even - thousands of recipients. Your email may cover an area that not that many people - know about or are interested in. Or possibly the person who knows about it - is on vacation or under a very heavy work load right now. You may have to wait - for a response and you should not expect to get a response at all, but - hopefully you get an answer within a couple of days. + thousands of recipients. Your email may cover an area that not that many + people know about or are interested in. Or possibly the person who knows + about it is on vacation or under a heavy work load right now. You may have + to wait for a response and you should not expect to get a response at all. + Ideally, you get an answer within a couple of days. You do yourself and all of us a service when you include as many details as possible already in your first email. Mention your operating system and - environment. Tell us which curl version you're using and tell us what you + environment. Tell us which curl version you are using and tell us what you did, what happened and what you expected would happen. Preferably, show us - what you did with details enough to allow others to help point out the problem - or repeat the same steps in their locations. + what you did with details enough to allow others to help point out the + problem or repeat the steps in their locations. Failing to include details will only delay responses and make people respond and ask for more details and you will have to send a follow-up email that @@ -194,8 +194,8 @@ MAIL ETIQUETTE Many mail programs and web archivers use information within mails to keep them together as "threads", as collections of posts that discuss a certain - subject. If you don't intend to reply on the same or similar subject, don't - just hit reply on an existing mail and change subject, create a new mail. + subject. If you do not intend to reply on the same or similar subject, do not + just hit reply on an existing mail and change the subject, create a new mail. 2.2 Reply to the List @@ -203,7 +203,7 @@ MAIL ETIQUETTE reply" or "reply to all", and not just reply to the author of the single mail you reply to. - We're actively discouraging replying back to the single person by setting + We are actively discouraging replying back to the single person by setting the Reply-To: field in outgoing mails back to the mailing list address, making it harder for people to mail the author directly, if only by mistake. @@ -215,7 +215,7 @@ MAIL ETIQUETTE 2.4 Do Not Top-Post - If you reply to a message, don't use top-posting. Top-posting is when you + If you reply to a message, do not use top-posting. Top-posting is when you write the new text at the top of a mail and you insert the previous quoted mail conversation below. It forces users to read the mail in a backwards order to properly understand it. @@ -225,7 +225,7 @@ MAIL ETIQUETTE A: Because it messes up the order in which people normally read text. Q: Why is top-posting such a bad thing? A: Top-posting. - Q: What is the most annoying thing in e-mail? + Q: What is the most annoying thing in email? Apart from the screwed up read order (especially when mixed together in a thread when someone responds using the mandated bottom-posting style), it @@ -233,13 +233,13 @@ MAIL ETIQUETTE When you reply to a mail. You let the mail client insert the previous mail quoted. Then you put the cursor on the first line of the mail and you move - down through the mail, deleting all parts of the quotes that don't add + down through the mail, deleting all parts of the quotes that do not add context for your comments. When you want to add a comment you do so, inline, right after the quotes that relate to your comment. Then you continue downwards again. - When most of the quotes have been removed and you've added your own words, - you're done! + When most of the quotes have been removed and you have added your own words, + you are done. 2.5 HTML is not for mails @@ -268,7 +268,7 @@ MAIL ETIQUETTE Change the subject name to something sensible and related to the subject, preferably even the actual subject of the single mail you wanted to reply to - 2.8 Please Tell Us How You Solved The Problem! + 2.8 Please Tell Us How You Solved The Problem Many people mail questions to the list, people spend some of their time and make an effort in providing good answers to these questions. @@ -277,9 +277,9 @@ MAIL ETIQUETTE one of the hints was what solved your problems. The guys who write answers feel good to know that they provided a good answer and that you fixed the problem. Far too often, the person who asked the question is never heard from - again, and we never get to know if he/she is gone because the problem was - solved or perhaps because the problem was unsolvable! + again, and we never get to know if they are gone because the problem was + solved or perhaps because the problem was unsolvable. Getting the solution posted also helps other users that experience the same problem(s). They get to see (possibly in the web archives) that the - suggested fixes actually has helped at least one person. + suggested fixes actually have helped at least one person. diff --git a/trunk/libs/libcurl/curl-7.x/docs/MQTT.md b/trunk/libs/libcurl/curl-7.x/docs/MQTT.md index aad2f522..0f034f72 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/MQTT.md +++ b/trunk/libs/libcurl/curl-7.x/docs/MQTT.md @@ -24,4 +24,4 @@ Remaining limitations: - Only QoS level 0 is implemented for publish - No way to set retain flag for publish - No TLS (mqtts) support - - Naive EAGAIN handling won't handle split messages + - Naive EAGAIN handling will not handle split messages diff --git a/trunk/libs/libcurl/curl-7.x/docs/Makefile.am b/trunk/libs/libcurl/curl-7.x/docs/Makefile.am index 656d1ace..0959ac59 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/Makefile.am +++ b/trunk/libs/libcurl/curl-7.x/docs/Makefile.am @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ # 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 no-dependencies @@ -31,7 +33,7 @@ GENHTMLPAGES = curl.html curl-config.html mk-ca-bundle.html PDFPAGES = curl.pdf curl-config.pdf mk-ca-bundle.pdf MANDISTPAGES = curl.1.dist curl-config.1.dist -HTMLPAGES = $(GENHTMLPAGES) index.html +HTMLPAGES = $(GENHTMLPAGES) # Build targets in this file (.) before cmdline-opts to ensure that # the curl.1 rule below runs first @@ -57,7 +59,6 @@ EXTRA_DIST = \ CURL-DISABLE.md \ DEPRECATE.md \ DYNBUF.md \ - ECH.md \ EXPERIMENTAL.md \ FAQ \ FEATURES.md \ diff --git a/trunk/libs/libcurl/curl-7.x/docs/Makefile.in b/trunk/libs/libcurl/curl-7.x/docs/Makefile.in index 52ea860e..56deef81 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/Makefile.in +++ b/trunk/libs/libcurl/curl-7.x/docs/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.4 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2021 Free Software Foundation, Inc. @@ -21,7 +21,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -34,6 +34,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### VPATH = @srcdir@ am__is_gnu_make = { \ @@ -111,15 +113,13 @@ build_triplet = @build@ host_triplet = @host@ subdir = docs ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compile_check_sizeof.m4 \ - $(top_srcdir)/m4/curl-amissl.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/curl-amissl.m4 \ $(top_srcdir)/m4/curl-bearssl.m4 \ $(top_srcdir)/m4/curl-compilers.m4 \ $(top_srcdir)/m4/curl-confopts.m4 \ $(top_srcdir)/m4/curl-functions.m4 \ $(top_srcdir)/m4/curl-gnutls.m4 \ - $(top_srcdir)/m4/curl-mbedtls.m4 \ - $(top_srcdir)/m4/curl-mesalink.m4 $(top_srcdir)/m4/curl-nss.m4 \ + $(top_srcdir)/m4/curl-mbedtls.m4 $(top_srcdir)/m4/curl-nss.m4 \ $(top_srcdir)/m4/curl-openssl.m4 \ $(top_srcdir)/m4/curl-override.m4 \ $(top_srcdir)/m4/curl-reentrant.m4 \ @@ -153,11 +153,11 @@ am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ -am__v_at_1 = +am__v_at_1 = depcomp = am__maybe_remake_depfiles = SOURCES = @@ -301,6 +301,7 @@ CURL_DISABLE_TFTP = @CURL_DISABLE_TFTP@ CURL_LT_SHLIB_VERSIONED_FLAVOUR = @CURL_LT_SHLIB_VERSIONED_FLAVOUR@ CURL_NETWORK_AND_TIME_LIBS = @CURL_NETWORK_AND_TIME_LIBS@ CURL_NETWORK_LIBS = @CURL_NETWORK_LIBS@ +CURL_PLIST_VERSION = @CURL_PLIST_VERSION@ CURL_WITH_MULTI_SSL = @CURL_WITH_MULTI_SSL@ CYGPATH_W = @CYGPATH_W@ DEFAULT_SSL_BACKEND = @DEFAULT_SSL_BACKEND@ @@ -318,6 +319,7 @@ ENABLE_STATIC = @ENABLE_STATIC@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FISH_FUNCTIONS_DIR = @FISH_FUNCTIONS_DIR@ GCOV = @GCOV@ GREP = @GREP@ @@ -393,12 +395,13 @@ USE_LIBRTMP = @USE_LIBRTMP@ USE_LIBSSH = @USE_LIBSSH@ USE_LIBSSH2 = @USE_LIBSSH2@ USE_MBEDTLS = @USE_MBEDTLS@ -USE_MESALINK = @USE_MESALINK@ +USE_MSH3 = @USE_MSH3@ USE_NGHTTP2 = @USE_NGHTTP2@ USE_NGHTTP3 = @USE_NGHTTP3@ USE_NGTCP2 = @USE_NGTCP2@ USE_NGTCP2_CRYPTO_GNUTLS = @USE_NGTCP2_CRYPTO_GNUTLS@ USE_NGTCP2_CRYPTO_OPENSSL = @USE_NGTCP2_CRYPTO_OPENSSL@ +USE_NGTCP2_CRYPTO_WOLFSSL = @USE_NGTCP2_CRYPTO_WOLFSSL@ USE_NSS = @USE_NSS@ USE_OPENLDAP = @USE_OPENLDAP@ USE_QUICHE = @USE_QUICHE@ @@ -465,7 +468,6 @@ runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ -subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ @@ -481,7 +483,7 @@ dist_man_MANS = curl-config.1 GENHTMLPAGES = curl.html curl-config.html mk-ca-bundle.html PDFPAGES = curl.pdf curl-config.pdf mk-ca-bundle.pdf MANDISTPAGES = curl.1.dist curl-config.1.dist -HTMLPAGES = $(GENHTMLPAGES) index.html +HTMLPAGES = $(GENHTMLPAGES) # Build targets in this file (.) before cmdline-opts to ensure that # the curl.1 rule below runs first @@ -505,7 +507,6 @@ EXTRA_DIST = \ CURL-DISABLE.md \ DEPRECATE.md \ DYNBUF.md \ - ECH.md \ EXPERIMENTAL.md \ FAQ \ FEATURES.md \ @@ -900,7 +901,6 @@ uninstall-man: uninstall-man1 .PRECIOUS: Makefile - # $(abs_builddir) is to disable VPATH when searching for this file, which # would otherwise find the copy in $(srcdir) which breaks the $(HUGE) # rule in src/Makefile.am in out-of-tree builds that references the file in the diff --git a/trunk/libs/libcurl/curl-7.x/docs/NEW-PROTOCOL.md b/trunk/libs/libcurl/curl-7.x/docs/NEW-PROTOCOL.md index 9984eea2..9a145181 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/NEW-PROTOCOL.md +++ b/trunk/libs/libcurl/curl-7.x/docs/NEW-PROTOCOL.md @@ -5,7 +5,7 @@ another protocol to curl. After all, curl already supports 25 something protocols and it is the Internet transfer machine for the world. In the curl project we love protocols and we love supporting many protocols -and do it well. +and doing it well. So how do you proceed to add a new protocol and what are the requirements? @@ -23,7 +23,7 @@ that supporting this protocol is a grand idea. curl is not here for your protocol. Your protocol is not here for curl. The best cooperation and end result occur when all involved parties mutually see and agree that supporting this protocol in curl would be good for everyone. -Heck, for the world! +Heck, for the world. Consider "selling us" the idea that we need an implementation merged in curl, to be fairly important. *Why* do we want curl to support this new protocol? @@ -48,7 +48,7 @@ you are up for a tough argument. ### URL There should be a documented URL format. If there is an RFC for it there is no -question about it but the syntax doesn't have to be a published RFC. It could +question about it but the syntax does not have to be a published RFC. It could be enough if it is already in use by other implementations. If you make up the syntax just in order to be able to propose it to curl, then @@ -80,7 +80,7 @@ As much of the protocol implementation as possible needs to be verified by curl test cases. We must have the implementation get tested by CI jobs, torture tests and more. -We've experienced many times in the past how new implementations were brought +We have experienced many times in the past how new implementations were brought to curl and immediately once the code had been merged, the originator vanished from the face of the earth. That is fine, but we need to take the necessary precautions so when it happens we are still fine. @@ -90,8 +90,8 @@ protocol - but it might require a bit of an effort to make it happen. ## Documentation -We cannot assume that users are particularly familiar with specific details -and peculiarities of the protocol. It needs documentation. +We cannot assume that users are particularly familiar with details and +peculiarities of the protocol. It needs documentation. Maybe it even needs some internal documentation so that the developers who will try to debug something five years from now can figure out functionality a @@ -100,11 +100,11 @@ little easier! The protocol specification itself should be freely available without requiring any NDA or similar. -## Don't compare +## Do not compare We are constantly raising the bar and we are constantly improving the project. A lot of things we did in the past would not be acceptable if done -today. Therefore, you might be tempted to use shortcuts or "hacks" you can +today. Therefore, you might be tempted to use shortcuts or "hacks" you can spot other - existing - protocol implementations have used, but there is -nothing to gain from that. The bar has been raised. Former "cheats" won't be +nothing to gain from that. The bar has been raised. Former "cheats" will not be tolerated anymore. diff --git a/trunk/libs/libcurl/curl-7.x/docs/PARALLEL-TRANSFERS.md b/trunk/libs/libcurl/curl-7.x/docs/PARALLEL-TRANSFERS.md index da688ea0..325e64f9 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/PARALLEL-TRANSFERS.md +++ b/trunk/libs/libcurl/curl-7.x/docs/PARALLEL-TRANSFERS.md @@ -40,7 +40,7 @@ Example: Connections are shared fine between different easy handles, but the "authentication contexts" are not. So for example doing HTTP Digest auth with one handle for a particular transfer and then continue on with another handle -that reuses the same connection, the second handle can't send the necessary +that reuses the same connection, the second handle cannot send the necessary Authorization header at once since the context is only kept in the original easy handle. @@ -49,7 +49,7 @@ share API as well, as a context per origin + path (realm?) basically. Visible in test 153, 1412 and more. -## Feedback! +## Feedback This is early days for parallel transfer support. Keep your eyes open for unintended side effects or downright bugs. diff --git a/trunk/libs/libcurl/curl-7.x/docs/README.md b/trunk/libs/libcurl/curl-7.x/docs/README.md index 07838504..b72d8bc4 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/README.md +++ b/trunk/libs/libcurl/curl-7.x/docs/README.md @@ -2,11 +2,11 @@ # Documentation -You'll find a mix of various documentation in this directory and +you will find a mix of various documentation in this directory and subdirectories, using several different formats. Some of them are not ideal for reading directly in your browser. -If you'd rather see the rendered version of the documentation, check out the +If you would rather see the rendered version of the documentation, check out the curl website's [documentation section](https://curl.se/docs/) for general curl stuff or the [libcurl section](https://curl.se/libcurl/) for libcurl related documentation. diff --git a/trunk/libs/libcurl/curl-7.x/docs/RELEASE-PROCEDURE.md b/trunk/libs/libcurl/curl-7.x/docs/RELEASE-PROCEDURE.md index 26d5dedb..65c02f91 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/RELEASE-PROCEDURE.md +++ b/trunk/libs/libcurl/curl-7.x/docs/RELEASE-PROCEDURE.md @@ -95,18 +95,12 @@ Coming dates Based on the description above, here are some planned release dates (at the time of this writing): -- September 15, 2021 (7.79.0) -- November 10, 2021 -- January 5, 2022 -- March 2, 2022 -- April 27, 2022 -- June 22, 2022 -- August 17, 2022 -- October 12, 2022 -- December 7, 2022 -- February 1, 2023 -- March 20, 2023 (8.0.0) - -The above (and more) curl-related dates are published in -[iCalendar format](https://calendar.google.com/calendar/ical/c9u5d64odop9js55oltfarjk6g%40group.calendar.google.com/public/basic.ics) -as well. +- May 11, 2022 (7.83.1) +- July 1, 2022 +- August 31, 2022 +- October 25, 2022 +- December 21, 2022 +- February 15, 2023 (last version 7 release, no feature window after) +- March 20, 2023 (8.0.0 - curl 25 years) +- April 17, 2023 +- July 12, 2023 diff --git a/trunk/libs/libcurl/curl-7.x/docs/ROADMAP.md b/trunk/libs/libcurl/curl-7.x/docs/ROADMAP.md index 79e8b03a..e48c21b5 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/ROADMAP.md +++ b/trunk/libs/libcurl/curl-7.x/docs/ROADMAP.md @@ -14,7 +14,7 @@ eventually remove the "experimental" label from this functionality. As a DNS version of alt-svc and also a pre-requisite for ECH (see below). -See: https://tools.ietf.org/html/draft-ietf-dnsop-svcb-https-02 +See: https://datatracker.ietf.org/doc/html/draft-ietf-dnsop-svcb-https-02 ## ECH (Encrypted Client Hello - formerly known as ESNI) diff --git a/trunk/libs/libcurl/curl-7.x/docs/RUSTLS.md b/trunk/libs/libcurl/curl-7.x/docs/RUSTLS.md index ecce4300..4b49b5cf 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/RUSTLS.md +++ b/trunk/libs/libcurl/curl-7.x/docs/RUSTLS.md @@ -3,7 +3,7 @@ [Rustls is a TLS backend written in Rust.](https://docs.rs/rustls/). Curl can be built to use it as an alternative to OpenSSL or other TLS backends. We use the [rustls-ffi C bindings](https://github.com/rustls/rustls-ffi/). This -version of curl depends on version v0.7.0 of rustls-ffi. +version of curl depends on version v0.8.2 of rustls-ffi. # Building with rustls @@ -12,7 +12,7 @@ First, [install Rust](https://rustup.rs/). Next, check out, build, and install the appropriate version of rustls-ffi: % cargo install cbindgen - % git clone https://github.com/rustls/rustls-ffi -b v0.7.0 + % git clone https://github.com/rustls/rustls-ffi -b v0.8.2 % cd rustls-ffi % make % make DESTDIR=${HOME}/rustls-ffi-built/ install @@ -21,6 +21,6 @@ Now configure and build curl with rustls: % git clone https://github.com/curl/curl % cd curl - % ./buildconf + % autoreconf -fi % ./configure --with-rustls=${HOME}/rustls-ffi-built % make diff --git a/trunk/libs/libcurl/curl-7.x/docs/SECURITY-PROCESS.md b/trunk/libs/libcurl/curl-7.x/docs/SECURITY-PROCESS.md index 383d0c07..efa47e15 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/SECURITY-PROCESS.md +++ b/trunk/libs/libcurl/curl-7.x/docs/SECURITY-PROCESS.md @@ -1,11 +1,9 @@ -curl security process -===================== +# curl security process This document describes how security vulnerabilities should be handled in the curl project. -Publishing Information ----------------------- +## Publishing Information All known and public curl or libcurl related vulnerabilities are listed on [the curl website security page](https://curl.se/docs/security.html). @@ -13,13 +11,12 @@ All known and public curl or libcurl related vulnerabilities are listed on Security vulnerabilities **should not** be entered in the project's public bug tracker. -Vulnerability Handling ----------------------- +## Vulnerability Handling The typical process for handling a new security vulnerability is as follows. No information should be made public about a vulnerability until it is -formally announced at the end of this process. That means, for example that a +formally announced at the end of this process. That means, for example, that a bug tracker entry must NOT be created to track the issue since that will make the issue public and it should not be discussed on any of the project's public mailing lists. Also messages associated with any commits should not make any @@ -38,11 +35,12 @@ announcement. that a human has seen the report. - The security team investigates the report and either rejects it or accepts - it. + it. See below for examples of problems that are not considered + vulnerabilities. - If the report is rejected, the team writes to the reporter to explain why. -- If the report is accepted, the team writes to the reporter to let him/her +- If the report is accepted, the team writes to the reporter to let them know it is accepted and that they are working on a fix. - The security team discusses the problem, works out a fix, considers the @@ -68,7 +66,7 @@ announcement. should ideally contain the CVE number. - The security team also decides on and delivers a monetary reward to the - reporter as per the bug-bounty polices. + reporter as per the bug-bounty policies. - No more than 10 days before release, inform [distros@openwall](https://oss-security.openwall.org/wiki/mailing-lists/distros) @@ -92,24 +90,22 @@ announcement. - The security web page on the website should get the new vulnerability mentioned. -security (at curl dot se) ------------------------------- +## security (at curl dot se) This is a private mailing list for discussions on and about curl security issues. Who is on this list? There are a couple of criteria you must meet, and then we -might ask you to join the list or you can ask to join it. It really isn't very -formal. We basically only require that you have a long-term presence in the -curl project and you have shown an understanding for the project and its way -of working. You must've been around for a good while and you should have no -plans in vanishing in the near future. +might ask you to join the list or you can ask to join it. It really is not a +formal process. We basically only require that you have a long-term presence +in the curl project and you have shown an understanding for the project and +its way of working. You must have been around for a good while and you should +have no plans of vanishing in the near future. We do not make the list of participants public mostly because it tends to vary somewhat over time and a list somewhere will only risk getting outdated. -Publishing Security Advisories ------------------------------- +## Publishing Security Advisories 1. Write up the security advisory, using markdown syntax. Use the same subtitles as last time to maintain consistency. @@ -119,23 +115,100 @@ Publishing Security Advisories 3. Add a line on the top of the array in `curl-www/docs/vuln.pm'. 4. Put the new advisory markdown file in the curl-www/docs/ directory. Add it - to the git repo. + to the git repository. 5. Run `make` in your local web checkout and verify that things look fine. 6. On security advisory release day, push the changes on the curl-www repository's remote master branch. -Hackerone ---------- +## Hackerone Request the issue to be disclosed. If there are sensitive details present in the report and discussion, those should be redacted from the disclosure. The default policy is to disclose as much as possible as soon as the vulnerability has been published. -Bug Bounty ----------- +## Bug Bounty See [BUG-BOUNTY](https://curl.se/docs/bugbounty.html) for details on the bug bounty program. + +# Not security issues + +This is an incomplete list of issues that are not considered vulnerabilities. + +## Small memory leaks + +We do not consider a small memory leak a security problem; even if the amount +of allocated memory grows by a small amount every now and then. Long-living +applications and services already need to have counter-measures and deal with +growing memory usage, be it leaks or just increased use. A small memory or +resource leak is then expected to *not* cause a security problem. + +Of course there can be a discussion if a leak is small or not. A large leak +can be considered a security problem due to the DOS risk. If leaked memory +contains sensitive data it might also qualify as a security problem. + +## Never-ending transfers + +We do not consider flaws that cause a transfer to never end to be a security +problem. There are already several benign and likely reasons for transfers to +stall and never end, so applications that cannot deal with never-ending +transfers already need to have counter-measures established. + +If the problem avoids the regular counter-measures when it causes a never- +ending transfer, it might very well be a security problem. + +## Not practically possible + +If the flaw or vulnerability cannot practically get executed on existing +hardware it is not a security problem. + +## API misuse + +If a reported issue only triggers by an application using the API in a way +that is not documented to work or even documented to not work, it is probably +not going to be considered a security problem. We only guarantee secure and +proper functionality when the APIs are used as expected and documented. + +There can be a discussion about what the documentation actually means and how +to interpret the text, which might end up with us still agreeing that it is a +security problem. + +## Local attackers already present + +When an issue can only be attacked or misused by an attacker present on the +local system or network, the bar is raised. If a local user wrongfully has +elevated rights on your system enough to attack curl, they can probably +already do much worse harm and the problem is not really in curl. + +## Experiments + +Vulnerabilities in features which are off by default (in the build) and +documented as experimental, are not eligible for a reward and we do not +consider them security problems. + +## URL inconsistencies + +URL parser inconsistencies between browsers and curl are expected and are not +considered security vulnerabilities. The WHATWG URL Specification and RFC +3986+ (the plus meaning that it is an extended version) [are not completely +interoperable](https://github.com/bagder/docs/blob/master/URL-interop.md). + +Obvious parser bugs can still be vulnerabilities of course. + +## Visible command line arguments + +The curl command blanks the contents of a number of command line arguments to +prevent them from appearing in process listings. It does not blank all +arguments even if some of them that are not blanked might contain sensitive +data. We consider this functionality a best-effort and omissions are not +security vulnerabilities. + + - not all systems allow the arguments to be blanked in the first place + - since curl blanks the argument itself they will be readable for a short + moment in time no matter what + - virtually every argument can contain sensitive data, depending on use + - blanking all arguments would make it impractical for users to differentiate + curl command lines in process listings diff --git a/trunk/libs/libcurl/curl-7.x/docs/SSL-PROBLEMS.md b/trunk/libs/libcurl/curl-7.x/docs/SSL-PROBLEMS.md index 54f98534..4afe3001 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/SSL-PROBLEMS.md +++ b/trunk/libs/libcurl/curl-7.x/docs/SSL-PROBLEMS.md @@ -11,7 +11,7 @@ ago. There are several known reasons why a connection that involves SSL might - fail. This is a document that attempts to details the most common ones and + fail. This is a document that attempts to detail the most common ones and how to mitigate them. ## CA certs @@ -24,12 +24,12 @@ When using said CA bundle to verify a server cert, you will experience problems if your CA store does not contain the certificates for the - intermediates if the server doesn't provide them. + intermediates if the server does not provide them. The TLS protocol mandates that the intermediate certificates are sent in the handshake, but as browsers have ways to survive or work around such omissions, missing intermediates in TLS handshakes still happen that - browser-users won't notice. + browser-users will not notice. Browsers work around this problem in two ways: they cache intermediate certificates from previous transfers and some implement the TLS "AIA" @@ -51,7 +51,7 @@ ## Ciphers - Clients give servers a list of ciphers to select from. If the list doesn't + Clients give servers a list of ciphers to select from. If the list does not include any ciphers the server wants/can use, the connection handshake fails. @@ -70,13 +70,13 @@ References: - https://tools.ietf.org/html/draft-popov-tls-prohibiting-rc4-01 + https://datatracker.ietf.org/doc/html/draft-popov-tls-prohibiting-rc4-01 ## Allow BEAST BEAST is the name of a TLS 1.0 attack that surfaced 2011. When adding means to mitigate this attack, it turned out that some broken servers out there in - the wild didn't work properly with the BEAST mitigation in place. + the wild did not work properly with the BEAST mitigation in place. To make such broken servers work, the --ssl-allow-beast option was introduced. Exactly as it sounds, it re-introduces the BEAST vulnerability @@ -89,7 +89,7 @@ depending on the OS or build configuration. The --ssl-no-revoke option was introduced in 7.44.0 to disable revocation checking but currently is only supported for Schannel (the native Windows SSL library), with an exception - in the case of Windows' Untrusted Publishers block list which it seems can't + in the case of Windows' Untrusted Publishers block list which it seems cannot be bypassed. This option may have broader support to accommodate other SSL backends in the future. diff --git a/trunk/libs/libcurl/curl-7.x/docs/SSLCERTS.md b/trunk/libs/libcurl/curl-7.x/docs/SSLCERTS.md index 415b540a..ec57f41c 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/SSLCERTS.md +++ b/trunk/libs/libcurl/curl-7.x/docs/SSLCERTS.md @@ -13,7 +13,7 @@ Native SSL If libcurl was built with Schannel or Secure Transport support (the native SSL libraries included in Windows and Mac OS X), then this does not apply to you. Scroll down for details on how the OS-native engines handle SSL -certificates. If you're not sure, then run "curl -V" and read the results. If +certificates. If you are not sure, then run "curl -V" and read the results. If the version string says `Schannel` in it, then it was built with Schannel support. @@ -22,19 +22,19 @@ It is about trust This system is about trust. In your local CA certificate store you have certs from *trusted* Certificate Authorities that you then can use to verify that the -server certificates you see are valid. They're signed by one of the CAs you +server certificates you see are valid. they are signed by one of the CAs you trust. Which CAs do you trust? You can decide to trust the same set of companies your -operating system trusts, or the set one of the known browsers trust. That's +operating system trusts, or the set one of the known browsers trust. That is basically trust via someone else you trust. You should just be aware that modern operating systems and browsers are setup to trust *hundreds* of -companies and recent years several such CAs have been found untrustworthy. +companies and in recent years several such CAs have been found untrustworthy. Certificate Verification ------------------------ -libcurl performs peer SSL certificate verification by default. This is done +libcurl performs peer SSL certificate verification by default. This is done by using a CA certificate store that the SSL library can use to make sure the peer's server certificate is valid. @@ -42,8 +42,8 @@ If you communicate with HTTPS, FTPS or other TLS-using servers using certificates that are signed by CAs present in the store, you can be sure that the remote server really is the one it claims to be. -If the remote server uses a self-signed certificate, if you don't install a CA -cert store, if the server uses a certificate signed by a CA that isn't +If the remote server uses a self-signed certificate, if you do not install a CA +cert store, if the server uses a certificate signed by a CA that is not included in the store you use or if the remote host is an impostor impersonating your favorite site, and you want to transfer files from this server, do one of the following: @@ -63,8 +63,8 @@ server, do one of the following: store. The default CA certificate store can be changed at compile time with the following configure options: - --with-ca-bundle=FILE: use the specified file as CA certificate store. CA - certificates need to be concatenated in PEM format into this file. + --with-ca-bundle=FILE: use the specified file as the CA certificate store. + CA certificates need to be concatenated in PEM format into this file. --with-ca-path=PATH: use the specified path as CA certificate store. CA certificates need to be stored as individual PEM files in this directory. @@ -103,11 +103,11 @@ server, do one of the following: certificate store or use it stand-alone as described. Just remember that the security is no better than the way you obtained the certificate. - 4. If you're using the curl command line tool, you can specify your own CA + 4. If you are using the curl command line tool, you can specify your own CA cert file by setting the environment variable `CURL_CA_BUNDLE` to the path of your choice. - If you're using the curl command line tool on Windows, curl will search + If you are using the curl command line tool on Windows, curl will search for a CA cert file named "curl-ca-bundle.crt" in these directories and in this order: 1. application's directory @@ -122,7 +122,7 @@ server, do one of the following: way for you: [CA Extract](https://curl.se/docs/caextract.html) Neglecting to use one of the above methods when dealing with a server using a -certificate that isn't signed by one of the certificates in the installed CA +certificate that is not signed by one of the certificates in the installed CA certificate store, will cause SSL to report an error ("certificate verify failed") during the handshake and SSL will then refuse further communication with that server. diff --git a/trunk/libs/libcurl/curl-7.x/docs/THANKS b/trunk/libs/libcurl/curl-7.x/docs/THANKS index 25aa996e..89b263a0 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/THANKS +++ b/trunk/libs/libcurl/curl-7.x/docs/THANKS @@ -6,15 +6,18 @@ 0xee on github 0xflotus on github +1337vt on github 1ocalhost on github 3dyd on github 3eka on github +8U61ife on github a1346054 on github Aaro Koskinen Aaron Oneal Aaron Orenstein Aaron Scarisbrick aasivov on github +Abhinav Singh Abram Pousada accountantM on github AceCrow on Github @@ -26,6 +29,7 @@ Adam Langley Adam Light Adam Marcionek Adam Piggott +Adam Rosenfield Adam Sampson Adam Tkac Adnan Khan @@ -82,8 +86,10 @@ Alex Suykov Alex Vinnik Alex Xu Alexander Beedie +Alexander Chuykov Alexander Dyagilev Alexander Elgert +Alexander Kanavin Alexander Klauer Alexander Kourakos Alexander Krasnostavsky @@ -94,6 +100,7 @@ Alexander Sinditskiy Alexander Traud Alexander V. Tikhonov Alexander Zhuravlev +Alexandre Bury Alexandre Pion Alexey Borzov Alexey Eremikhin @@ -138,6 +145,7 @@ Andreas Rieke Andreas Roth Andreas Schneider Andreas Schuldei +Andreas Sommer Andreas Streichardt Andreas Wurf Andrei Benea @@ -167,6 +175,7 @@ Andrew Moise Andrew Potter Andrew Robbins Andrew Wansink +Andrey Alifanov Andrey Gursky Andrey Labunets Andrii Moiseiev @@ -178,16 +187,19 @@ Andy Serpa Andy Tsouladze Angus Mackay anio on github +anon00000000 on github anshnd on github Antarpreet Singh Anthon Pang Anthony Avina Anthony Bryan Anthony G. Basile +Anthony Hu Anthony Ramine Anthony Shaw Antoine Aubert Antoine Calando +Antoine Pietri Anton Bychkov Anton Gerasimov Anton Kalmykov @@ -223,6 +235,8 @@ Augustus Saunders Austin Green Avery Fay awesomenode on github +Axel Chong +Axel Morawietz Axel Tillequin Ayoub Boudhar Ayushman Singh Chauhan @@ -231,6 +245,7 @@ Bachue Zhou Balaji Parasuram Balaji S Rao Balaji Salunke +Balakrishnan Balasubramanian Balazs Kovacsics Balint Szilakszi Barry Abrahamson @@ -267,6 +282,7 @@ Benoit Neil Benoit Sigoure Bernard Leak Bernard Spil +Bernat Mut Bernd Mueller Bernhard Iselborn Bernhard M. Wiedemann @@ -275,6 +291,7 @@ Bernhard Walle Bert Huijben Bertrand Demiddelaer Bertrand Simonnet +beslick5 on github Bevan Weiss Bill Doyle Bill Egert @@ -282,6 +299,7 @@ Bill Hoffman Bill Middlecamp Bill Nagel Bill Pyne +billionai on github Billyzou0741326 on github Bin Lan Bin Meng @@ -294,14 +312,18 @@ Björn Stenberg Blaise Potard Blake Burkhart bnfp on github +Bo Anderson Bob Relyea Bob Richmond Bob Schader bobmitchell1956 on github Bodo Bergmann Bogdan Nicula +Boris Rasin +Boris Verkhovskiy Brad Burdick Brad Fitzpatrick +Brad Forschinger Brad Harder Brad Hards Brad King @@ -331,6 +353,7 @@ Bru Rom Bruce Mitchener Bruce Stephens BrumBrum on hackerone +Bruno Baguette Bruno de Carvalho Bruno Grasselli Bruno Thomsen @@ -347,12 +370,14 @@ Calvin Buckley Cameron Cawley Cameron Kaiser Cameron MacMinn +Cameron Will Camille Moncelier Cao ZhenXiang Caolan McNamara Captain Basil Carie Pointer Carl Zogheib +Carlo Alberto Carlo Cannas Carlo Marcelo Arenas Belón Carlo Teubner @@ -364,9 +389,11 @@ Catalin Patulea causal-agent on github cbartl on github cclauss on github +Cering on github Cesar Eduardo Barros Chad Monroe Chandrakant Bagul +Charles Cazabon Charles Kerr Charles Romestant Chen Prog @@ -406,6 +433,7 @@ Christophe Demory Christophe Dervieux Christophe Legry Christopher Conroy +Christopher Degawa Christopher Head Christopher Palow Christopher R. Palmer @@ -432,10 +460,12 @@ coinhubs on github Colby Ranger Colin Blair Colin Hogben +Colin Leroy Colin O'Dell Colin Watson Colm Buckley Constantine Sapuntzakis +coralw on github Cory Benfield Cory Nelson Costya Shulyupin @@ -468,6 +498,7 @@ Dambaev Alexander Damian Dixon Damien Adant Damien Vielpeau +Damien Walsh Dan Becker Dan Cristian Dan Donahue @@ -492,6 +523,7 @@ Daniel Hwang Daniel Jeliński Daniel Johnson Daniel Kahn Gillmor +Daniel Katz Daniel Krügler Daniel Kurečka Daniel Lee Hwang @@ -507,6 +539,7 @@ Daniel Silverstone Daniel Steinberg Daniel Stenberg Daniel Theron +Daniel Valenzuela Daniel Woelfel Daphne Luong Dario Nieuwenhuis @@ -527,7 +560,9 @@ David Bau David Benjamin David Binderman David Blaikie +David Bohman David Byron +David Carlier David Cohen David Cook David Demelier @@ -564,6 +599,7 @@ David Walser David Woodhouse David Wright David Yan +Davide Cassioli davidedec on github dbrowndan on github dEajL3kA on github @@ -621,9 +657,11 @@ Dmitry S. Baikov Dmitry Wagin dnivras on github Dolbneff A.V +Domen Kožar Domenico Andreoli Dominick Meglio Dominik Hölzl +Dominik Thalhammer Dominique Leuenberger Don J Olmstead Dongliang Mu @@ -645,6 +683,7 @@ Duane Cathey Duncan Mac-Vicar Prett Duncan Wilcox Dustin Boswell +Dustin Howett Dusty Mabe Duy Phan Thanh Dwarakanath Yadavalli @@ -658,6 +697,7 @@ Ebe Janchivdorj ebejan on github Ebenezer Ikonne Ed Morley +Eddie Lumpkin Edgaras Janušauskas Edin Kadribasic Edmond Yu @@ -669,6 +709,7 @@ Edward Thomson Eelco Dolstra Eetu Ojanen Egon Eckert +Egor Pugin Ehren Bendler Eldar Zaitov elelel on github @@ -678,9 +719,11 @@ Elia Tufarolo Elliot Saba Ellis Pritchard Elmira A Semenova +Elms elsamuko on github emanruse on github Emanuele Bovisio +Emanuele Torre Emil Engler Emil Lerner Emil Romanus @@ -698,6 +741,7 @@ Eric Lavigne Eric Lubin Eric Melville Eric Mertens +Eric Musser Eric Rautman Eric Rescorla Eric Ridge @@ -715,6 +759,7 @@ Erik Janssen Erik Johansson Erik Minekus Erik Olsson +Erik Stenlund Ernest Beinrohr Ernst Sjöstrand Erwan Legrand @@ -727,19 +772,22 @@ Evan Jordan Evangelos Foutras Even Rouault Evert Pot -Evgeny Grin +Evgeny Grin (Karlson2k) Evgeny Turnaev eXeC64 on github Eygene Ryabinkin Eylem Ugurel +Fabian Fischer Fabian Frank Fabian Hiernaux Fabian Keil Fabian Ruff +Fabian Yamaguchi Fabrice Fontaine Fabrizio Ammollo Fahim Chandurwala Faizur Rahman +Farzin on github Fawad Mirza fds242 on github Federico Bianchi @@ -753,17 +801,21 @@ Felix von Leitner Felix Yan Feng Tu Fernando Muñoz +Filip Lundgren Filip Salomonsson Firefox OS Flameborn on github Flavio Medeiros +Florian Kohnhäuser Florian Pritz Florian Schoppmann +Florian Van Heghe Florian Weimer Florin Petriuc Forrest Cahoon Francisco Moraes Francisco Munoz +Francisco Olarte Francisco Sedano Francois Petitjean Francois Rivard @@ -778,6 +830,7 @@ Frank Van Uffelen František Kučera François Charlier François Rigault +Frazer Smith Fred Machado Fred New Fred Noz @@ -793,7 +846,9 @@ Gabriel Simmer Gabriel Sjoberg Gambit Communications Ganesh Kamath +gaoxingwang on github Garrett Holmstrom +Garrett Squire Gary Maxwell Gaurav Malhotra Gautam Kachroo @@ -802,6 +857,7 @@ Gavin Wong Gavrie Philipson Gaz Iqbal Gaël Portay +gclinch on github Gealber Morales Geeknik Labs Geoff Beier @@ -837,6 +893,8 @@ Glen Nakamura Glen Scott Glenn de boer Glenn Sheridan +Glenn Strauss +Godwin Stewart Google Inc. Gordon Marler Gorilla Maguila @@ -865,9 +923,11 @@ Gustaf Hui Gustavo Grieco Guy Poizat GwanYeong Kim +Gwen Shapira Gwenole Beauchesne Gökhan Şengün Götz Babin-Ebell +h1zzz on github H3RSKO on github Hagai Auro Haibo Huang @@ -887,9 +947,11 @@ Hao Wu Hardeep Singh Haris Okanovic Harold Stuart +Harry Sarson Harry Sintonen Harshal Pradhan Hauke Duden +Hayden Roche He Qin Heikki Korpela Heinrich Ko @@ -900,11 +962,14 @@ Helwing Lutz Hendrik Visage Henri Gomez Henrik Gaßmann +Henrik Holst Henrik Storner Henry Ludemann Henry Roeland Herve Amblard +HexTheDragon Hidemoto Nakada +highmtworks on github Himanshu Gupta Ho-chi Chen Hoi-Ho Chan @@ -922,6 +987,7 @@ huzunhao on github hydra3333 on github Hzhijun iammrtau on github +Ian Blanes Ian D Allen Ian Fette Ian Ford @@ -943,9 +1009,11 @@ Ikko Ashimine Ilguiz Latypov Ilja van Sprundel Illarion Taev +illusory-dream on github Ilya Kosarev imilli on github Immanuel Gregoire +ImpatientHippo on GitHub Inca R infinnovation-dev on github Ingmar Runge @@ -961,6 +1029,7 @@ Isaiah Norton Ishan SinghLevett Ithubg on github Ivan Avdeev +Ivan Tsybulin IvanoG on github Ivo Bellin Salarin iz8mbw on github @@ -973,10 +1042,12 @@ Jacob Barthelmeh Jacob Hoffman-Andrews Jacob Meuser Jacob Moshenko +Jacob Tolar Jactry Zeng Jad Chamcham Jaime Fullaondo jakirkham on github +Jakub Bochenski Jakub Wilk Jakub Zakrzewski James Atwill @@ -1002,10 +1073,13 @@ Jan Chren Jan Ehrhardt Jan Koen Annot Jan Kunder +Jan Mazur Jan Schaumann Jan Schmidt Jan Van Boghout +Jan Venekamp Jan Verbeek +Jan-Piet Mens JanB on github Janne Johansson Jared Jennings @@ -1026,6 +1100,7 @@ Javier G. Sogo Javier Navarro Javier Sixto Jay Austin +Jay Dommaschk Jayesh A Shah Jaz Fresh Jean Fabrice @@ -1044,11 +1119,15 @@ Jeff Hodges Jeff Johnson Jeff King Jeff Lawson +Jeff Luszcz Jeff Mears Jeff Phillips Jeff Pohlmeyer Jeff Weber +Jeffrey Tolar Jeffrey Walton +jeffrson on github +Jenny Heino Jens Finkhaeuser Jens Rantil Jens Schleusener @@ -1064,6 +1143,7 @@ Jeremy Tan Jeremy Thibault Jeroen Koekkoek Jeroen Ooms +Jerome Mao Jerome Muffat-Meridol Jerome Robert Jerome Vouillon @@ -1075,7 +1155,10 @@ Jesse Chisholm Jesse Noller Jesse Tan jethrogb on github +jhoyla on github Jie He +Jilayne Lovejoy +Jim Beveridge Jim Drash Jim Freeman Jim Fuller @@ -1121,6 +1204,7 @@ John Dennis John Dunn John E. Malmberg John Gardiner Myers +John H. Ayad John Hascall John Janssen John Joseph Bachir @@ -1169,6 +1253,7 @@ Jonathan Nieder Jonathan Watt Jonathan Wernberg Jongki Suwandi +jonny112 on github Joombalaya on github Joonas Kuorilehto Jordan Brown @@ -1181,12 +1266,13 @@ Josh Kapell Josh Soref joshhe on github Joshua Kwan +Joshua Root Joshua Swink Josie Huddleston +Josip Medved Josue Andrade Gomes José Joaquín Atria Jozef Kralik -JP Mens Juan Barreto Juan F. Codagnone Juan Ignacio Hervás @@ -1204,11 +1290,13 @@ Julian Z Julien Chaffraix Julien Nabet Julien Royer +Jun Tseng Jun-ichiro itojun Hagino Jun-ya Kato jungle-boogie on github Junho Choi Jurij Smakov +jurisuk on github Juro Bystricky Justin Clift Justin Ehlert @@ -1216,6 +1304,7 @@ Justin Fletcher Justin Karneges Justin Maggard jveazey on github +jvvprasad78 on github jzinn on github János Fekete Jérémy Rocher @@ -1227,6 +1316,7 @@ ka7 on github Kael1117 on github Kai Engert Kai Noda +Kai Pastor Kai Sommerfeld Kai-Uwe Rommel Kalle Vahlman @@ -1234,6 +1324,7 @@ Kamil Dudka Kane York Kang Lin Kang-Jin Lee +Kantanat Wannapaka Kari Pahula Karl Chen Karl Moerder @@ -1254,7 +1345,9 @@ Ken Rastatter Kenneth Davidson Kenny To Kent Boortz +Kerem Kat Keshav Krity +Kevin Adler Kevin Baughman Kevin Burke Kevin Fisk @@ -1269,6 +1362,7 @@ Kim Minjoong Kim Rinnewitz Kim Vandry Kimmo Kinnunen +Kirill Efimov Kirill Marchuk Kjell Ericson Kjetil Jacobsen @@ -1281,6 +1375,7 @@ Koichi Shiraishi kokke on github Konstantin Isakov Konstantin Kushnir +KotlinIsland on github kotoriのねこ kouzhudong on github Kovalkov Dmitrii @@ -1296,6 +1391,7 @@ Kristoffer Gleditsch Kunal Chandarana Kunal Ekawde Kurt Fankhauser +Kushal Das Kwon-Young Choi Kyle Abramowitz Kyle Edwards @@ -1328,6 +1424,8 @@ Laurie Clark-Michalek Lawrence Gripper Lawrence Matthews Lawrence Wagerfield +Leah Neukirchen +Leandro Coutinho Legoff Vincent Lehel Bernadt Leif W @@ -1342,8 +1440,11 @@ Leon Breedt Leon Winter Leonardo Rosati Leonardo Taccari +Leszek Kubik Li Xinwei Liam Healy +Liam Warfield +LigH-de on github lijian996 on github Lijo Antony lilongyan-huawei on github @@ -1356,8 +1457,10 @@ Linus Nielsen Feltzing Linus Nordberg Lior Kaplan Lisa Xu +Litter White Liviu Chircu Liza Alenchery +lllaffer on github Lloyd Fournier Lluís Batlle i Rossell locpyl-tidnyd on github @@ -1369,6 +1472,7 @@ Luca Altea Luca Boccassi Lucas Adamski Lucas Clemente Vella +Lucas Holt Lucas Pardue Lucas Servén Marín Lucas Severo @@ -1383,10 +1487,12 @@ Luke Amery Luke Call Luke Dashjr Luke Granger-Brown +luminixinc on github Luo Jinghua Luong Dinh Dung Luz Paz Luật Nguyễn +lwthiker on github Lyman Epp Lyndon Hill M.R.T on github @@ -1398,6 +1504,7 @@ Mahmoud Samir Fayed Maks Naumov Maksim Kuzevanov Maksim Stsepanenka +Malik Idrees Hasan Khan Mamoru Tasaka Mamta Upadhyay Mandy Wu @@ -1425,17 +1532,20 @@ Marcin Gryszkalis Marcin Konicki Marco Deckel Marco G. Salvagno +Marco Kamner Marco Maggi Marcos Diazr Marcus Hoffmann Marcus Klein Marcus Sundberg +Marcus T Marcus Webster Marian Klymov Mario Schroeder Mark Brand Mark Butler Mark Davies +Mark Dodgson Mark Hamilton Mark Incley Mark Karpeles @@ -1486,12 +1596,14 @@ masbug on github Massimiliano Fantuzzi Massimiliano Ziccardi Massimo Callegari +MasterInQuestion on github Mateusz Loskot Mathias Axelsson Mathias Gumz Mathieu Legare Matias N. Goldberg Mats Lidell +Mats Lindestam Matt Arsenault Matt Ford Matt Holt @@ -1500,6 +1612,7 @@ Matt McClure Matt Veenstra Matt Witherspoon Matt Wixson +Matteo Baccan Matteo Bignotti Matteo Bignottignotti Matteo Rocco @@ -1507,6 +1620,7 @@ Matthew Blain Matthew Clarke Matthew Hall Matthew Kerwin +Matthew Thompson Matthew Whitehead Matthias Bolte Matthias Gatto @@ -1520,6 +1634,7 @@ Max Dymond Max Katsev Max Kellermann Max Khon +Max Mehl Max Peal Max Savenkov Max Zettlmeißl @@ -1530,11 +1645,15 @@ Maxime Larocque Maxime Legros mbeifuss on github mccormickt12 on github +Median Median Stride +mehatzri on github Mehmet Bozkurt Mekonikum Melissa Mears +Melroy van den Berg Mert Yazıcıoğlu Mettgut Jamalla +Michael Afanasiev Michael Anti Michael Baentsch Michael Benedict @@ -1570,6 +1689,7 @@ Michael Smith Michael Stapelberg Michael Steuer Michael Stillwell +Michael Trebilcock Michael Vittiglio Michael Wallner Michal Bonino @@ -1625,6 +1745,7 @@ Mohammad Hasbini Mohammed Naser Mohun Biswas momala454 on github +Momoka Yamamoto moohoorama on github Morten Minde Neergaard Mostyn Bramley-Moore @@ -1638,6 +1759,7 @@ Muz Dima Myk Taylor Nach M. S. Nagai H +Nao Yonashiro naost3rn on github Nate Prewitt Nathan Coulter @@ -1648,6 +1770,7 @@ Nathaniel R. Lewis Nathaniel Waisbrot Naveen Chandran Naveen Noel +Neal McBurnett Neal Poole nedres on github neex on github @@ -1657,6 +1780,7 @@ Neil Bowers Neil Dunbar Neil Kolban Neil Spring +neutric on github nevv on HackerOne/curl Niall O'Reilly niallor on github @@ -1664,6 +1788,8 @@ nian6324 on github nianxuejie on github Nic Roets Nicholas Maniscalco +Nick Banks +Nick Coghlan Nick Draffen Nick Gimbrone Nick Humfrey @@ -1679,6 +1805,7 @@ Nicolas Grekas Nicolas Guillier Nicolas Morey-Chaisemartin Nicolas Sterchele +Niels Martignène Niels van Tongeren Nikita Schmidt Nikitinskit Dmitriy @@ -1687,12 +1814,14 @@ Niklas Hambüchen Nikolai Kondrashov Nikos Mavrogiannopoulos Nikos Tsipinakis +nimaje on github niner on github Ning Dong Nir Soffer Niranjan Hasabnis Nis Jorgensen nk +Noam Moshe NobodyXu on github Nobuhiro Ban Nodak Sodak @@ -1702,6 +1831,7 @@ Norbert Kett Norbert Novotny nosajsnikta on github NTMan on Github +Nuru on github Octavio Schroeder Ofer Okhin Vasilij @@ -1717,17 +1847,20 @@ Oli Kingshott Oliver Gondža Oliver Graute Oliver Kuckertz +Oliver Roberts Oliver Schindler Oliver Urbann Olivier Berger Olivier Brunel Omar Ramadan omau on github +opensignature on github Orange Tsai Oren Souroujon Oren Tirosh Orgad Shaneh Ori Avtalion +orycho on github osabc on github Oscar Koeroo Oscar Norlander @@ -1790,6 +1923,7 @@ Pavel Volgarev Pavol Markovic Pawel A. Gajda Pawel Kierski +Paweł Kowalski Paweł Wegner Pedro Larroy Pedro Monreal @@ -1840,6 +1974,7 @@ Phil Lisiecki Phil Pellouchoud Philip Craig Philip Gladstone +Philip H Philip Langdale Philip Prindeville Philipp Klaus Krause @@ -1855,6 +1990,7 @@ Pierre Joye Pierre Yager Pierre Ynard Pierre-Yves Bigourdan +Pierrick Charron Piotr Dobrogost Piotr Komborski Po-Chuan Hsieh @@ -1864,6 +2000,8 @@ Poul T Lomholt Pramod Sharma Prash Dush Praveen Pvs +Prithvi MK +privetryan on github Priyanka Shah Przemysław Tomaszewski pszemus on github @@ -1874,6 +2012,7 @@ Quagmire Quanah Gibson-Mount Quentin Balland Quinn Slack +r-a-sattarov on github R. Dennis Steed Radek Zajic Radoslav Georgiev @@ -1883,6 +2022,7 @@ Rafael Antonio Rafael Sagula Rafayel Mkrtchyan Rafaël Carré +Rafał Mikrut Rainer Canavan Rainer Jung Rainer Koenig @@ -1902,6 +2042,7 @@ Randy Armstrong Randy McMurchy Raphael Gozzo Rasmus Melchior Jacobsen +Raul Onitza-Klugman Ravi Pratap Ray Dassen Ray Pekowski @@ -1912,6 +2053,7 @@ Red Hat Product Security Reed Loden Reinhard Max Reinout van Schouwen +RekGRpth on github Remco van Hooff Remi Gacogne Remo E @@ -1925,8 +2067,11 @@ Rene Bernhardt Rene Rebe Reuven Wachtfogel Reza Arbab +Rianov Viacheslav Ricardo Cadime Ricardo Gomes +Ricardo M. Correia +Ricardo Martins Rich Burridge Rich FitzJohn Rich Gray @@ -1957,6 +2102,7 @@ Richy Kim Rici Lake Rick Deist Rick Jones +Rick Lane Rick Richardson Rick Welykochy Rickard Hallerbäck @@ -1967,6 +2113,7 @@ Rider Linden RiderALT on github Rikard Falkeborn rl1987 on github +Rob Boeckermann Rob Cotrone Rob Crittenden Rob Davies @@ -1976,6 +2123,8 @@ Rob Stanzel Rob Ward Robert A. Monat Robert B. Harris +Robert Brose +Robert Charles Muir Robert D. Young Robert Dunaj Robert Foreman @@ -1988,6 +2137,7 @@ Robert Ronto Robert Schumann Robert Weaver Robert Wruck +Robin A. Meade Robin Cornelius Robin Douine Robin Johnson @@ -2000,6 +2150,7 @@ Rodric Glaser Rodrigo Silva Roger Leigh Roger Orr +Roger Young Roland Blom Roland Hieber Roland Krikava @@ -2017,9 +2168,11 @@ Ron Eldor Ron Parker Ron Zapp Ronnie Mose +Rosen Penev Rosimildo da Silva Ross Burton Roy Bellingan +Roy Li Roy Shan Rui LIU Rui Pinheiro @@ -2032,11 +2185,15 @@ RuurdBeerstra on github Ryan Beck-Buysse Ryan Braud Ryan Chan +Ryan Mast Ryan Nelson Ryan Schmidt Ryan Scott +Ryan Sleevi Ryan Winograd +ryancaicse on github Ryuichi KAWAMATA +rzrymiak on github Rémy Léone S. Moonesamy Sai Ram Kunala @@ -2051,6 +2208,7 @@ Sam Schanken Samanta Navarro Sampo Kellomaki Samuel Díaz García +Samuel Henrique Samuel Listopad Samuel Marks Samuel Surtees @@ -2058,12 +2216,15 @@ Samuel Thibault Samuel Tranchet Sander Gates Sandor Feldi +Sandro Jaeckel Santhana Todatry Santino Keupp Saqib Ali Sara Golemon Saran Neti Sascha Swiercy +Sascha Zengler +Satadru Pramanik Saul good Saurav Babu sayrer on github @@ -2078,11 +2239,13 @@ Sean Burford Sean MacLennan Sean McArthur Sean Miller +Sean Molenaar Sebastiaan van Erk Sebastian Haglund Sebastian Mundry Sebastian Pohlschmidt Sebastian Rasmussen +Sebastian Sterk Senthil Raja Velu Sergei Kuzmin Sergei Nikulov @@ -2094,11 +2257,13 @@ Sergii Pylypenko Sergio Ballestrero Sergio Barresi Sergio Borghese +Sergio Durigan Junior sergio-nsk on github Serj Kalichev Seshubabu Pasam Seth Mos Sevan Janiyan +Sgharat on github Sh Diao Shachaf Ben-Kiki Shailesh Kapse @@ -2106,6 +2271,7 @@ Shankar Jadhavar Shao Shuchao Sharad Gupta Shard +Sharon Brizinov Shaun Jackman Shawn Landden Shawn Poulson @@ -2116,9 +2282,11 @@ shithappens2016 on github Shlomi Fish Shmulik Regev Siddhartha Prakash Jain +siddharthchhabrap on github Sidney San Martín Siegfried Gyuricsko silveja1 on github +Simon Berger Simon Chalifoux Simon Dick Simon H. @@ -2142,15 +2310,19 @@ Spork Schivago sspiri on github sstruchtrup on github Stadler Stephan +Stan Hu Stan van de Burgt Stanislav Ivochkin Stanislav Zidek +Stathis Kapnidis +Stav Nir steelman on github Stefan Agner Stefan Bühler Stefan Eissing Stefan Esser Stefan Grether +Stefan Huber Stefan Kanthak Stefan Karpinski Stefan Krause @@ -2169,9 +2341,12 @@ Stephan Bergmann Stephan Lagerholm Stephan Mühlstrasser Stephan Szabo +Stephane Pellegrino +Stephen Boost Stephen Brokenshire Stephen Collyer Stephen Kick +Stephen M. Coakley Stephen More Stephen Toub Sterling Hughes @@ -2191,10 +2366,12 @@ Steven Gu Steven M. Schweda Steven Parkes Steven Penny +Stewart Gebbie Stian Soiland-Reyes Stoned Elipot stootill on github Stuart Henderson +Sukanya Hanumanthu SumatraPeter on github Sune Ahlgren Sunny Bean @@ -2214,14 +2391,15 @@ T. Yamada T200proX7 on github Tadej Vengust Tae Hyoung Ahn -Tae Wong Taiyu Len Taneli Vähäkangas Tanguy Fautre +Taras Kushnir tarek112 on github Tatsuhiro Tsujikawa tawmoto on github tbugfinder on github +Ted Lyngmo Teemu Yli-Elsila Temprimus Terri Oda @@ -2229,6 +2407,7 @@ Terry Wu thanhchungbtc on github The Infinnovation team TheAssassin on github +TheKnarf on github Theodore Dubois therealhirudo on github tholin on github @@ -2237,6 +2416,7 @@ Thomas Braun Thomas Danielsson Thomas Gamper Thomas Glanzmann +Thomas Guillem Thomas J. Moore Thomas Klausner Thomas L. Shinnick @@ -2248,6 +2428,7 @@ Thomas Schwinge Thomas Tonino Thomas van Hesteren Thomas Vegas +Thomas Weißschuh Thorsten Schöning Tiit Pikma Till Maas @@ -2277,6 +2458,7 @@ Timur Artikov Tinus van den Berg TJ Saunders Tk Xiong +tlahn on github tmkk on github Tobias Blomberg Tobias Gabriel @@ -2284,6 +2466,8 @@ Tobias Hieta Tobias Hintze Tobias Lindgren Tobias Markus +Tobias Nießen +Tobias Nygren Tobias Nyholm Tobias Rundström Tobias Stoeckmann @@ -2295,6 +2479,7 @@ Todd Short Todd Vierling Tom Benoist Tom Donovan +Tom Eccles Tom G. Christensen Tom Grace Tom Greenslade @@ -2352,11 +2537,13 @@ Ulf Samuelsson Ulrich Doehner Ulrich Telle Ulrich Zadow +updatede on github UrsusArctos on github User Sg ustcqidi on github Vadim Grinshpun Valentin David +Valentin Richter Valentyn Korniienko Valentín Gutiérrez Valerii Zapodovnikov @@ -2385,19 +2572,24 @@ Vincent Penquerc'h Vincent Sanders Vincent Torri vitaha85 on github +Vitaly Varyvdin +vl409 on github Vlad Grachov Vlad Ureche Vladimir Grishchenko Vladimir Kotal Vladimir Lazarenko +Vladimir Panteleev Vladimir Varlamov Vlastimil Ovčáčík +vlubart on github Vojtech Janota Vojtech Minarik Vojtěch Král Volker Schmid Vsevolod Novikov vshmuk on hackerone +vvb2060 on github Vyron Tsingaras W. Mark Kubacki Waldek Kozba @@ -2418,6 +2610,7 @@ Wham Bang Wilfredo Sanchez Will Dietz Will Roberts +Willem Hoek Willem Sparreboom William A. Rowe Jr William Ahern @@ -2425,15 +2618,19 @@ William Desportes wmsch on github wncboy on github Wojciech Zwiefka +Wolf Vollprecht Wouter Van Rooy Wu Yongzheng +Wu Zheng Wyatt O'Day Wyatt OʼDay +x2018 on github Xavier Bouchoux XhmikosR on github XhstormR on github Xiang Xiao Xiangbin Li +Xiaoke Wang Xiaoyin Liu XmiliaH on github xnynx on github @@ -2451,6 +2648,7 @@ ygthien on github Yi Huang Yiming Jing Yingwei Liu +yiyuaner on github Ymir1711 on github Yonggang Luo Yongkang Huang @@ -2484,6 +2682,8 @@ Zmey Petroff Zvi Har'El zzq1015 on github Ádler Jonas Gross +Érico Nogueira +Érico Nogueira Rolim İsmail Dönmez Łukasz Domeradzki Štefan Kremeň @@ -2493,3 +2693,4 @@ zzq1015 on github ウさん 不确定 加藤郁之 +梦终无痕 diff --git a/trunk/libs/libcurl/curl-7.x/docs/TODO b/trunk/libs/libcurl/curl-7.x/docs/TODO index 2fca6479..97afcec3 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/TODO +++ b/trunk/libs/libcurl/curl-7.x/docs/TODO @@ -7,14 +7,14 @@ Things that could be nice to do in the future Things to do in project curl. Please tell us what you think, contribute and - send us patches that improve things! + send us patches that improve things. Be aware that these are things that we could do, or have once been considered things we could do. If you want to work on any of these areas, please consider bringing it up for discussions first on the mailing list so that we - all agree it is still a good idea for the project! + all agree it is still a good idea for the project. - All bugs documented in the KNOWN_BUGS document are subject for fixing! + All bugs documented in the KNOWN_BUGS document are subject for fixing. 1. libcurl 1.1 TFO support on Windows @@ -30,19 +30,16 @@ 1.11 minimize dependencies with dynamically loaded modules 1.12 updated DNS server while running 1.13 c-ares and CURLOPT_OPENSOCKETFUNCTION - 1.14 Typesafe curl_easy_setopt() 1.15 Monitor connections in the connection pool 1.16 Try to URL encode given URL 1.17 Add support for IRIs - 1.18 try next proxy if one doesn't work + 1.18 try next proxy if one does not work 1.19 provide timing info for each redirect 1.20 SRV and URI DNS records 1.21 netrc caching and sharing 1.22 CURLINFO_PAUSE_STATE 1.23 Offer API to flush the connection pool - 1.24 TCP Fast Open for windows 1.25 Expose tried IP addresses that failed - 1.27 hardcode the "localhost" addresses 1.28 FD_CLOEXEC 1.29 Upgrade to websockets 1.30 config file parsing @@ -67,25 +64,27 @@ 4.1 HOST 4.2 Alter passive/active on failure and retry 4.3 Earlier bad letter detection + 4.4 Support CURLOPT_PREQUOTE for dir listings too 4.5 ASCII support 4.6 GSSAPI via Windows SSPI 4.7 STAT for LIST without data connection - 4.8 Option to ignore private IP addresses in PASV response 5. HTTP - 5.1 Better persistency for HTTP 1.0 5.2 Set custom client ip when using haproxy protocol 5.3 Rearrange request header order 5.4 Allow SAN names in HTTP/2 server push 5.5 auth= in URLs - 5.6 alt-svc should fallback if alt-svc doesn't work + 5.6 alt-svc should fallback if alt-svc does not work + 5.7 Require HTTP version X or higher 6. TELNET 6.1 ditch stdin 6.2 ditch telnet-specific select 6.3 feature negotiation debug data + 6.4 exit immediately upon connection if stdin is /dev/null 7. SMTP + 7.1 Passing NOTIFY option to CURLOPT_MAIL_RCPT 7.2 Enhanced capability support 7.3 Add CURLOPT_MAIL_CLIENT option @@ -109,12 +108,14 @@ 12. FILE 12.1 Directory listing for FILE: - 13. SSL + 13. TLS 13.1 TLS-PSK with OpenSSL 13.2 Provide mutex locking API + 13.3 Defeat TLS fingerprinting 13.4 Cache/share OpenSSL contexts 13.5 Export session ids 13.6 Provide callback for cert verification + 13.7 Less memory massaging with Schannel 13.8 Support DANE 13.9 TLS record padding 13.10 Support Authority Information Access certificate extension (AIA) @@ -133,23 +134,21 @@ 16. SASL 16.1 Other authentication mechanisms 16.2 Add QOP support to GSSAPI authentication - 16.3 Support binary messages (i.e.: non-base64) 17. SSH protocols 17.1 Multiplexing 17.2 Handle growing SFTP files - 17.3 Support better than MD5 hostkey hash + 17.3 Read keys from ~/.ssh/id_ecdsa, id_ed25519 17.4 Support CURLOPT_PREQUOTE 17.5 SSH over HTTPS proxy with more backends + 17.6 SFTP with SCP:// 18. Command line tool 18.1 sync 18.2 glob posts - 18.3 prevent file overwriting 18.4 --proxycommand 18.5 UTF-8 filenames in Content-Disposition 18.6 Option to make -Z merge lined based outputs on stdout - 18.7 at least N milliseconds between requests 18.8 Consider convenience options for JSON and XML? 18.9 Choose the name of file in braces for complex URLs 18.10 improve how curl works in a windows console window @@ -172,8 +171,9 @@ 19. Build 19.1 roffit 19.2 Enable PIE and RELRO by default - 19.3 Don't use GNU libtool on OpenBSD + 19.3 Do not use GNU libtool on OpenBSD 19.4 Package curl for Windows in a signed installer + 19.5 make configure use --cache-file more and better 20. Test suite 20.1 SSL tunnel @@ -183,8 +183,7 @@ 20.5 Add support for concurrent connections 20.6 Use the RFC6265 test suite 20.7 Support LD_PRELOAD on macOS - 20.8 Run web-platform-tests url tests - 20.9 Bring back libssh tests on Travis + 20.8 Run web-platform-tests URL tests 21. MQTT 21.1 Support rate-limiting @@ -195,6 +194,10 @@ 1.1 TFO support on Windows + libcurl supports the CURLOPT_TCP_FASTOPEN option since 7.49.0 for Linux and + Mac OS. Windows supports TCP Fast Open starting with Windows 10, version 1607 + and we should add support for it. + TCP Fast Open is supported on several platforms but not on Windows. Work on this was once started but never finished. @@ -202,7 +205,7 @@ 1.2 Consult %APPDATA% also for .netrc - %APPDATA%\.netrc is not considered when running on Windows. Shouldn't it? + %APPDATA%\.netrc is not considered when running on Windows. should not it? See https://github.com/curl/curl/issues/4016 @@ -226,7 +229,7 @@ Currently the libssh2 SSH based code uses it, but to remove PATH_MAX from there we need libssh2 to properly tell us when we pass in a too small buffer - and its current API (as of libssh2 1.2.7) doesn't. + and its current API (as of libssh2 1.2.7) does not. 1.6 native IDN support on macOS @@ -274,7 +277,7 @@ We can create a system with loadable modules/plug-ins, where these modules would be the ones that link to 3rd party libs. That would allow us to avoid having to load ALL dependencies since only the necessary ones for this - app/invoke/used protocols would be necessary to load. See + app/invoke/used protocols would be necessary to load. See https://github.com/curl/curl/issues/349 1.12 updated DNS server while running @@ -283,7 +286,7 @@ is may cause name resolves to fail unless res_init() is called. We should consider calling res_init() + retry once unconditionally on all name resolve failures to mitigate against this. Firefox works like that. Note that Windows - doesn't have res_init() or an alternative. + does not have res_init() or an alternative. https://github.com/curl/curl/issues/2251 @@ -293,27 +296,10 @@ close them with the CURLOPT_CLOSESOCKETFUNCTION callback. However, c-ares does not use those functions and instead opens and closes the sockets itself. This means that when curl passes the c-ares socket to the - CURLMOPT_SOCKETFUNCTION it isn't owned by the application like other sockets. + CURLMOPT_SOCKETFUNCTION it is not owned by the application like other sockets. See https://github.com/curl/curl/issues/2734 -1.14 Typesafe curl_easy_setopt() - - One of the most common problems in libcurl using applications is the lack of - type checks for curl_easy_setopt() which happens because it accepts varargs - and thus can take any type. - - One possible solution to this is to introduce a few different versions of the - setopt version for the different kinds of data you can set. - - curl_easy_set_num() - sets a long value - - curl_easy_set_large() - sets a curl_off_t value - - curl_easy_set_ptr() - sets a pointer - - curl_easy_set_cb() - sets a callback PLUS its callback data - 1.15 Monitor connections in the connection pool libcurl's connection cache or pool holds a number of open connections for the @@ -323,10 +309,11 @@ reuse purpose it is verified that it is still alive. Those connections may get closed by the server side for idleness or they may - get a HTTP/2 ping from the peer to verify that they're still alive. By adding - monitoring of the connections while in the pool, libcurl can detect dead - connections (and close them) better and earlier, and it can handle HTTP/2 - pings to keep such ones alive even when not actively doing transfers on them. + get an HTTP/2 ping from the peer to verify that they are still alive. By + adding monitoring of the connections while in the pool, libcurl can detect + dead connections (and close them) better and earlier, and it can handle + HTTP/2 pings to keep such ones alive even when not actively doing transfers + on them. 1.16 Try to URL encode given URL @@ -346,7 +333,7 @@ To make that work smoothly for curl users even on Windows, curl would probably need to be able to convert from several input encodings. -1.18 try next proxy if one doesn't work +1.18 try next proxy if one does not work Allow an application to specify a list of proxies to try, and failing to connect to the first go on and try the next instead until the list is @@ -367,7 +354,7 @@ 1.20 SRV and URI DNS records Offer support for resolving SRV and URI DNS records for libcurl to know which - server to connect to for various protocols (including HTTP!). + server to connect to for various protocols (including HTTP). 1.21 netrc caching and sharing @@ -387,31 +374,15 @@ An API could allow a forced flush or just a forced loop that would properly close all connections that have been closed by the server already. -1.24 TCP Fast Open for windows - - libcurl supports the CURLOPT_TCP_FASTOPEN option since 7.49.0 for Linux and - Mac OS. Windows supports TCP Fast Open starting with Windows 10, version 1607 - and we should add support for it. - 1.25 Expose tried IP addresses that failed - When libcurl fails to connect to a host, it should be able to offer the - application the list of IP addresses that were used in the attempt. + When libcurl fails to connect to a host, it could offer the application the + addresses that were used in the attempt. Source + dest IP, source + dest port + and protocol (UDP or TCP) for each failure. Possibly as a callback. Perhaps + also provide "reason". https://github.com/curl/curl/issues/2126 -1.27 hardcode the "localhost" addresses - - There's this new spec getting adopted that says "localhost" should always and - unconditionally be a local address and not get resolved by a DNS server. A - fine way for curl to fix this would be to simply hard-code the response to - 127.0.0.1 and/or ::1 (depending on what IP versions that are requested). This - is what the browsers probably will do with this hostname. - - https://bugzilla.mozilla.org/show_bug.cgi?id=1220810 - - https://tools.ietf.org/html/draft-ietf-dnsop-let-localhost-be-localhost-02 - 1.28 FD_CLOEXEC It sets the close-on-exec flag for the file descriptor, which causes the file @@ -448,8 +419,8 @@ 1.32 add asynch getaddrinfo support Use getaddrinfo_a() to provide an asynch name resolver backend to libcurl - that doesn't use threads and doesn't depend on c-ares. The getaddrinfo_a - function is (probably?) glibc specific but that's a widely used libc among + that does not use threads and does not depend on c-ares. The getaddrinfo_a + function is (probably?) glibc specific but that is a widely used libc among our users. https://github.com/curl/curl/pull/6746 @@ -458,7 +429,7 @@ 2.1 More non-blocking - Make sure we don't ever loop because of non-blocking sockets returning + Make sure we do not ever loop because of non-blocking sockets returning EWOULDBLOCK or similar. Blocking cases include: - Name resolves on non-windows unless c-ares or the threaded resolver is used. @@ -497,7 +468,7 @@ 2.4 Split connect and authentication process The multi interface treats the authentication process as part of the connect - phase. As such any failures during authentication won't trigger the relevant + phase. As such any failures during authentication will not trigger the relevant QUIT or LOGOFF for protocols such as IMAP, POP3 and SMTP. 2.5 Edge-triggered sockets should work @@ -526,7 +497,7 @@ 2.8 dynamically decide to use socketpair - For users who don't use curl_multi_wait() or don't care for + For users who do not use curl_multi_wait() or do not care for curl_multi_wakeup(), we could introduce a way to make libcurl NOT create a socketpair in the multi handle. @@ -551,7 +522,7 @@ HOST is a command for a client to tell which host name to use, to offer FTP servers named-based virtual hosting: - https://tools.ietf.org/html/rfc7151 + https://datatracker.ietf.org/doc/html/rfc7151 4.2 Alter passive/active on failure and retry @@ -565,9 +536,16 @@ Make the detection of (bad) %0d and %0a codes in FTP URL parts earlier in the process to avoid doing a resolve and connect in vain. +4.4 Support CURLOPT_PREQUOTE for dir listings too + + The lack of support is mostly an oversight and requires the FTP state machine + to get updated to get fixed. + + https://github.com/curl/curl/issues/8602 + 4.5 ASCII support - FTP ASCII transfers do not follow RFC959. They don't convert the data + FTP ASCII transfers do not follow RFC959. They do not convert the data accordingly. 4.6 GSSAPI via Windows SSPI @@ -584,19 +562,8 @@ This is not detailed in any FTP specification. -4.8 Option to ignore private IP addresses in PASV response - - Some servers respond with and some other FTP client implementations can - ignore private (RFC 1918 style) IP addresses when received in PASV responses. - To consider for libcurl as well. See https://github.com/curl/curl/issues/1455 - 5. HTTP -5.1 Better persistency for HTTP 1.0 - - "Better" support for persistent connections over HTTP 1.0 - https://curl.se/bug/feature.cgi?id=1089001 - 5.2 Set custom client ip when using haproxy protocol This would allow testing servers with different client ip addresses (without @@ -637,7 +604,7 @@ Additionally this should be implemented for proxy base URLs as well. -5.6 alt-svc should fallback if alt-svc doesn't work +5.6 alt-svc should fallback if alt-svc does not work The alt-svc: header provides a set of alternative services for curl to use instead of the original. If the first attempted one fails, it should try the @@ -645,6 +612,14 @@ See https://github.com/curl/curl/issues/4908 +5.7 Require HTTP version X or higher + + curl and libcurl provide options for trying higher HTTP versions (for example + HTTP/2) but then still allows the server to pick version 1.1. We could + consider adding a way to require a minimum version. + + See https://github.com/curl/curl/issues/7980 + 6. TELNET 6.1 ditch stdin @@ -656,16 +631,31 @@ 6.2 ditch telnet-specific select Move the telnet support's network select() loop go away and merge the code - into the main transfer loop. Until this is done, the multi interface won't + into the main transfer loop. Until this is done, the multi interface will not work for telnet. 6.3 feature negotiation debug data Add telnet feature negotiation data to the debug callback as header data. +6.4 exit immediately upon connection if stdin is /dev/null + + If it did, curl could be used to probe if there's an server there listening + on a specific port. That is, the following command would exit immediately + after the connection is established with exit code 0: + + curl -s --connect-timeout 2 telnet://example.com:80 NOTIFY=SUCCESS,FAILURE" ); + + https://github.com/curl/curl/issues/8232 + 7.2 Enhanced capability support Add the ability, for an application that uses libcurl, to obtain the list of @@ -736,7 +726,7 @@ 11.4 Create remote directories Support for creating remote directories when uploading a file to a directory - that doesn't exist on the server, just like --ftp-create-dirs. + that does not exist on the server, just like --ftp-create-dirs. 12. FILE @@ -747,7 +737,7 @@ output should probably be the same as/similar to FTP. -13. SSL +13. TLS 13.1 TLS-PSK with OpenSSL @@ -764,12 +754,20 @@ library, so that the same application code can use mutex-locking independently of OpenSSL or GnutTLS being used. +13.3 Defeat TLS fingerprinting + + By changing the order of TLS extensions provided in the TLS handshake, it is + sometimes possible to circumvent TLS fingerprinting by servers. The TLS + extension order is of course not the only way to fingerprint a client. + + See https://github.com/curl/curl/issues/8119 + 13.4 Cache/share OpenSSL contexts "Look at SSL cafile - quick traces look to me like these are done on every request as well, when they should only be necessary once per SSL context (or once per handle)". The major improvement we can rather easily do is to make - sure we don't create and kill a new SSL "context" for every request, but + sure we do not create and kill a new SSL "context" for every request, but instead make one for every connection and re-use that SSL context in the same style connections are re-used. It will make us use slightly more memory but it will libcurl do less creations and deletions of SSL contexts. @@ -791,8 +789,15 @@ 13.6 Provide callback for cert verification OpenSSL supports a callback for customised verification of the peer - certificate, but this doesn't seem to be exposed in the libcurl APIs. Could - it be? There's so much that could be done if it were! + certificate, but this does not seem to be exposed in the libcurl APIs. Could + it be? There's so much that could be done if it were. + +13.7 Less memory massaging with Schannel + + The Schannel backend does a lot of custom memory management we would rather + avoid: the repeated alloc + free in sends and the custom memory + realloc + system for encrypted and decrypted data. That should be avoided and reduced + for 1) efficiency and 2) safety. 13.8 Support DANE @@ -821,7 +826,7 @@ AIA can provide various things like CRLs but more importantly information about intermediate CA certificates that can allow validation path to be - fulfilled when the HTTPS server doesn't itself provide them. + fulfilled when the HTTPS server does not itself provide them. Since AIA is about downloading certs on demand to complete a TLS handshake, it is probably a bit tricky to get done right. @@ -833,7 +838,7 @@ CURLOPT_PINNEDPUBLICKEY does not consider the hashes of intermediate & root certificates when comparing the pinned keys. Therefore it is not compatible with "HTTP Public Key Pinning" as there also intermediate and root - certificates can be pinned. This is very useful as it prevents webadmins from + certificates can be pinned. This is useful as it prevents webadmins from "locking themselves out of their servers". Adding this feature would make curls pinning 100% compatible to HPKP and @@ -853,7 +858,7 @@ that previously (in older TLS version) were not set. The clienthello extension adds padding to avoid that size range. - https://tools.ietf.org/html/rfc7685 + https://datatracker.ietf.org/doc/html/rfc7685 https://github.com/curl/curl/issues/2299 14. GnuTLS @@ -902,10 +907,6 @@ with integrity protection) and auth-conf (Authentication with integrity and privacy protection). -16.3 Support binary messages (i.e.: non-base64) - - Mandatory to support LDAP SASL authentication. - 17. SSH protocols @@ -924,33 +925,38 @@ The SFTP code in libcurl checks the file size *before* a transfer starts and then proceeds to transfer exactly that amount of data. If the remote file - grows while the transfer is in progress libcurl won't notice and will not + grows while the transfer is in progress libcurl will not notice and will not adapt. The OpenSSH SFTP command line tool does and libcurl could also just attempt to download more to see if there is more to get... https://github.com/curl/curl/issues/4344 -17.3 Support better than MD5 hostkey hash +17.3 Read keys from ~/.ssh/id_ecdsa, id_ed25519 + + The libssh2 backend in curl is limited to only reading keys from id_rsa and + id_dsa, which makes it fail connecting to servers that use more modern key + types. - libcurl offers the CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 option for verifying the - server's key. MD5 is generally being deprecated so we should implement - support for stronger hashing algorithms. libssh2 itself is what provides this - underlying functionality and it supports at least SHA-1 as an alternative. - SHA-1 is also being deprecated these days so we should consider working with - libssh2 to instead offer support for SHA-256 or similar. + https://github.com/curl/curl/issues/8586 17.4 Support CURLOPT_PREQUOTE The two other QUOTE options are supported for SFTP, but this was left out for - unknown reasons! + unknown reasons. 17.5 SSH over HTTPS proxy with more backends - The SSH based protocols SFTP and SCP didn't work over HTTPS proxy at + The SSH based protocols SFTP and SCP did not work over HTTPS proxy at all until PR https://github.com/curl/curl/pull/6021 brought the functionality with the libssh2 backend. Presumably, this support can/could be added for the other backends as well. +17.6 SFTP with SCP:// + + OpenSSH 9 switched their 'scp' tool to speak SFTP under the hood. Going + forward it might be worth having curl or libcurl attempt SFTP if SCP fails to + follow suite. + 18. Command line tool 18.1 sync @@ -967,14 +973,6 @@ Globbing support for -d and -F, as in 'curl -d "name=foo[0-9]" URL'. This is easily scripted though. -18.3 prevent file overwriting - - Add an option that prevents curl from overwriting existing local files. When - used, and there already is an existing file with the target file name - (either -O or -o), a number should be appended (and increased if already - existing). So that index.html becomes first index.html.1 and then - index.html.2 etc. - 18.4 --proxycommand Allow the user to make curl run a command and use its stdio to make requests @@ -995,22 +993,11 @@ 18.6 Option to make -Z merge lined based outputs on stdout When a user requests multiple lined based files using -Z and sends them to - stdout, curl will not "merge" and send complete lines fine but may very well - send partial lines from several sources. + stdout, curl will not "merge" and send complete lines fine but may send + partial lines from several sources. https://github.com/curl/curl/issues/5175 -18.7 at least N milliseconds between requests - - Allow curl command lines issue a lot of request against services that limit - users to no more than N requests/second or similar. Could be implemented with - an option asking that at least a certain time has elapsed since the previous - request before the next one will be performed. Example: - - $ curl "https://example.com/api?input=[1-1000]" -d yadayada --after 500 - - See https://github.com/curl/curl/issues/3920 - 18.8 Consider convenience options for JSON and XML? Could we add `--xml` or `--json` to add headers needed to call rest API: @@ -1083,7 +1070,7 @@ When --retry is used and curl actually retries transfer, it should use the already transferred data and do a resumed transfer for the rest (when - possible) so that it doesn't have to transfer the same data again that was + possible) so that it does not have to transfer the same data again that was already transferred before the retry. See https://github.com/curl/curl/issues/1084 @@ -1110,7 +1097,7 @@ provides the "may overwrite any file" risk. This is extra tricky if the original URL has no file name part at all since - then the current code path will error out with an error message, and we can't + then the current code path will error out with an error message, and we cannot *know* already at that point if curl will be redirected to a URL that has a file name... @@ -1144,9 +1131,9 @@ 18.21 retry on the redirected-to URL When curl is told to --retry a failed transfer and follows redirects, it - might get a HTTP 429 response from the redirected-to URL and not the original - one, which then could make curl decide to rather retry the transfer on that - URL only instead of the original operation to the original URL. + might get an HTTP 429 response from the redirected-to URL and not the + original one, which then could make curl decide to rather retry the transfer + on that URL only instead of the original operation to the original URL. Perhaps extra emphasized if the original transfer is a large POST that redirects to a separate GET, and that GET is what gets the 529 @@ -1175,7 +1162,7 @@ - If splitting up the work improves the transfer rate, it could then be done again. Then again, etc up to a limit. - This way, if transfer B fails (because Range: isn't supported) it will let + This way, if transfer B fails (because Range: is not supported) it will let transfer A remain the single one. N and M could be set to some sensible defaults. @@ -1193,7 +1180,7 @@ Users who are for example doing large downloads in CI or remote setups might want the occasional progress meter update to see that the transfer is - progressing and hasn't stuck, but they may not appreciate the + progressing and has not stuck, but they may not appreciate the many-times-a-second frequency curl can end up doing it with now. 19. Build @@ -1215,7 +1202,7 @@ to no impact, neither on the performance nor on the general functionality of curl. -19.3 Don't use GNU libtool on OpenBSD +19.3 Do not use GNU libtool on OpenBSD When compiling curl on OpenBSD with "--enable-debug" it will give linking errors when you use GNU libtool. This can be fixed by using the libtool provided by OpenBSD itself. However for this the user always needs to invoke @@ -1229,6 +1216,13 @@ See https://github.com/curl/curl/issues/5424 +19.5 make configure use --cache-file more and better + + The configure script can be improved to cache more values so that repeated + invokes run much faster. + + See https://github.com/curl/curl/issues/7753 + 20. Test suite 20.1 SSL tunnel @@ -1239,8 +1233,8 @@ 20.2 nicer lacking perl message - If perl wasn't found by the configure script, don't attempt to run the tests - but explain something nice why it doesn't. + If perl was not found by the configure script, do not attempt to run the tests + but explain something nice why it does not. 20.3 more protocols supported @@ -1255,15 +1249,15 @@ 20.5 Add support for concurrent connections Tests 836, 882 and 938 were designed to verify that separate connections - aren't used when using different login credentials in protocols that - shouldn't re-use a connection under such circumstances. + are not used when using different login credentials in protocols that + should not re-use a connection under such circumstances. - Unfortunately, ftpserver.pl doesn't appear to support multiple concurrent + Unfortunately, ftpserver.pl does not appear to support multiple concurrent connections. The read while() loop seems to loop until it receives a disconnect from the client, where it then enters the waiting for connections loop. When the client opens a second connection to the server, the first - connection hasn't been dropped (unless it has been forced - which we - shouldn't do in these tests) and thus the wait for connections loop is never + connection has not been dropped (unless it has been forced - which we + should not do in these tests) and thus the wait for connections loop is never entered to receive the second connection. 20.6 Use the RFC6265 test suite @@ -1277,29 +1271,22 @@ 20.7 Support LD_PRELOAD on macOS - LD_RELOAD doesn't work on macOS, but there are tests which require it to run + LD_RELOAD does not work on macOS, but there are tests which require it to run properly. Look into making the preload support in runtests.pl portable such that it uses DYLD_INSERT_LIBRARIES on macOS. -20.8 Run web-platform-tests url tests +20.8 Run web-platform-tests URL tests - Run web-platform-tests url tests and compare results with browsers on wpt.fyi + Run web-platform-tests URL tests and compare results with browsers on wpt.fyi It would help us find issues to fix and help us document where our parser differs from the WHATWG URL spec parsers. See https://github.com/curl/curl/issues/4477 -20.9 Bring back libssh tests on Travis - - In https://github.com/curl/curl/pull/7012 we remove the libssh builds and - tests from Travis CI due to them not working. This should be remedied and - libssh builds be brought back. - - 21. MQTT 21.1 Support rate-limiting The rate-limiting logic is done in the PERFORMING state in multi.c but MQTT - is not (yet) implemented to use that! + is not (yet) implemented to use that. diff --git a/trunk/libs/libcurl/curl-7.x/docs/TheArtOfHttpScripting.md b/trunk/libs/libcurl/curl-7.x/docs/TheArtOfHttpScripting.md index a6eb8b35..78dbd7a8 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/TheArtOfHttpScripting.md +++ b/trunk/libs/libcurl/curl-7.x/docs/TheArtOfHttpScripting.md @@ -2,7 +2,7 @@ ## Background - This document assumes that you're familiar with HTML and general networking. + This document assumes that you are familiar with HTML and general networking. The increasing amount of applications moving to the web has made "HTTP Scripting" more frequently requested and wanted. To be able to automatically @@ -21,7 +21,7 @@ ## The HTTP Protocol - HTTP is the protocol used to fetch data from web servers. It is a very simple + HTTP is the protocol used to fetch data from web servers. It is a simple protocol that is built upon TCP/IP. The protocol also allows information to get sent to the server from the client using a few different methods, as will be shown here. @@ -30,7 +30,7 @@ request a particular action, and then the server replies a few text lines before the actual requested content is sent to the client. - The client, curl, sends a HTTP request. The request contains a method (like + The client, curl, sends an HTTP request. The request contains a method (like GET, POST, HEAD etc), a number of request headers and sometimes a request body. The HTTP server responds with a status line (indicating if things went well), response headers and most often also a response body. The "body" part @@ -59,7 +59,7 @@ want to know the amount of milliseconds between two points in a transfer. For those, and other similar situations, the [`--trace-time`](https://curl.se/docs/manpage.html#--trace-time) option - is what you need. It'll prepend the time to each trace output line: + is what you need. It will prepend the time to each trace output line: curl --trace-ascii d.txt --trace-time http://example.com/ @@ -73,14 +73,14 @@ ## Spec The Uniform Resource Locator format is how you specify the address of a - particular resource on the Internet. You know these, you've seen URLs like + particular resource on the Internet. You know these, you have seen URLs like https://curl.se or https://yourbank.com a million times. RFC 3986 is the canonical spec. And yeah, the formal name is not URL, it is URI. ## Host The host name is usually resolved using DNS or your /etc/hosts file to an IP - address and that's what curl will communicate with. Alternatively you specify + address and that is what curl will communicate with. Alternatively you specify the IP address directly in the URL instead of a name. For development and other trying out situations, you can point to a different @@ -92,7 +92,7 @@ ## Port number Each protocol curl supports operates on a default port number, be it over TCP - or in some cases UDP. Normally you don't have to take that into + or in some cases UDP. Normally you do not have to take that into consideration, but at times you run test servers on other ports or similar. Then you can specify the port number in the URL with a colon and a number immediately following the host name. Like when doing HTTP to port @@ -103,7 +103,7 @@ The port number you specify in the URL is the number that the server uses to offer its services. Sometimes you may use a proxy, and then you may need to specify that proxy's port number separately from what curl needs to - connect to the server. Like when using a HTTP proxy on port 4321: + connect to the server. Like when using an HTTP proxy on port 4321: curl --proxy http://proxy.example.org:4321 http://remote.example.org/ @@ -166,7 +166,7 @@ A single curl command line may involve one or many URLs. The most common case is probably to just use one, but you can specify any amount of URLs. Yes - any. No limits. You'll then get requests repeated over and over for all the + any. No limits. You will then get requests repeated over and over for all the given URLs. Example, send two GETs: @@ -185,13 +185,13 @@ ## Multiple HTTP methods in a single command line Sometimes you need to operate on several URLs in a single command line and do - different HTTP methods on each. For this, you'll enjoy the + different HTTP methods on each. For this, you will enjoy the [`--next`](https://curl.se/docs/manpage.html#-:) option. It is basically a separator that separates a bunch of options from the next. All the URLs before `--next` will get the same method and will get all the POST data merged into one. - When curl reaches the `--next` on the command line, it'll sort of reset the + When curl reaches the `--next` on the command line, it will sort of reset the method and the POST data and allow a new set. Perhaps this is best shown with a few examples. To send first a HEAD and then @@ -207,7 +207,7 @@ ## Forms explained - Forms are the general way a website can present a HTML page with fields for + Forms are the general way a website can present an HTML page with fields for the user to enter data in, and then press some kind of 'OK' or 'Submit' button to get that data sent to the server. The server then typically uses the posted data to decide how to act. Like using the entered words to search @@ -236,7 +236,7 @@ previous URL. If the original form was seen on the page `www.example.com/when/birth.html`, - the second page you'll get will become + the second page you will get will become `www.example.com/when/junk.cgi?birthyear=1905&press=OK`. Most search engines work this way. @@ -249,16 +249,16 @@ ## POST The GET method makes all input field names get displayed in the URL field of - your browser. That's generally a good thing when you want to be able to + your browser. That is generally a good thing when you want to be able to bookmark that page with your given data, but it is an obvious disadvantage if you entered secret information in one of the fields or if there are a large - amount of fields creating a very long and unreadable URL. + amount of fields creating a long and unreadable URL. The HTTP protocol then offers the POST method. This way the client sends the - data separated from the URL and thus you won't see any of it in the URL + data separated from the URL and thus you will not see any of it in the URL address field. - The form would look very similar to the previous one: + The form would look similar to the previous one: ```html
@@ -270,7 +270,7 @@ And to use curl to post this form with the same data filled in as before, we could do it like: - curl --data "birthyear=1905&press=%20OK%20" http://www.example.com/when.cgi + curl --data "birthyear=1905&press=%20OK%20" http://www.example.com/when/junk.cgi This kind of POST will use the Content-Type `application/x-www-form-urlencoded` and is the most widely used POST kind. @@ -313,10 +313,10 @@ ## Hidden Fields - A very common way for HTML based applications to pass state information - between pages is to add hidden fields to the forms. Hidden fields are already - filled in, they aren't displayed to the user and they get passed along just - as all the other fields. + A common way for HTML based applications to pass state information between + pages is to add hidden fields to the forms. Hidden fields are already filled + in, they are not displayed to the user and they get passed along just as all + the other fields. A similar example form with one visible field, one hidden field and one submit button could look like: @@ -329,16 +329,16 @@
``` - To POST this with curl, you won't have to think about if the fields are - hidden or not. To curl they're all the same: + To POST this with curl, you will not have to think about if the fields are + hidden or not. To curl they are all the same: curl --data "birthyear=1905&press=OK&person=daniel" [URL] ## Figure Out What A POST Looks Like - When you're about fill in a form and send to a server by using curl instead - of a browser, you're of course very interested in sending a POST exactly the - way your browser does. + When you are about to fill in a form and send it to a server by using curl + instead of a browser, you are of course interested in sending a POST exactly + the way your browser does. An easy way to get to see this, is to save the HTML page with the form on your local disk, modify the 'method' to a GET, and press the submit button @@ -351,11 +351,11 @@ ## PUT - Perhaps the best way to upload data to a HTTP server is to use PUT. Then + Perhaps the best way to upload data to an HTTP server is to use PUT. Then again, this of course requires that someone put a program or script on the - server end that knows how to receive a HTTP PUT stream. + server end that knows how to receive an HTTP PUT stream. - Put a file to a HTTP server with curl: + Put a file to an HTTP server with curl: curl --upload-file uploadfile http://www.example.com/receive.cgi @@ -364,7 +364,7 @@ ## Basic Authentication HTTP Authentication is the ability to tell the server your username and - password so that it can verify that you're allowed to do the request you're + password so that it can verify that you are allowed to do the request you are doing. The Basic authentication used in HTTP (which is the type curl uses by default) is **plain text** based, which means it sends username and password only slightly obfuscated, but still fully readable by anyone that sniffs on @@ -386,8 +386,8 @@ ## Proxy Authentication - Sometimes your HTTP access is only available through the use of a HTTP - proxy. This seems to be especially common at various companies. A HTTP proxy + Sometimes your HTTP access is only available through the use of an HTTP + proxy. This seems to be especially common at various companies. An HTTP proxy may require its own user and password to allow the client to get through to the Internet. To specify those with curl, run something like: @@ -408,18 +408,18 @@ able to watch your passwords if you pass them as plain command line options. There are ways to circumvent this. - It is worth noting that while this is how HTTP Authentication works, very - many websites will not use this concept when they provide logins etc. See the - Web Login chapter further below for more details on that. + It is worth noting that while this is how HTTP Authentication works, many + websites will not use this concept when they provide logins etc. See the Web + Login chapter further below for more details on that. # More HTTP Headers ## Referer - A HTTP request may include a 'referer' field (yes it is misspelled), which + An HTTP request may include a 'referer' field (yes it is misspelled), which can be used to tell from which URL the client got to this particular resource. Some programs/scripts check the referer field of requests to verify - that this wasn't arriving from an external site or an unknown page. While + that this was not arriving from an external site or an unknown page. While this is a stupid way to check something so easily forged, many scripts still do it. Using curl, you can put anything you want in the referer-field and thus more easily be able to fool the server into serving your request. @@ -430,23 +430,23 @@ ## User Agent - Very similar to the referer field, all HTTP requests may set the User-Agent + Similar to the referer field, all HTTP requests may set the User-Agent field. It names what user agent (client) that is being used. Many applications use this information to decide how to display pages. Silly web programmers try to make different pages for users of different browsers to make them look the best possible for their particular browsers. They usually - also do different kinds of javascript, vbscript etc. + also do different kinds of JavaScript, VBScript etc. At times, you will see that getting a page with curl will not return the same page that you see when getting the page with your browser. Then you know it - is time to set the User Agent field to fool the server into thinking you're + is time to set the User Agent field to fool the server into thinking you are one of those browsers. To make curl look like Internet Explorer 5 on a Windows 2000 box: curl --user-agent "Mozilla/4.0 (compatible; MSIE 5.01; Windows NT 5.0)" [URL] - Or why not look like you're using Netscape 4.73 on an old Linux box: + Or why not look like you are using Netscape 4.73 on an old Linux box: curl --user-agent "Mozilla/4.73 [en] (X11; U; Linux 2.2.15 i686)" [URL] @@ -471,15 +471,15 @@ If you use curl to POST to a site that immediately redirects you to another page, you can safely use [`--location`](https://curl.se/docs/manpage.html#-L) (`-L`) and - `--data`/`--form` together. curl will only use POST in the first request, and + `--data`/`--form` together. Curl will only use POST in the first request, and then revert to GET in the following operations. ## Other redirects - Browser typically support at least two other ways of redirects that curl - doesn't: first the html may contain a meta refresh tag that asks the browser + Browsers typically support at least two other ways of redirects that curl + does not: first the html may contain a meta refresh tag that asks the browser to load a specific URL after a set number of seconds, or it may use - javascript to do it. + JavaScript to do it. # Cookies @@ -529,7 +529,7 @@ Curl's "cookie engine" gets enabled when you use the [`--cookie`](https://curl.se/docs/manpage.html#-b) option. If you only want curl to understand received cookies, use `--cookie` with a file that - doesn't exist. Example, if you want to let curl understand cookies from a + does not exist. Example, if you want to let curl understand cookies from a page and follow a location (and thus possibly send back cookies it received), you can invoke it like: @@ -539,7 +539,7 @@ format that Netscape and Mozilla once used. It is a convenient way to share cookies between scripts or invokes. The `--cookie` (`-b`) switch automatically detects if a given file is such a cookie file and parses it, - and by using the `--cookie-jar` (`-c`) option you'll make curl write a new + and by using the `--cookie-jar` (`-c`) option you will make curl write a new cookie file at the end of an operation: curl --cookie cookies.txt --cookie-jar newcookies.txt \ @@ -560,7 +560,7 @@ Curl supports encrypted fetches when built to use a TLS library and it can be built to use one out of a fairly large set of libraries - `curl -V` will show - which one your curl was built to use (if any!). To get a page from a HTTPS + which one your curl was built to use (if any!). To get a page from an HTTPS server, simply run curl like: curl https://secure.example.com @@ -572,7 +572,7 @@ side certificates. All certificates are locked with a pass phrase, which you need to enter before the certificate can be used by curl. The pass phrase can be specified on the command line or if not, entered interactively when - curl queries for it. Use a certificate with curl on a HTTPS server like: + curl queries for it. Use a certificate with curl on an HTTPS server like: curl --cert mycert.pem https://secure.example.com @@ -580,7 +580,7 @@ verifying the server's certificate against a locally stored CA cert bundle. Failing the verification will cause curl to deny the connection. You must then use [`--insecure`](https://curl.se/docs/manpage.html#-k) - (`-k`) in case you want to tell curl to ignore that the server can't be + (`-k`) in case you want to tell curl to ignore that the server cannot be verified. More about server certificate verification and ca cert bundles can be read in @@ -628,7 +628,7 @@ curl -X POST http://example.org/ - ... but curl will still think and act as if it sent a GET so it won't send + ... but curl will still think and act as if it sent a GET so it will not send any request body etc. # Web Login @@ -648,13 +648,13 @@ make sure you got there through their login page) so you should make a habit of first getting the login-form page to capture the cookies set there. - Some web-based login systems feature various amounts of javascript, and + Some web-based login systems feature various amounts of JavaScript, and sometimes they use such code to set or modify cookie contents. Possibly they do that to prevent programmed logins, like this manual describes how to... - Anyway, if reading the code isn't enough to let you repeat the behavior + Anyway, if reading the code is not enough to let you repeat the behavior manually, capturing the HTTP requests done by your browsers and analyzing the sent cookies is usually a working method to work out how to shortcut the - javascript need. + JavaScript need. In the actual `
` tag for the login, lots of sites fill-in random/session or otherwise secretly generated hidden tags and you may need @@ -666,7 +666,7 @@ ## Some debug tricks - Many times when you run curl on a site, you'll notice that the site doesn't + Many times when you run curl on a site, you will notice that the site does not seem to respond the same way to your curl requests as it does to your browser's. @@ -690,9 +690,9 @@ ## Check what the browsers do - A very good helper to make sure you do this right, is the web browsers' - developers tools that let you view all headers you send and receive (even - when using HTTPS). + A good helper to make sure you do this right, is the web browsers' developers + tools that let you view all headers you send and receive (even when using + HTTPS). A more raw approach is to capture the HTTP traffic on the network with tools such as Wireshark or tcpdump and check what headers that were sent and diff --git a/trunk/libs/libcurl/curl-7.x/docs/URL-SYNTAX.md b/trunk/libs/libcurl/curl-7.x/docs/URL-SYNTAX.md index a97eb0d9..0b452f87 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/URL-SYNTAX.md +++ b/trunk/libs/libcurl/curl-7.x/docs/URL-SYNTAX.md @@ -5,7 +5,8 @@ The official "URL syntax" is primarily defined in these two different specifications: - - [RFC 3986](https://tools.ietf.org/html/rfc3986) (although URL is called "URI" in there) + - [RFC 3986](https://datatracker.ietf.org/doc/html/rfc3986) (although URL is called + "URI" in there) - [The WHATWG URL Specification](https://url.spec.whatwg.org/) RFC 3986 is the earlier one, and curl has always tried to adhere to that one @@ -19,7 +20,7 @@ changes over time. URL parsers as implemented in browsers, libraries and tools usually opt to support one of the mentioned specifications. Bugs, differences in interpretations and the moving nature of the WHATWG spec does however make it -very unlikely that multiple parsers treat URLs the exact same way! +unlikely that multiple parsers treat URLs the same way. ## Security @@ -41,8 +42,8 @@ security concerns: 1. If you have an application that runs as or in a server application, getting an unfiltered URL can trick your application to access a local resource - instead of a remote resource. Protecting yourself against localhost accesses is very - hard when accepting user provided URLs. + instead of a remote resource. Protecting yourself against localhost accesses + is hard when accepting user provided URLs. 2. Such custom URLs can access other ports than you planned as port numbers are part of the regular URL format. The combination of a local host and a @@ -62,10 +63,13 @@ inter-operate better with URLs that appear in the wild. ### spaces -In particular `Location:` headers that indicate to the client where a resource -has been redirected to, sometimes contain spaces. This is a violation of RFC -3986 but is fine in the WHATWG spec. curl handles these by re-encoding them to -`%20`. +A URL provided to curl cannot contain spaces. They need to be provided URL +encoded to be accepted in a URL by curl. + +An exception to this rule: `Location:` response headers that indicate to a +client where a resource has been redirected to, sometimes contain spaces. This +is a violation of RFC 3986 but is fine in the WHATWG spec. curl handles these +by re-encoding them to `%20`. ### non-ASCII @@ -149,7 +153,7 @@ since it often means passing around the password in plain text and is thus a security risk. URLs for IMAP, POP3 and SMTP also support *login options* as part of the -userinfo field. They're provided as a semicolon after the password and then +userinfo field. They are provided as a semicolon after the password and then the options. ## Hostname @@ -170,9 +174,9 @@ brackets). For example: ### "localhost" -Starting in curl 7.77.0, curl will use loopback IP addresses for the name -`localhost`: `127.0.0.1` and `::1`. It will not try to resolve the name using -the resolver functions. +Starting in curl 7.77.0, curl uses loopback IP addresses for the name +`localhost`: `127.0.0.1` and `::1`. It does not resolve the name using the +resolver functions. This is done to make sure the host accessed is truly the localhost - the local machine. @@ -216,7 +220,7 @@ directory listing for the root / home directory will be returned. FTP servers typically put the user in its "home directory" after login, which then differs between users. To explicitly specify the root directory of an FTP -server start the path with double slash `//` or `/%2f` (2F is the hexadecimal +server, start the path with double slash `//` or `/%2f` (2F is the hexadecimal value of the ascii code for the slash). ## FILE @@ -231,7 +235,7 @@ Anything else will make curl fail to parse the URL. ### Windows-specific FILE details -curl accepts that the FILE URL's path starts with a "drive letter". That's a +curl accepts that the FILE URL's path starts with a "drive letter". That is a single letter `a` to `z` followed by a colon or a pipe character (`|`). The Windows operating system itself will convert some file accesses to perform @@ -285,8 +289,26 @@ subject line: imap://user:password@mail.example.com/INBOX?SUBJECT%20shadows -For more information about the individual components of an IMAP URL please see -RFC 5092. +Searching via the query part of the URL `?` is a search request for the results +to be returned as message sequence numbers (MAILINDEX). It is possible to make +a search request for results to be returned as unique ID numbers (UID) by using +a custom curl request via `-X`. UID numbers are unique per session (and +multiple sessions when UIDVALIDITY is the same). For example, if you are +searching for `"foo bar"` in header+body (TEXT) and you want the matching +MAILINDEX numbers returned then you could search via URL: + + imap://user:password@mail.example.com/INBOX?TEXT%20%22foo%20bar%22 + +.. but if you wanted matching UID numbers you would have to use a custom request: + + imap://user:password@mail.example.com/INBOX -X "UID SEARCH TEXT \"foo bar\"" + +For more information about IMAP commands please see RFC 9051. For more +information about the individual components of an IMAP URL please see RFC 5092. + +* Note old curl versions would FETCH by message sequence number when UID was +specified in the URL. That was a bug fixed in 7.62.0, which added MAILINDEX to +FETCH by mail sequence number. ## LDAP @@ -295,13 +317,13 @@ Name, Attributes, Scope, Filter and Extension for a LDAP search. Each field is separated by a question mark and when that field is not required an empty string with the question mark separator should be included. -Search for the DN as `My Organisation`: +Search for the DN as `My Organization`: - ldap://ldap.example.com/o=My%20Organisation + ldap://ldap.example.com/o=My%20Organization the same search but will only return postalAddress attributes: - ldap://ldap.example.com/o=My%20Organisation?postalAddress + ldap://ldap.example.com/o=My%20Organization?postalAddress Search for an empty DN and request information about the `rootDomainNamingContext` attribute for an Active Directory server: @@ -309,7 +331,7 @@ Search for an empty DN and request information about the ldap://ldap.example.com/?rootDomainNamingContext For more information about the individual components of a LDAP URL please -see [RFC 4516](https://tools.ietf.org/html/rfc4516). +see [RFC 4516](https://datatracker.ietf.org/doc/html/rfc4516). ## POP3 diff --git a/trunk/libs/libcurl/curl-7.x/docs/VERSIONS.md b/trunk/libs/libcurl/curl-7.x/docs/VERSIONS.md index bcc7474d..de0b0d4f 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/VERSIONS.md +++ b/trunk/libs/libcurl/curl-7.x/docs/VERSIONS.md @@ -1,7 +1,7 @@ Version Numbers and Releases ============================ - Curl is not only curl. Curl is also libcurl. They're actually individually + Curl is not only curl. Curl is also libcurl. they are actually individually versioned, but they usually follow each other closely. The version numbering is always built up using the same system: diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/CMakeLists.txt b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/CMakeLists.txt index ae25c5c4..fe7870f5 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/CMakeLists.txt +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/CMakeLists.txt @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### set(MANPAGE "${CURL_BINARY_DIR}/docs/curl.1") diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/MANPAGE.md b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/MANPAGE.md index f7f09eb1..e35c826c 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/MANPAGE.md +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/MANPAGE.md @@ -1,3 +1,9 @@ + + # curl man page generator This is the curl man page generator. It generates a single nroff man page @@ -29,6 +35,8 @@ Each file has a set of meta-data and a body of text. See-also: (space separated list of related options, no dashes) Help: (short text for the --help output for this option) Example: (example command line, without "curl" and can use `$URL`) + c: (copyright line) + SPDX-License-Identifier: curl --- (end of meta-data) ### Body @@ -40,6 +48,9 @@ correct markup that shows both short and long version. Text written within `*asterisks*` will get shown using italics. Text within two `**asterisks**` will get shown using bold. +Text that is prefixed with a space will be treated like an "example" and will +be output in monospace. + ## Header and footer `page-header` is the file that will be output before the generated options diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/Makefile.am b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/Makefile.am index f416d553..df38e192 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/Makefile.am +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/Makefile.am @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ # 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 no-dependencies diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/Makefile.in b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/Makefile.in index 41ff1216..bf7f76b4 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/Makefile.in +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.16.4 from Makefile.am. +# Makefile.in generated by automake 1.16.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2021 Free Software Foundation, Inc. @@ -21,7 +21,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2020, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -34,6 +34,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### #*************************************************************************** @@ -43,7 +45,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -56,6 +58,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### # Shared between Makefile.am and CMakeLists.txt VPATH = @srcdir@ @@ -134,15 +138,13 @@ build_triplet = @build@ host_triplet = @host@ subdir = docs/cmdline-opts ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compile_check_sizeof.m4 \ - $(top_srcdir)/m4/curl-amissl.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/curl-amissl.m4 \ $(top_srcdir)/m4/curl-bearssl.m4 \ $(top_srcdir)/m4/curl-compilers.m4 \ $(top_srcdir)/m4/curl-confopts.m4 \ $(top_srcdir)/m4/curl-functions.m4 \ $(top_srcdir)/m4/curl-gnutls.m4 \ - $(top_srcdir)/m4/curl-mbedtls.m4 \ - $(top_srcdir)/m4/curl-mesalink.m4 $(top_srcdir)/m4/curl-nss.m4 \ + $(top_srcdir)/m4/curl-mbedtls.m4 $(top_srcdir)/m4/curl-nss.m4 \ $(top_srcdir)/m4/curl-openssl.m4 \ $(top_srcdir)/m4/curl-override.m4 \ $(top_srcdir)/m4/curl-reentrant.m4 \ @@ -176,11 +178,11 @@ am__v_P_1 = : AM_V_GEN = $(am__v_GEN_@AM_V@) am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) am__v_GEN_0 = @echo " GEN " $@; -am__v_GEN_1 = +am__v_GEN_1 = AM_V_at = $(am__v_at_@AM_V@) am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) am__v_at_0 = @ -am__v_at_1 = +am__v_at_1 = depcomp = am__maybe_remake_depfiles = SOURCES = @@ -236,6 +238,7 @@ CURL_DISABLE_TFTP = @CURL_DISABLE_TFTP@ CURL_LT_SHLIB_VERSIONED_FLAVOUR = @CURL_LT_SHLIB_VERSIONED_FLAVOUR@ CURL_NETWORK_AND_TIME_LIBS = @CURL_NETWORK_AND_TIME_LIBS@ CURL_NETWORK_LIBS = @CURL_NETWORK_LIBS@ +CURL_PLIST_VERSION = @CURL_PLIST_VERSION@ CURL_WITH_MULTI_SSL = @CURL_WITH_MULTI_SSL@ CYGPATH_W = @CYGPATH_W@ DEFAULT_SSL_BACKEND = @DEFAULT_SSL_BACKEND@ @@ -253,6 +256,7 @@ ENABLE_STATIC = @ENABLE_STATIC@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FISH_FUNCTIONS_DIR = @FISH_FUNCTIONS_DIR@ GCOV = @GCOV@ GREP = @GREP@ @@ -328,12 +332,13 @@ USE_LIBRTMP = @USE_LIBRTMP@ USE_LIBSSH = @USE_LIBSSH@ USE_LIBSSH2 = @USE_LIBSSH2@ USE_MBEDTLS = @USE_MBEDTLS@ -USE_MESALINK = @USE_MESALINK@ +USE_MSH3 = @USE_MSH3@ USE_NGHTTP2 = @USE_NGHTTP2@ USE_NGHTTP3 = @USE_NGHTTP3@ USE_NGTCP2 = @USE_NGTCP2@ USE_NGTCP2_CRYPTO_GNUTLS = @USE_NGTCP2_CRYPTO_GNUTLS@ USE_NGTCP2_CRYPTO_OPENSSL = @USE_NGTCP2_CRYPTO_OPENSSL@ +USE_NGTCP2_CRYPTO_WOLFSSL = @USE_NGTCP2_CRYPTO_WOLFSSL@ USE_NSS = @USE_NSS@ USE_OPENLDAP = @USE_OPENLDAP@ USE_QUICHE = @USE_QUICHE@ @@ -400,7 +405,6 @@ runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ -subdirs = @subdirs@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ @@ -462,6 +466,7 @@ DPAGES = \ fail-with-body.d \ fail.d \ false-start.d \ + form-escape.d \ form-string.d \ form.d \ ftp-account.d \ @@ -483,6 +488,7 @@ DPAGES = \ header.d \ help.d \ hostpubmd5.d \ + hostpubsha256.d \ hsts.d \ http0.9.d \ http1.0.d \ @@ -496,6 +502,7 @@ DPAGES = \ interface.d \ ipv4.d \ ipv6.d \ + json.d \ junk-session-cookies.d \ keepalive-time.d \ key-type.d \ @@ -524,6 +531,7 @@ DPAGES = \ next.d \ no-alpn.d \ no-buffer.d \ + no-clobber.d \ no-keepalive.d \ no-npn.d \ no-progress-meter.d \ @@ -581,12 +589,14 @@ DPAGES = \ quote.d \ random-file.d \ range.d \ + rate.d \ raw.d \ referer.d \ remote-header-name.d \ remote-name-all.d \ remote-name.d \ remote-time.d \ + remove-on-error.d \ request-target.d \ request.d \ resolve.d \ @@ -848,7 +858,6 @@ uninstall-am: .PRECIOUS: Makefile - all: $(MANPAGE) $(MANPAGE): $(DPAGES) $(OTHERPAGES) Makefile.inc diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/Makefile.inc b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/Makefile.inc index 6e04552e..350fa9fa 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/Makefile.inc +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/Makefile.inc @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -18,6 +18,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### # Shared between Makefile.am and CMakeLists.txt @@ -75,6 +77,7 @@ DPAGES = \ fail-with-body.d \ fail.d \ false-start.d \ + form-escape.d \ form-string.d \ form.d \ ftp-account.d \ @@ -96,6 +99,7 @@ DPAGES = \ header.d \ help.d \ hostpubmd5.d \ + hostpubsha256.d \ hsts.d \ http0.9.d \ http1.0.d \ @@ -109,6 +113,7 @@ DPAGES = \ interface.d \ ipv4.d \ ipv6.d \ + json.d \ junk-session-cookies.d \ keepalive-time.d \ key-type.d \ @@ -137,6 +142,7 @@ DPAGES = \ next.d \ no-alpn.d \ no-buffer.d \ + no-clobber.d \ no-keepalive.d \ no-npn.d \ no-progress-meter.d \ @@ -194,12 +200,14 @@ DPAGES = \ quote.d \ random-file.d \ range.d \ + rate.d \ raw.d \ referer.d \ remote-header-name.d \ remote-name-all.d \ remote-name.d \ remote-time.d \ + remove-on-error.d \ request-target.d \ request.d \ resolve.d \ diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/abstract-unix-socket.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/abstract-unix-socket.d index e26048f1..820dd16c 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/abstract-unix-socket.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/abstract-unix-socket.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: abstract-unix-socket Arg: Help: Connect via abstract Unix domain socket Added: 7.53.0 Protocols: HTTP Category: connection +See-also: unix-socket Example: --abstract-unix-socket socketpath $URL --- Connect through an abstract Unix domain socket, instead of using the network. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/alt-svc.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/alt-svc.d index 914b1fbc..c1dcd2bd 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/alt-svc.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/alt-svc.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: alt-svc Arg: Protocols: HTTPS Help: Enable alt-svc with this cache file Added: 7.64.1 Category: http +See-also: resolve connect-to Example: --alt-svc svc.txt $URL --- This option enables the alt-svc parser in curl. If the file name points to an diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/anyauth.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/anyauth.d index 427a64c8..8641904c 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/anyauth.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/anyauth.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: anyauth Help: Pick any authentication method Protocols: HTTP See-also: proxy-anyauth basic digest Category: http proxy auth Example: --anyauth --user me:pwd $URL +Added: 7.10.6 --- Tells curl to figure out authentication method by itself, and use the most secure one the remote site claims to support. This is done by first doing a diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/append.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/append.d index 8afaf0eb..e6e6ef23 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/append.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/append.d @@ -1,10 +1,14 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Short: a Long: append Help: Append to target file when uploading Protocols: FTP SFTP Category: ftp sftp +See-also: range continue-at Example: --upload-file local --append ftp://example.com/ +Added: 4.8 --- When used in an upload, this makes curl append to the target file instead of -overwriting it. If the remote file doesn't exist, it will be created. Note +overwriting it. If the remote file does not exist, it will be created. Note that this flag is ignored by some SFTP servers (including OpenSSH). diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/aws-sigv4.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/aws-sigv4.d index db988640..98597226 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/aws-sigv4.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/aws-sigv4.d @@ -1,8 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: aws-sigv4 Arg: Help: Use AWS V4 signature authentication Category: auth http Added: 7.75.0 +See-also: basic user Example: --aws-sigv4 "aws:amz:east-2:es" --user "key:secret" $URL --- Use AWS V4 signature authentication in the transfer. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/basic.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/basic.d index 62d2c22b..4def3cdd 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/basic.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/basic.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: basic Help: Use HTTP Basic Authentication See-also: proxy-basic Protocols: HTTP Category: auth Example: -u name:password --basic $URL +Added: 7.10.6 --- Tells curl to use HTTP Basic authentication with the remote host. This is the default and this option is usually pointless, unless you use it to override a diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/cacert.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/cacert.d index 1f380404..f950b6c7 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/cacert.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/cacert.d @@ -1,9 +1,13 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: cacert Arg: Help: CA certificate to verify peer against Protocols: TLS Category: tls +See-also: capath insecure Example: --cacert CA-file.txt $URL +Added: 7.5 --- Tells curl to use the specified certificate file to verify the peer. The file may contain multiple CA certificates. The certificate(s) must be in PEM @@ -15,7 +19,7 @@ set, and uses the given path as a path to a CA cert bundle. This option overrides that variable. The windows version of curl will automatically look for a CA certs file named -\'curl-ca-bundle.crt\', either in the same directory as curl.exe, or in the +'curl-ca-bundle.crt', either in the same directory as curl.exe, or in the Current Working Directory, or in any folder along your PATH. If curl is built against the NSS SSL library, the NSS PEM PKCS#11 module diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/capath.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/capath.d index ba407ed0..eb8cd9f6 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/capath.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/capath.d @@ -1,13 +1,17 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: capath Arg: Help: CA directory to verify peer against Protocols: TLS Category: tls +See-also: cacert insecure Example: --capath /local/directory $URL +Added: 7.9.8 --- Tells curl to use the specified certificate directory to verify the peer. Multiple paths can be provided by separating them with ":" (e.g. -\&"path1:path2:path3"). The certificates must be in PEM format, and if curl is +"path1:path2:path3"). The certificates must be in PEM format, and if curl is built against OpenSSL, the directory must have been processed using the c_rehash utility supplied with OpenSSL. Using --capath can allow OpenSSL-powered curl to make SSL-connections much more efficiently than using diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/cert-status.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/cert-status.d index 360e5c90..73e82525 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/cert-status.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/cert-status.d @@ -1,8 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: cert-status Protocols: TLS Added: 7.41.0 Help: Verify the status of the server cert via OCSP-staple Category: tls +See-also: pinnedpubkey Example: --cert-status $URL --- Tells curl to verify the status of the server certificate by using the diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/cert-type.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/cert-type.d index 9fcbfe75..8dd767ad 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/cert-type.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/cert-type.d @@ -1,12 +1,19 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: cert-type Protocols: TLS Arg: -Help: Certificate type (DER/PEM/ENG) +Help: Certificate type (DER/PEM/ENG/P12) See-also: cert key key-type Category: tls Example: --cert-type PEM --cert file $URL +Added: 7.9.3 --- Tells curl what type the provided client certificate is using. PEM, DER, ENG -and P12 are recognized types. If not specified, PEM is assumed. +and P12 are recognized types. + +The default type depends on the TLS backend and is usually PEM, however for +Secure Transport and Schannel it is P12. If --cert is a pkcs11: URI then ENG is +the default type. If this option is used several times, the last one will be used. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/cert.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/cert.d index 8e0fb88e..27690eb9 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/cert.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/cert.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Short: E Long: cert Arg: @@ -6,24 +8,29 @@ Protocols: TLS See-also: cert-type key key-type Category: tls Example: --cert certfile --key keyfile $URL +Added: 5.0 --- Tells curl to use the specified client certificate file when getting a file with HTTPS, FTPS or another SSL-based protocol. The certificate must be in PKCS#12 format if using Secure Transport, or PEM format if using any other -engine. If the optional password isn't specified, it will be queried for on -the terminal. Note that this option assumes a \&"certificate" file that is the -private key and the client certificate concatenated! See --cert and --key to +engine. If the optional password is not specified, it will be queried for on +the terminal. Note that this option assumes a certificate file that is the +private key and the client certificate concatenated. See --cert and --key to specify them independently. +In the portion of the argument, you must escape the character ":" +as "\\:" so that it is not recognized as the password delimiter. Similarly, you +must escape the character "\\" as "\\\\" so that it is not recognized as an +escape character. + If curl is built against the NSS SSL library then this option can tell curl the nickname of the certificate to use within the NSS database defined by the environment variable SSL_DIR (or by default /etc/pki/nssdb). If the NSS PEM PKCS#11 module (libnsspem.so) is available then PEM files may be -loaded. If you want to use a file from the current directory, please precede -it with "./" prefix, in order to avoid confusion with a nickname. If the -nickname contains ":", it needs to be preceded by "\\" so that it is not -recognized as password delimiter. If the nickname contains "\\", it needs to -be escaped as "\\\\" so that it is not recognized as an escape character. +loaded. + +If you provide a path relative to the current directory, you must prefix the +path with "./" in order to avoid confusion with an NSS database nickname. If curl is built against OpenSSL library, and the engine pkcs11 is available, then a PKCS#11 URI (RFC 7512) can be used to specify a certificate located in diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ciphers.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ciphers.d index c2cb92e0..a5bc9073 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ciphers.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ciphers.d @@ -1,9 +1,13 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: ciphers Arg: Help: SSL ciphers to use Protocols: TLS Category: tls +See-also: tlsv1.3 Example: --ciphers ECDHE-ECDSA-AES256-CCM8 $URL +Added: 7.9 --- Specifies which ciphers to use in the connection. The list of ciphers must specify valid ciphers. Read up on SSL cipher list details on this URL: diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/compressed-ssh.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/compressed-ssh.d index d95c6adf..5aa2310f 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/compressed-ssh.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/compressed-ssh.d @@ -1,8 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: compressed-ssh Help: Enable SSH compression Protocols: SCP SFTP Added: 7.56.0 Category: scp ssh +See-also: compressed Example: --compressed-ssh sftp://example.com/ --- Enables built-in SSH compression. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/compressed.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/compressed.d index 945beb85..c7e2ff9d 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/compressed.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/compressed.d @@ -1,8 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: compressed Help: Request compressed response Protocols: HTTP Category: http Example: --compressed $URL +See-also: compressed-ssh +Added: 7.10 --- Request a compressed response using one of the algorithms curl supports, and automatically decompress the content. Headers are not modified. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/config.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/config.d index 1de0b31f..5ca71a58 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/config.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/config.d @@ -1,11 +1,14 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: config Arg: Help: Read config from a file Short: K Category: curl Example: --config file.txt $URL +Added: 4.10 +See-also: disable --- - Specify a text file to read curl arguments from. The command line arguments found in the text file will be used as if they were provided on the command line. @@ -35,38 +38,40 @@ line. So, it could look similar to this: url = "https://curl.se/docs/" + # --- Example file --- + # this is a comment + url = "example.com" + output = "curlhere.html" + user-agent = "superagent/1.0" + + # and fetch another URL too + url = "example.com/docs/manpage.html" + -O + referer = "http://nowhereatall.example.com/" + # --- End of example file --- + When curl is invoked, it (unless --disable is used) checks for a default -config file and uses it if found, even when this option is used. The default +config file and uses it if found, even when --config is used. The default config file is checked for in the following places in this order: -1) Use the CURL_HOME environment variable if set +1) "$CURL_HOME/.curlrc" -2) Use the XDG_CONFIG_HOME environment variable if set (Added in 7.73.0) +2) "$XDG_CONFIG_HOME/.curlrc" (Added in 7.73.0) -3) Use the HOME environment variable if set +3) "$HOME/.curlrc" -4) Non-windows: use getpwuid to find the home directory +4) Windows: "%USERPROFILE%\\.curlrc" -5) Windows: use APPDATA if set +5) Windows: "%APPDATA%\\.curlrc" -6) Windows: use "USERPROFILE\\Application Data" if set +6) Windows: "%USERPROFILE%\\Application Data\\.curlrc" -7) On windows, if there is no .curlrc file in the home dir, it checks for one -in the same dir the curl executable is placed. On Unix-like systems, it will -simply try to load .curlrc from the determined home dir. +7) Non-Windows: use getpwuid to find the home directory -.nf -# --- Example file --- -# this is a comment -url = "example.com" -output = "curlhere.html" -user-agent = "superagent/1.0" +8) On Windows, if it finds no .curlrc file in the sequence described above, it +checks for one in the same dir the curl executable is placed. -# and fetch another URL too -url = "example.com/docs/manpage.html" --O -referer = "http://nowhereatall.example.com/" -# --- End of example file --- -.fi +On Windows two filenames are checked per location: .curlrc and _curlrc, +preferring the former. Older versions on Windows checked for _curlrc only. This option can be used multiple times to load multiple config files. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/connect-timeout.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/connect-timeout.d index e66e35ad..f33fc485 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/connect-timeout.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/connect-timeout.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: connect-timeout Arg: Help: Maximum time allowed for connection @@ -5,6 +7,7 @@ See-also: max-time Category: connection Example: --connect-timeout 20 $URL Example: --connect-timeout 3.14 $URL +Added: 7.7 --- Maximum time in seconds that you allow curl's connection to take. This only limits the connection phase, so if curl connects within the given period it diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/connect-to.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/connect-to.d index ebea9b9d..eded7ed1 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/connect-to.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/connect-to.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: connect-to Arg: Help: Connect to host diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/continue-at.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/continue-at.d index 9e11bdb1..3217f55f 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/continue-at.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/continue-at.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Short: C Long: continue-at Arg: @@ -6,10 +8,11 @@ See-also: range Category: connection Example: -C - $URL Example: -C 400 $URL +Added: 4.8 --- Continue/Resume a previous file transfer at the given offset. The given offset is the exact number of bytes that will be skipped, counting from the beginning -of the source file before it is transferred to the destination. If used with +of the source file before it is transferred to the destination. If used with uploads, the FTP server command SIZE will not be used by curl. Use "-C -" to tell curl to automatically find out where/how to resume the diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/cookie-jar.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/cookie-jar.d index f418af6d..3c7759c8 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/cookie-jar.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/cookie-jar.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Short: c Long: cookie-jar Arg: @@ -6,6 +8,8 @@ Help: Write cookies to after operation Category: http Example: -c store-here.txt $URL Example: -c store-here.txt -b read-these $URL +Added: 7.9 +See-also: cookie --- Specify to which file you want curl to write all cookies after a completed operation. Curl writes all cookies from its in-memory cookie storage to the @@ -18,10 +22,10 @@ This command line option will activate the cookie engine that makes curl record and use cookies. Another way to activate it is to use the --cookie option. -If the cookie jar can't be created or written to, the whole curl operation -won't fail or even report an error clearly. Using --verbose will get a warning -displayed, but that is the only visible feedback you get about this possibly -lethal situation. +If the cookie jar cannot be created or written to, the whole curl operation +will not fail or even report an error clearly. Using --verbose will get a +warning displayed, but that is the only visible feedback you get about this +possibly lethal situation. If this option is used several times, the last specified file name will be used. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/cookie.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/cookie.d index b593935e..b05a0c7d 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/cookie.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/cookie.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Short: b Long: cookie Arg: @@ -6,15 +8,20 @@ Help: Send cookies from string/file Category: http Example: -b cookiefile $URL Example: -b cookiefile -c cookiefile $URL +See-also: cookie-jar junk-session-cookies +Added: 4.9 --- -Pass the data to the HTTP server in the Cookie header. It is supposedly -the data previously received from the server in a "Set-Cookie:" line. The -data should be in the format "NAME1=VALUE1; NAME2=VALUE2". +Pass the data to the HTTP server in the Cookie header. It is supposedly the +data previously received from the server in a "Set-Cookie:" line. The data +should be in the format "NAME1=VALUE1; NAME2=VALUE2". This makes curl use the +cookie header with this content explicitly in all outgoing request(s). If +multiple requests are done due to authentication, followed redirects or +similar, they will all get this cookie passed on. If no '=' symbol is used in the argument, it is instead treated as a filename to read previously stored cookie from. This option also activates the cookie engine which will make curl record incoming cookies, which may be handy if -you're using this in combination with the --location option or do multiple URL +you are using this in combination with the --location option or do multiple URL transfers on the same invoke. If the file name is exactly a minus ("-"), curl will instead read the contents from stdin. @@ -24,13 +31,13 @@ The file format of the file to read cookies from should be plain HTTP headers The file specified with --cookie is only used as input. No cookies will be written to the file. To store cookies, use the --cookie-jar option. -If you use the Set-Cookie file format and don't specify a domain then the +If you use the Set-Cookie file format and do not specify a domain then the cookie is not sent since the domain will never match. To address this, set a domain in Set-Cookie line (doing that will include sub-domains) or preferably: use the Netscape format. This option can be used multiple times. -Users very often want to both read cookies from a file and write updated -cookies back to a file, so using both --cookie and --cookie-jar in the same -command line is common. +Users often want to both read cookies from a file and write updated cookies +back to a file, so using both --cookie and --cookie-jar in the same command +line is common. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/create-dirs.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/create-dirs.d index cae1d5a5..211d4bd8 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/create-dirs.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/create-dirs.d @@ -1,7 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: create-dirs Help: Create necessary local directory hierarchy Category: curl Example: --create-dirs --output local/dir/file $URL +Added: 7.10.3 +See-also: ftp-create-dirs output-dir --- When used in conjunction with the --output option, curl will create the necessary local directory hierarchy as needed. This option creates the diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/create-file-mode.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/create-file-mode.d index 429b5ee3..c2bb496c 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/create-file-mode.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/create-file-mode.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: create-file-mode Arg: Help: File mode for created files diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/crlf.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/crlf.d index 856cd135..f440af69 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/crlf.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/crlf.d @@ -1,8 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: crlf Help: Convert LF to CRLF in upload Protocols: FTP SMTP Category: ftp smtp Example: --crlf -T file ftp://example.com/ +Added: 5.7 +See-also: use-ascii --- Convert LF to CRLF in upload. Useful for MVS (OS/390). diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/crlfile.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/crlfile.d index 21e86a8c..9f8ee823 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/crlfile.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/crlfile.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: crlfile Arg: Protocols: TLS @@ -5,6 +7,7 @@ Help: Use this CRL list Added: 7.19.7 Category: tls Example: --crlfile rejects.txt $URL +See-also: cacert capath --- Provide a file using PEM format with a Certificate Revocation List that may specify peer certificates that are to be considered revoked. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/curves.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/curves.d index ac5ab101..2a353be1 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/curves.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/curves.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: curves Arg: Help: (EC) TLS key exchange algorithm(s) to request @@ -5,6 +7,7 @@ Protocols: TLS Added: 7.73.0 Category: tls Example: --curves X25519 $URL +See-also: ciphers --- Tells curl to request specific curves to use during SSL session establishment according to RFC 8422, 5.1. Multiple algorithms can be provided by separating @@ -12,7 +15,7 @@ them with ":" (e.g. "X25519:P-521"). The parameter is available identically in the "openssl s_client/s_server" utilities. --curves allows a OpenSSL powered curl to make SSL-connections with exactly -the (EC) curve requested by the client, avoiding intransparent client/server +the (EC) curve requested by the client, avoiding nontransparent client/server negotiations. If this option is set, the default curves list built into openssl will be diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/data-ascii.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/data-ascii.d index 943f301d..72887e71 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/data-ascii.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/data-ascii.d @@ -1,8 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: data-ascii Arg: Help: HTTP POST ASCII data Protocols: HTTP Category: http post upload Example: --data-ascii @file $URL +Added: 7.2 +See-also: data-binary data-raw data-urlencode --- This is just an alias for --data. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/data-binary.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/data-binary.d index 578cebca..117a6d8a 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/data-binary.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/data-binary.d @@ -1,13 +1,17 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: data-binary Arg: Help: HTTP POST binary data Protocols: HTTP Category: http post upload Example: --data-binary @filename $URL +Added: 7.2 +See-also: data-ascii --- This posts data exactly as specified with no extra processing whatsoever. -If you start the data with the letter @, the rest should be a filename. Data +If you start the data with the letter @, the rest should be a filename. Data is posted in a similar manner as --data does, except that newlines and carriage returns are preserved and conversions are never done. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/data-raw.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/data-raw.d index b8cd0f72..462832bf 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/data-raw.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/data-raw.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: data-raw Arg: Protocols: HTTP diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/data-urlencode.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/data-urlencode.d index 8b129575..93a2325e 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/data-urlencode.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/data-urlencode.d @@ -1,6 +1,8 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: data-urlencode Arg: -Help: HTTP POST data url encoded +Help: HTTP POST data URL encoded Protocols: HTTP See-also: data data-raw Added: 7.18.0 @@ -19,7 +21,7 @@ curl using one of the following syntaxes: .RS .IP "content" This will make curl URL-encode the content and pass that on. Just be careful -so that the content doesn't contain any = or @ symbols, as that will then make +so that the content does not contain any = or @ symbols, as that will then make the syntax match one of the other cases below! .IP "=content" This will make curl URL-encode the content and pass that on. The preceding = diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/data.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/data.d index 35fd675e..bf8525ba 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/data.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/data.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: data Short: d Arg: @@ -9,25 +11,26 @@ Category: important http post upload Example: -d "name=curl" $URL Example: -d "name=curl" -d "tool=cmdline" $URL Example: -d @filename $URL +Added: 4.0 --- Sends the specified data in a POST request to the HTTP server, in the same way that a browser does when a user has filled in an HTML form and presses the submit button. This will cause curl to pass the data to the server using the -content-type application/x-www-form-urlencoded. Compare to --form. +content-type application/x-www-form-urlencoded. Compare to --form. --data-raw is almost the same but does not have a special interpretation of the @ character. To post data purely binary, you should instead use the ---data-binary option. To URL-encode the value of a form field you may use +--data-binary option. To URL-encode the value of a form field you may use --data-urlencode. If any of these options is used more than once on the same command line, the -data pieces specified will be merged together with a separating -&-symbol. Thus, using '-d name=daniel -d skill=lousy' would generate a post -chunk that looks like \&'name=daniel&skill=lousy'. +data pieces specified will be merged with a separating &-symbol. Thus, using +'-d name=daniel -d skill=lousy' would generate a post chunk that looks like +'name=daniel&skill=lousy'. If you start the data with the letter @, the rest should be a file name to read the data from, or - if you want curl to read the data from stdin. Posting -data from a file named \&'foobar' would thus be done with --data @foobar. When +data from a file named 'foobar' would thus be done with --data @foobar. When --data is told to read from a file like that, carriage returns and newlines -will be stripped out. If you don't want the @ character to have a special +will be stripped out. If you do not want the @ character to have a special interpretation use --data-raw instead. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/delegation.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/delegation.d index 1514d66b..aa37ceb5 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/delegation.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/delegation.d @@ -1,15 +1,19 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: delegation Arg: Help: GSS-API delegation permission Protocols: GSS/kerberos Category: auth Example: --delegation "none" $URL +Added: 7.22.0 +See-also: insecure ssl --- Set LEVEL to tell the server what it is allowed to delegate when it comes to user credentials. .RS .IP "none" -Don't allow any delegation. +Do not allow any delegation. .IP "policy" Delegates if and only if the OK-AS-DELEGATE flag is set in the Kerberos service ticket, which is a matter of realm policy. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/digest.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/digest.d index 19341377..ca60c06a 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/digest.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/digest.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: digest Help: Use HTTP Digest Authentication Protocols: HTTP @@ -5,6 +7,7 @@ Mutexed: basic ntlm negotiate See-also: user proxy-digest anyauth Category: proxy auth http Example: -u name:password --digest $URL +Added: 7.10.6 --- Enables HTTP Digest authentication. This is an authentication scheme that prevents the password from being sent over the wire in clear text. Use this in diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/disable-eprt.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/disable-eprt.d index 38b3e0b3..021d2152 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/disable-eprt.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/disable-eprt.d @@ -1,8 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: disable-eprt Help: Inhibit using EPRT or LPRT Protocols: FTP Category: ftp Example: --disable-eprt ftp://example.com/ +Added: 7.10.5 +See-also: disable-epsv ftp-port --- Tell curl to disable the use of the EPRT and LPRT commands when doing active FTP transfers. Curl will normally always first attempt to use EPRT, then LPRT diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/disable-epsv.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/disable-epsv.d index 281ec5c9..092b99eb 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/disable-epsv.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/disable-epsv.d @@ -1,8 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: disable-epsv Help: Inhibit using EPSV Protocols: FTP Category: ftp Example: --disable-epsv ftp://example.com/ +Added: 7.9.2 +See-also: disable-eprt ftp-port --- Tell curl to disable the use of the EPSV command when doing passive FTP transfers. Curl will normally always first attempt to use EPSV before diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/disable.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/disable.d index 3eb87f8d..2577c0f5 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/disable.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/disable.d @@ -1,8 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: disable Short: q Help: Disable .curlrc Category: curl Example: -q $URL +Added: 5.0 +See-also: config --- If used as the first parameter on the command line, the *curlrc* config file will not be read and used. See the --config for details on the default diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/disallow-username-in-url.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/disallow-username-in-url.d index f3122aea..0cf6e757 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/disallow-username-in-url.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/disallow-username-in-url.d @@ -1,10 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: disallow-username-in-url -Help: Disallow username in url +Help: Disallow username in URL Protocols: HTTP Added: 7.61.0 See-also: proto Category: curl http Example: --disallow-username-in-url $URL --- -This tells curl to exit if passed a url containing a username. This is probably -most useful when the URL is being provided at run-time or similar. +This tells curl to exit if passed a URL containing a username. This is probably +most useful when the URL is being provided at runtime or similar. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/dns-interface.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/dns-interface.d index fec7927e..0b07f85c 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/dns-interface.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/dns-interface.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: dns-interface Arg: Help: Interface to use for DNS requests diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/dns-ipv4-addr.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/dns-ipv4-addr.d index e09153ab..31ec5632 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/dns-ipv4-addr.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/dns-ipv4-addr.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: dns-ipv4-addr Arg:
Help: IPv4 address to use for DNS requests diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/dns-ipv6-addr.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/dns-ipv6-addr.d index 954cb98b..719f4b2a 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/dns-ipv6-addr.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/dns-ipv6-addr.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: dns-ipv6-addr Arg:
Help: IPv6 address to use for DNS requests diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/dns-servers.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/dns-servers.d index 08947358..eea78a77 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/dns-servers.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/dns-servers.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: dns-servers Arg: Help: DNS server addrs to use @@ -5,6 +7,7 @@ Requires: c-ares Added: 7.33.0 Category: dns Example: --dns-servers 192.168.0.1,192.168.0.2 $URL +See-also: dns-interface dns-ipv4-addr --- Set the list of DNS servers to be used instead of the system default. The list of IP addresses should be separated with commas. Port numbers diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/doh-cert-status.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/doh-cert-status.d index a760a6fb..4d62d686 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/doh-cert-status.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/doh-cert-status.d @@ -1,8 +1,10 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: doh-cert-status Help: Verify the status of the DoH server cert via OCSP-staple -Protocols: all Added: 7.76.0 Category: dns tls Example: --doh-cert-status --doh-url https://doh.example $URL +See-also: doh-insecure --- Same as --cert-status but used for DoH (DNS-over-HTTPS). diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/doh-insecure.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/doh-insecure.d index 907a5dcd..1b7a5939 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/doh-insecure.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/doh-insecure.d @@ -1,8 +1,10 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: doh-insecure Help: Allow insecure DoH server connections -Protocols: all Added: 7.76.0 Category: dns tls Example: --doh-insecure --doh-url https://doh.example $URL +See-also: doh-url --- Same as --insecure but used for DoH (DNS-over-HTTPS). diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/doh-url.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/doh-url.d index 80ff96cc..746623ff 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/doh-url.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/doh-url.d @@ -1,10 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: doh-url Arg: Help: Resolve host names over DoH -Protocols: all Added: 7.62.0 Category: dns Example: --doh-url https://doh.example $URL +See-also: doh-insecure --- Specifies which DNS-over-HTTPS (DoH) server to use to resolve hostnames, instead of using the default name resolver mechanism. The URL must be HTTPS. @@ -14,4 +16,7 @@ name lookups take place over SSL. However, the certificate verification settings are not inherited and can be controlled separately via --doh-insecure and --doh-cert-status. +This option is unset if an empty string "" is used as the URL. (Added in +7.85.0) + If this option is used several times, the last one will be used. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/dump-header.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/dump-header.d index 62c92f44..8fc1e2d5 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/dump-header.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/dump-header.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: dump-header Short: D Arg: @@ -6,6 +8,7 @@ Protocols: HTTP FTP See-also: output Category: http ftp Example: --dump-header store.txt $URL +Added: 5.7 --- Write the received protocol headers to the specified file. If no headers are received, the use of this option will create an empty file. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/egd-file.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/egd-file.d index 2e99df4c..a46a638b 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/egd-file.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/egd-file.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: egd-file Arg: Help: EGD socket path for random data @@ -5,6 +7,10 @@ Protocols: TLS See-also: random-file Category: tls Example: --egd-file /random/here $URL +Added: 7.7 --- +Deprecated option. This option is ignored by curl since 7.84.0. Prior to that +it only had an effect on curl if built to use old versions of OpenSSL. + Specify the path name to the Entropy Gathering Daemon socket. The socket is used to seed the random engine for SSL connections. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/engine.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/engine.d index 8a2dcf74..9e193d6f 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/engine.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/engine.d @@ -1,10 +1,14 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: engine Arg: Help: Crypto engine to use Protocols: TLS Category: tls Example: --engine flavor $URL +Added: 7.9.3 +See-also: ciphers curves --- Select the OpenSSL crypto engine to use for cipher operations. Use --engine list to print a list of build-time supported engines. Note that not all (and -possibly none) of the engines may be available at run-time. +possibly none) of the engines may be available at runtime. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/etag-compare.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/etag-compare.d index fa167628..598a4638 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/etag-compare.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/etag-compare.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: etag-compare Arg: Help: Pass an ETag from a file as a custom header @@ -5,6 +7,7 @@ Protocols: HTTP Added: 7.68.0 Category: http Example: --etag-compare etag.txt $URL +See-also: etag-save time-cond --- This option makes a conditional HTTP request for the specific ETag read from the given file by sending a custom If-None-Match header using the diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/etag-save.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/etag-save.d index 8efad904..221e90e0 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/etag-save.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/etag-save.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: etag-save Arg: Help: Parse ETag from a request and save it to a file @@ -5,6 +7,7 @@ Protocols: HTTP Added: 7.68.0 Category: http Example: --etag-save storetag.txt $URL +See-also: etag-compare --- This option saves an HTTP ETag to the specified file. An ETag is a caching related header, usually returned in a response. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/expect100-timeout.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/expect100-timeout.d index 8855edd0..523bc7ab 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/expect100-timeout.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/expect100-timeout.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: expect100-timeout Arg: Help: How long to wait for 100-continue diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/fail-early.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/fail-early.d index aad15c3f..c8a78b97 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/fail-early.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/fail-early.d @@ -1,8 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: fail-early Help: Fail on first transfer error, do not continue Added: 7.52.0 Category: curl Example: --fail-early $URL https://two.example +See-also: fail fail-with-body --- Fail and exit on the first detected transfer error. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/fail-with-body.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/fail-with-body.d index 9b8c7db4..c77fb981 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/fail-with-body.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/fail-with-body.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: fail-with-body Protocols: HTTP Help: Fail on HTTP errors but save the body Category: http output Added: 7.76.0 See-also: fail +Mutexed: fail Example: --fail-with-body $URL --- Return an error on server errors where the HTTP response code is 400 or diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/fail.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/fail.d index a5e0c91e..d3786975 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/fail.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/fail.d @@ -1,16 +1,20 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: fail Short: f Protocols: HTTP -Help: Fail silently (no output at all) on HTTP errors +Help: Fail fast with no output on HTTP errors See-also: fail-with-body Category: important http Example: --fail $URL +Mutexed: fail-with-body +Added: 4.0 --- -Fail silently (no output at all) on server errors. This is mostly done to -enable scripts etc to better deal with failed attempts. In normal cases -when an HTTP server fails to deliver a document, it returns an HTML document -stating so (which often also describes why and more). This flag will prevent -curl from outputting that and return error 22. +Fail fast with no output at all on server errors. This is useful to enable +scripts and users to better deal with failed attempts. In normal cases when an +HTTP server fails to deliver a document, it returns an HTML document stating +so (which often also describes why and more). This flag will prevent curl from +outputting that and return error 22. This method is not fail-safe and there are occasions where non-successful response codes will slip through, especially when authentication is involved diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/false-start.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/false-start.d index de36962e..72ff1390 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/false-start.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/false-start.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: false-start Help: Enable TLS False Start Protocols: TLS Added: 7.42.0 Category: tls Example: --false-start $URL +See-also: tcp-fastopen --- Tells curl to use false start during the TLS handshake. False start is a mode where a TLS client will start sending application data before verifying the diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/form-string.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/form-string.d index 4f1a766b..f669bbbc 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/form-string.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/form-string.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: form-string Help: Specify multipart MIME data Protocols: HTTP SMTP IMAP @@ -5,9 +7,10 @@ Arg: See-also: form Category: http upload Example: --form-string "data" $URL +Added: 7.13.2 --- Similar to --form except that the value string for the named parameter is used -literally. Leading \&'@' and \&'<' characters, and the \&';type=' string in +literally. Leading '@' and '<' characters, and the ';type=' string in the value have no special meaning. Use this in preference to --form if there's any possibility that the string value may accidentally trigger the -\&'@' or \&'<' features of --form. +'@' or '<' features of --form. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/form.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/form.d index 06f2c553..1e1c41d4 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/form.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/form.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: form Short: F Arg: @@ -6,6 +8,8 @@ Protocols: HTTP SMTP IMAP Mutexed: data head upload-file Category: http upload Example: --form "name=curl" --form "file=@loadthis" $URL +Added: 5.0 +See-also: data form-string form-escape --- For HTTP protocol family, this lets curl emulate a filled-in form in which a user has pressed the submit button. This causes curl to POST data using the @@ -24,13 +28,13 @@ file. Tell curl to read content from stdin instead of a file by using - as filename. This goes for both @ and < constructs. When stdin is used, the contents is buffered in memory first by curl to determine its size and allow a -possible resend. Defining a part's data from a named non-regular file (such +possible resend. Defining a part's data from a named non-regular file (such as a named pipe or similar) is unfortunately not subject to buffering and will be effectively read at transmission time; since the full size is unknown before the transfer starts, such data is sent as chunks by HTTP and rejected by IMAP. -Example: send an image to an HTTP server, where \&'profile' is the name of the +Example: send an image to an HTTP server, where 'profile' is the name of the form-field to which the file portrait.jpg will be the input: curl -F profile=@portrait.jpg https://example.com/upload.cgi @@ -90,16 +94,12 @@ carriage-returns and trailing spaces are stripped. Here is an example of a header file contents: # This file contain two headers. -.br X-header-1: this is a header # The following header is folded. -.br X-header-2: this is -.br another header - To support sending multipart mail messages, the syntax is extended as follows: .br - name can be omitted: the equal sign is the first character of the argument, @@ -109,16 +109,13 @@ followed by a content type specification. .br - a multipart can be terminated with a '=)' argument. -Example: the following command sends an SMTP mime e-mail consisting in an +Example: the following command sends an SMTP mime email consisting in an inline part in two alternative formats: plain text and HTML. It attaches a text file: curl -F '=(;type=multipart/alternative' \\ -.br - -F '=plain text message' \\ -.br - -F '= HTML message;type=text/html' \\ -.br + -F '=plain text message' \\ + -F '= HTML message;type=text/html' \\ -F '=)' -F '=@textfile.txt' ... smtp://example.com Data can be encoded for transfer using encoder=. Available encodings are @@ -132,7 +129,6 @@ Example: send multipart mail with a quoted-printable text message and a base64 attached file: curl -F '=text message;encoder=quoted-printable' \\ -.br -F '=@localfile;encoder=base64' ... smtp://example.com See further examples and details in the MANUAL. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-account.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-account.d index ce816f10..97be878a 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-account.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-account.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: ftp-account Arg: Help: Account data string @@ -5,6 +7,7 @@ Protocols: FTP Added: 7.13.0 Category: ftp auth Example: --ftp-account "mr.robot" ftp://example.com/ +See-also: user --- When an FTP server asks for "account data" after user name and password has been provided, this data is sent off using the ACCT command. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-alternative-to-user.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-alternative-to-user.d index a5fb9853..132ef07f 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-alternative-to-user.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-alternative-to-user.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: ftp-alternative-to-user Arg: Help: String to replace USER [name] @@ -5,6 +7,7 @@ Protocols: FTP Added: 7.15.5 Category: ftp Example: --ftp-alternative-to-user "U53r" ftp://example.com +See-also: ftp-account user --- If authenticating with the USER and PASS commands fails, send this command. When connecting to Tumbleweed's Secure Transport server over FTPS using a diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-create-dirs.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-create-dirs.d index 579f8e36..de61bbec 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-create-dirs.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-create-dirs.d @@ -1,10 +1,13 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: ftp-create-dirs Protocols: FTP SFTP Help: Create the remote dirs if not present See-also: create-dirs Category: ftp sftp curl Example: --ftp-create-dirs -T file ftp://example.com/remote/path/file +Added: 7.10.7 --- -When an FTP or SFTP URL/operation uses a path that doesn't currently exist on +When an FTP or SFTP URL/operation uses a path that does not currently exist on the server, the standard behavior of curl is to fail. Using this option, curl will instead attempt to create missing directories. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-method.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-method.d index 4af0baf4..93f3868d 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-method.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-method.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: ftp-method Arg: Help: Control CWD usage @@ -7,19 +9,20 @@ Category: ftp Example: --ftp-method multicwd ftp://example.com/dir1/dir2/file Example: --ftp-method nocwd ftp://example.com/dir1/dir2/file Example: --ftp-method singlecwd ftp://example.com/dir1/dir2/file +See-also: list-only --- Control what method curl should use to reach a file on an FTP(S) server. The method argument should be one of the following alternatives: .RS .IP multicwd curl does a single CWD operation for each path part in the given URL. For deep -hierarchies this means very many commands. This is how RFC 1738 says it should +hierarchies this means many commands. This is how RFC 1738 says it should be done. This is the default but the slowest behavior. .IP nocwd curl does no CWD at all. curl will do SIZE, RETR, STOR etc and give a full path to the server for all these commands. This is the fastest behavior. .IP singlecwd curl does one CWD with the full target directory and then operates on the file -\&"normally" (like in the multicwd case). This is somewhat more standards +"normally" (like in the multicwd case). This is somewhat more standards compliant than 'nocwd' but without the full penalty of 'multicwd'. .RE diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-pasv.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-pasv.d index d920fefa..a38fe0ef 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-pasv.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-pasv.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: ftp-pasv Help: Use PASV/EPSV instead of PORT Protocols: FTP @@ -11,7 +13,7 @@ behavior, but using this option can be used to override a previous --ftp-port option. If this option is used several times, only the first one is used. Undoing an -enforced passive really isn't doable but you must then instead enforce the +enforced passive really is not doable but you must then instead enforce the correct --ftp-port again. Passive mode means that curl will try the EPSV command first and then PASV, diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-port.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-port.d index 52e55e58..e55052b8 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-port.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-port.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: ftp-port Arg:
Help: Use PORT instead of PASV @@ -8,6 +10,7 @@ Category: ftp Example: -P - ftp:/example.com Example: -P eth0 ftp:/example.com Example: -P 192.168.0.2 ftp:/example.com +Added: 4.0 --- Reverses the default initiator/listener roles when connecting with FTP. This option makes curl use active mode. curl then tells the server to connect back @@ -30,7 +33,8 @@ If this option is used several times, the last one will be used. Disable the use of PORT with --ftp-pasv. Disable the attempt to use the EPRT command instead of PORT by using --disable-eprt. EPRT is really PORT++. -Since 7.19.5, you can append \&":[start]-[end]\&" to the right of the address, -to tell curl what TCP port range to use. That means you specify a port range, -from a lower to a higher number. A single number works as well, but do note -that it increases the risk of failure since the port may not be available. +You can also append ":[start]-[end]\&" to the right of the address, to tell +curl what TCP port range to use. That means you specify a port range, from a +lower to a higher number. A single number works as well, but do note that it +increases the risk of failure since the port may not be available. +(Added in 7.19.5) diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-pret.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-pret.d index 453d8cf8..16053f6a 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-pret.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-pret.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: ftp-pret Help: Send PRET before PASV Protocols: FTP Added: 7.20.0 Category: ftp Example: --ftp-pret ftp://example.com/ +See-also: ftp-port ftp-pasv --- Tell curl to send a PRET command before PASV (and EPSV). Certain FTP servers, mainly drftpd, require this non-standard command for directory listings as diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-skip-pasv-ip.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-skip-pasv-ip.d index 36f9e6da..89e7e578 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-skip-pasv-ip.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-skip-pasv-ip.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: ftp-skip-pasv-ip Help: Skip the IP address for PASV Protocols: FTP diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-ssl-ccc-mode.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-ssl-ccc-mode.d index 15ad1f54..39f5ad52 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-ssl-ccc-mode.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-ssl-ccc-mode.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: ftp-ssl-ccc-mode Arg: Help: Set CCC mode diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-ssl-ccc.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-ssl-ccc.d index bfaf431b..ab1d49b1 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-ssl-ccc.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-ssl-ccc.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: ftp-ssl-ccc Help: Send CCC after authenticating Protocols: FTP diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-ssl-control.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-ssl-control.d index 72dc080b..b531d7ab 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-ssl-control.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ftp-ssl-control.d @@ -1,10 +1,13 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: ftp-ssl-control Help: Require SSL/TLS for FTP login, clear for transfer Protocols: FTP Added: 7.16.0 Category: ftp tls Example: --ftp-ssl-control ftp://example.com +See-also: ssl --- Require SSL/TLS for the FTP login, clear for transfer. Allows secure authentication, but non-encrypted data transfers for efficiency. Fails the -transfer if the server doesn't support SSL/TLS. +transfer if the server does not support SSL/TLS. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/gen.pl b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/gen.pl index c058987d..01f9cf61 100755 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/gen.pl +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/gen.pl @@ -6,7 +6,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. +# Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -19,6 +19,8 @@ # This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY # KIND, either express or implied. # +# SPDX-License-Identifier: curl +# ########################################################################### =begin comment @@ -45,6 +47,20 @@ my %protolong; my %catlong; +use POSIX qw(strftime); +my $date = strftime "%B %d %Y", localtime; +my $year = strftime "%Y", localtime; +my $version = "unknown"; + +open(INC, "<../../include/curl/curlver.h"); +while() { + if($_ =~ /^#define LIBCURL_VERSION \"([0-9.]*)/) { + $version = $1; + last; + } +} +close(INC); + # get the long name version, return the man page string sub manpageify { my ($k)=@_; @@ -62,25 +78,49 @@ sub manpageify { sub printdesc { my @desc = @_; + my $exam = 0; for my $d (@desc) { + if($d =~ /\(Added in ([0-9.]+)\)/i) { + my $ver = $1; + if(too_old($ver)) { + $d =~ s/ *\(Added in $ver\)//gi; + } + } if($d !~ /^.\\"/) { # **bold** $d =~ s/\*\*([^ ]*)\*\*/\\fB$1\\fP/g; # *italics* $d =~ s/\*([^ ]*)\*/\\fI$1\\fP/g; } + if(!$exam && ($d =~ /^ /)) { + # start of example + $exam = 1; + print ".nf\n"; # no-fill + } + elsif($exam && ($d !~ /^ /)) { + # end of example + $exam = 0; + print ".fi\n"; # fill-in + } # skip lines starting with space (examples) - if($d =~ /^[^ ]/) { + if($d =~ /^[^ ]/ && $d =~ /--/) { for my $k (keys %optlong) { my $l = manpageify($k); - $d =~ s/--$k([^a-z0-9_-])/$l$1/; + $d =~ s/--\Q$k\E([^a-z0-9_-])([^a-zA-Z0-9_])/$l$1$2/; } } # quote "bare" minuses in the output $d =~ s/( |\\fI|^)--/$1\\-\\-/g; $d =~ s/([ -]|\\fI|^)-/$1\\-/g; + # handle single quotes first on the line + $d =~ s/^(\s*)\'/$1\\(aq/; + # handle double quotes first on the line + $d =~ s/^(\s*)\"/$1\\(dq/; print $d; } + if($exam) { + print ".fi\n"; # fill-in + } } sub seealso { @@ -114,8 +154,29 @@ sub protocols { } } +sub too_old { + my ($version)=@_; + my $a = 999999; + if($version =~ /^(\d+)\.(\d+)\.(\d+)/) { + $a = $1 * 1000 + $2 * 10 + $3; + } + elsif($version =~ /^(\d+)\.(\d+)/) { + $a = $1 * 1000 + $2 * 10; + } + if($a < 7300) { + # we consider everything before 7.30.0 to be too old to mention + # specific changes for + return 1; + } + return 0; +} + sub added { my ($standalone, $data)=@_; + if(too_old($data)) { + # don't mention ancient additions + return ""; + } if($standalone) { return ".SH \"ADDED\"\nAdded in curl version $data\n"; } @@ -138,6 +199,8 @@ sub single { my $requires; my $category; my $seealso; + my $copyright; + my $spdx; my @examples; # there can be more than one my $magic; # cmdline special option my $line; @@ -179,21 +242,43 @@ sub single { elsif(/^Example: *(.*)/i) { push @examples, $1; } + elsif(/^C: (.*)/i) { + $copyright=$1; + } + elsif(/^SPDX-License-Identifier: (.*)/i) { + $spdx=$1; + } elsif(/^Help: *(.*)/i) { ; } elsif(/^---/) { if(!$long) { print STDERR "ERROR: no 'Long:' in $f\n"; - exit 1; + return 1; } if(!$category) { print STDERR "ERROR: no 'Category:' in $f\n"; - exit 2; + return 2; } if(!$examples[0]) { print STDERR "$f:$line:1:ERROR: no 'Example:' present\n"; - exit 2; + return 2; + } + if(!$added) { + print STDERR "$f:$line:1:ERROR: no 'Added:' version present\n"; + return 2; + } + if(!$seealso) { + print STDERR "$f:$line:1:ERROR: no 'See-also:' field present\n"; + return 2; + } + if(!$copyright) { + print STDERR "$f:$line:1:ERROR: no 'C:' field present\n"; + return 2; + } + if(!$spdx) { + print STDERR "$f:$line:1:ERROR: no 'SPDX-License-Identifier:' field present\n"; + return 2; } last; } @@ -257,7 +342,7 @@ sub single { my $i = 0; for my $k (@m) { if(!$helplong{$k}) { - print STDERR "WARN: $f see-alsos a non-existing option: $k\n"; + print STDERR "$f:$line:1:WARN: see-also a non-existing option: $k\n"; } my $l = manpageify($k); my $sep = " and"; @@ -284,7 +369,8 @@ sub single { my $l = manpageify($k); $mstr .= sprintf "%s$l", $mstr?" and ":""; } - push @foot, overrides($standalone, "This option overrides $mstr. "); + push @foot, overrides($standalone, + "This option is mutually exclusive to $mstr. "); } if($examples[0]) { my $s =""; @@ -365,6 +451,8 @@ sub header { open(F, "<:crlf", "$f"); my @d; while() { + s/%DATE/$date/g; + s/%VERSION/$version/g; push @d, $_; } close(F); @@ -372,6 +460,44 @@ sub header { } sub listhelp { + print <, 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 "tool_setup.h" +#include "tool_help.h" + +/* + * DO NOT edit tool_listhelp.c manually. + * This source file is generated with the following command: + + cd \$srcroot/docs/cmdline-opts + ./gen.pl listhelp *.d > \$srcroot/src/tool_listhelp.c + */ + +const struct helptxt helptext[] = { +HEAD + ; foreach my $f (sort keys %helplong) { my $long = $f; my $short = $optlong{$long}; @@ -409,6 +535,11 @@ sub listhelp { } print $line; } + print <, et al. +SPDX-License-Identifier: curl Long: get Short: G Help: Put the post data in the URL and use GET @@ -5,6 +7,8 @@ Category: http upload Example: --get $URL Example: --get -d "tool=curl" -d "age=old" $URL Example: --get -I -d "tool=curl" $URL +Added: 7.8.1 +See-also: data request --- When used, this option will make all data specified with --data, --data-binary or --data-urlencode to be used in an HTTP GET request instead of the POST @@ -15,5 +19,5 @@ If used in combination with --head, the POST data will instead be appended to the URL with a HEAD request. If this option is used several times, only the first one is used. This is -because undoing a GET doesn't make sense, but you should then instead enforce +because undoing a GET does not make sense, but you should then instead enforce the alternative method you prefer. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/globoff.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/globoff.d index ec2c7ae4..bf22f327 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/globoff.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/globoff.d @@ -1,8 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: globoff Short: g Help: Disable URL sequences and ranges using {} and [] Category: curl Example: -g "https://example.com/{[]}}}}" +Added: 7.6 +See-also: config disable --- This option switches off the "URL globbing parser". When you set this option, you can specify URLs that contain the letters {}[] without having curl itself diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/happy-eyeballs-timeout-ms.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/happy-eyeballs-timeout-ms.d index c3b2a513..d631cbe4 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/happy-eyeballs-timeout-ms.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/happy-eyeballs-timeout-ms.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: happy-eyeballs-timeout-ms Arg: Help: Time for IPv6 before trying IPv4 Added: 7.59.0 Category: connection Example: --happy-eyeballs-timeout-ms 500 $URL +See-also: max-time connect-timeout --- Happy Eyeballs is an algorithm that attempts to connect to both IPv4 and IPv6 addresses for dual-stack hosts, giving IPv6 a head-start of the specified diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/haproxy-protocol.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/haproxy-protocol.d index 446dc657..ed8b49f5 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/haproxy-protocol.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/haproxy-protocol.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: haproxy-protocol Help: Send HAProxy PROXY protocol v1 header Protocols: HTTP Added: 7.60.0 Category: http proxy Example: --haproxy-protocol $URL +See-also: proxy --- Send a HAProxy PROXY protocol v1 header at the beginning of the connection. This is used by some load balancers and reverse proxies to diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/head.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/head.d index 06d2489d..56fbf7ba 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/head.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/head.d @@ -1,9 +1,13 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: head Short: I Help: Show document info only Protocols: HTTP FTP FILE Category: http ftp file Example: -I $URL +Added: 4.0 +See-also: get verbose trace-ascii --- Fetch the headers only! HTTP-servers feature the command HEAD which this uses to get nothing but the header of a document. When used on an FTP or FILE file, diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/header.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/header.d index 11c96d5e..a7841edb 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/header.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/header.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: header Short: H Arg:
@@ -8,17 +10,18 @@ See-also: user-agent referer Example: -H "X-First-Name: Joe" $URL Example: -H "User-Agent: yes-please/2000" $URL Example: -H "Host:" $URL +Added: 5.0 --- Extra header to include in the request when sending HTTP to a server. You may specify any number of extra headers. Note that if you should add a custom header that has the same name as one of the internal ones curl would use, your externally set header will be used instead of the internal one. This allows you to make even trickier stuff than curl would normally do. You should not -replace internally set headers without knowing perfectly well what you're +replace internally set headers without knowing perfectly well what you are doing. Remove an internal header by giving a replacement without content on -the right side of the colon, as in: -H \&"Host:". If you send the custom +the right side of the colon, as in: -H "Host:". If you send the custom header with no-value then its header must be terminated with a semicolon, such -as \-H \&"X-Custom-Header;" to send "X-Custom-Header:". +as \-H "X-Custom-Header;" to send "X-Custom-Header:". curl will make sure that each header you add/replace is sent with the proper end-of-line marker, you should thus **not** add that as a part of the header @@ -29,10 +32,10 @@ This option can take an argument in @filename style, which then adds a header for each line in the input file. Using @- will make curl read the header file from stdin. Added in 7.55.0. -You need --proxy-header to send custom headers intended for a HTTP +You need --proxy-header to send custom headers intended for an HTTP proxy. Added in 7.37.0. -Passing on a "Transfer-Encoding: chunked" header when doing a HTTP request +Passing on a "Transfer-Encoding: chunked" header when doing an HTTP request with a request body, will make curl send the data using chunked encoding. **WARNING**: headers set with this option will be set in all requests - even diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/help.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/help.d index 28ae868d..d1a794df 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/help.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/help.d @@ -1,9 +1,13 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: help Arg: Short: h Help: Get help for commands Category: important curl Example: --help all +Added: 4.0 +See-also: verbose --- Usage help. This lists all commands of the . If no arg was provided, curl will display the most important diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/hostpubmd5.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/hostpubmd5.d index 833db950..f0fd9942 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/hostpubmd5.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/hostpubmd5.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: hostpubmd5 Arg: Help: Acceptable MD5 hash of the host public key @@ -5,6 +7,7 @@ Protocols: SFTP SCP Added: 7.17.1 Category: sftp scp Example: --hostpubmd5 e5c1c49020640a5ab0f2034854c321a8 sftp://example.com/ +See-also: hostpubsha256 --- Pass a string containing 32 hexadecimal digits. The string should be the 128 bit MD5 checksum of the remote host's public key, curl will refuse diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/hsts.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/hsts.d index f9cd453d..1b3fcede 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/hsts.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/hsts.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: hsts Arg: Protocols: HTTPS @@ -5,6 +7,7 @@ Help: Enable HSTS with this cache file Added: 7.74.0 Category: http Example: --hsts cache.txt $URL +See-also: proto --- This option enables HSTS for the transfer. If the file name points to an existing HSTS cache file, that will be used. After a completed transfer, the diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/http0.9.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/http0.9.d index 7c45d565..028a43f8 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/http0.9.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/http0.9.d @@ -1,10 +1,13 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: http0.9 Tags: Versions Protocols: HTTP -Added: Help: Allow HTTP 0.9 responses Category: http Example: --http0.9 $URL +Added: 7.64.0 +See-also: http1.1 http2 http3 --- Tells curl to be fine with HTTP version 0.9 response. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/http1.0.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/http1.0.d index cbfbaee4..1a8c96a7 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/http1.0.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/http1.0.d @@ -1,12 +1,15 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Short: 0 Long: http1.0 Tags: Versions Protocols: HTTP -Added: -Mutexed: http1.1 http2 +Added: 7.9.1 +Mutexed: http1.1 http2 http2-prior-knowledge http3 Help: Use HTTP 1.0 Category: http Example: --http1.0 $URL +See-also: http0.9 http1.1 --- Tells curl to use HTTP version 1.0 instead of using its internally preferred HTTP version. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/http1.1.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/http1.1.d index 01fa76d3..a4f0468f 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/http1.1.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/http1.1.d @@ -1,10 +1,13 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: http1.1 Tags: Versions Protocols: HTTP Added: 7.33.0 -Mutexed: http1.0 http2 +Mutexed: http1.0 http2 http2-prior-knowledge http3 Help: Use HTTP 1.1 Category: http Example: --http1.1 $URL +See-also: http1.0 http0.9 --- Tells curl to use HTTP version 1.1. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/http2-prior-knowledge.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/http2-prior-knowledge.d index e3b32f6b..77d2d5db 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/http2-prior-knowledge.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/http2-prior-knowledge.d @@ -1,12 +1,15 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: http2-prior-knowledge Tags: Versions Protocols: HTTP Added: 7.49.0 -Mutexed: http1.1 http1.0 http2 +Mutexed: http1.1 http1.0 http2 http3 Requires: HTTP/2 Help: Use HTTP 2 without HTTP/1.1 Upgrade Category: http Example: --http2-prior-knowledge $URL +See-also: http2 http3 --- Tells curl to issue its non-TLS HTTP requests using HTTP/2 without HTTP/1.1 Upgrade. It requires prior knowledge that the server supports HTTP/2 straight diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/http2.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/http2.d index 2a85db60..988cba5b 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/http2.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/http2.d @@ -1,8 +1,10 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: http2 Tags: Versions Protocols: HTTP Added: 7.33.0 -Mutexed: http1.1 http1.0 http2-prior-knowledge +Mutexed: http1.1 http1.0 http2-prior-knowledge http3 Requires: HTTP/2 See-also: no-alpn Help: Use HTTP 2 @@ -17,3 +19,7 @@ handshake. curl does this by default. For HTTP, this means curl will attempt to upgrade the request to HTTP/2 using the Upgrade: request header. + +When curl uses HTTP/2 over HTTPS, it does not itself insist on TLS 1.2 or +higher even though that is required by the specification. A user can add this +version requirement with --tlsv1.2. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/http3.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/http3.d index f6c92b39..6df001ce 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/http3.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/http3.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: http3 Tags: Versions Protocols: HTTP diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ignore-content-length.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ignore-content-length.d index 8a4c2475..50131217 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ignore-content-length.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ignore-content-length.d @@ -1,8 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: ignore-content-length Help: Ignore the size of the remote resource Protocols: FTP HTTP Category: http ftp Example: --ignore-content-length $URL +Added: 7.14.1 +See-also: ftp-skip-pasv-ip --- For HTTP, Ignore the Content-Length header. This is particularly useful for servers running Apache 1.x, which will report incorrect Content-Length for @@ -11,4 +15,4 @@ files larger than 2 gigabytes. For FTP (since 7.46.0), skip the RETR command to figure out the size before downloading a file. -This option doesn't work for HTTP if libcurl was built to use hyper. +This option does not work for HTTP if libcurl was built to use hyper. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/include.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/include.d index 80a05e0c..a7888051 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/include.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/include.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: include Short: i Help: Include protocol response headers in the output See-also: verbose Category: important verbose Example: -i $URL +Added: 4.8 --- Include the HTTP response headers in the output. The HTTP response headers can include things like server name, cookies, date of the document, HTTP version diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/insecure.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/insecure.d index fb2c17d8..059fde5d 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/insecure.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/insecure.d @@ -1,19 +1,27 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: insecure Short: k -Help: Allow insecure server connections when using SSL -Protocols: TLS -See-also: proxy-insecure cacert -Category: tls +Help: Allow insecure server connections +Protocols: TLS SFTP SCP +See-also: proxy-insecure cacert capath +Category: tls sftp scp Example: --insecure $URL +Added: 7.10 --- -By default, every SSL connection curl makes is verified to be secure. This -option allows curl to proceed and operate even for server connections -otherwise considered insecure. - -The server connection is verified by making sure the server's certificate -contains the right name and verifies successfully using the cert store. +By default, every secure connection curl makes is verified to be secure before +the transfer takes place. This option makes curl skip the verification step +and proceed without checking. +When this option is not used for protocols using TLS, curl verifies the +server's TLS certificate before it continues: that the certificate contains +the right name which matches the host name used in the URL and that the +certificate has been signed by a CA certificate present in the cert store. See this online resource for further details: https://curl.se/docs/sslcerts.html -**WARNING**: this makes the transfer insecure. +For SFTP and SCP, this option makes curl skip the *known_hosts* verification. +*known_hosts* is a file normally stored in the user's home directory in the +".ssh" subdirectory, which contains host names and their public keys. + +**WARNING**: using this option makes the transfer insecure. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/interface.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/interface.d index b2c8eeec..0273a708 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/interface.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/interface.d @@ -1,11 +1,13 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: interface Arg: Help: Use network INTERFACE (or address) See-also: dns-interface Category: connection Example: --interface eth0 $URL +Added: 7.3 --- - Perform an operation using a specified interface. You can enter interface name, IP address or host name. An example could look like: diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ipv4.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ipv4.d index 90a6dda0..133493df 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ipv4.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ipv4.d @@ -1,8 +1,10 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Short: 4 Long: ipv4 Tags: Versions Protocols: -Added: +Added: 7.10.8 Mutexed: ipv6 Requires: See-also: http1.1 http2 @@ -10,5 +12,5 @@ Help: Resolve names to IPv4 addresses Category: connection dns Example: --ipv4 $URL --- -This option tells curl to resolve names to IPv4 addresses only, and not for -example try IPv6. +This option tells curl to use IPv4 addresses only, and not for example try +IPv6. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ipv6.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ipv6.d index dfa79aba..55c1ad1c 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ipv6.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ipv6.d @@ -1,8 +1,10 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Short: 6 Long: ipv6 Tags: Versions Protocols: -Added: +Added: 7.10.8 Mutexed: ipv4 Requires: See-also: http1.1 http2 @@ -10,5 +12,5 @@ Help: Resolve names to IPv6 addresses Category: connection dns Example: --ipv6 $URL --- -This option tells curl to resolve names to IPv6 addresses only, and not for -example try IPv4. +This option tells curl to use IPv6 addresses only, and not for example try +IPv4. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/junk-session-cookies.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/junk-session-cookies.d index 0cc342c7..937f8442 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/junk-session-cookies.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/junk-session-cookies.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: junk-session-cookies Short: j Help: Ignore session cookies read from file @@ -5,8 +7,9 @@ Protocols: HTTP See-also: cookie cookie-jar Category: http Example: --junk-session-cookies -b cookies.txt $URL +Added: 7.9.7 --- When curl is told to read cookies from a given file, this option will make it discard all "session cookies". This will basically have the same effect as if a new session is started. Typical browsers always discard session cookies when -they're closed down. +they are closed down. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/keepalive-time.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/keepalive-time.d index 1b96c4dc..b135e746 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/keepalive-time.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/keepalive-time.d @@ -1,15 +1,21 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: keepalive-time Arg: Help: Interval time for keepalive probes Added: 7.18.0 Category: connection Example: --keepalive-time 20 $URL +See-also: no-keepalive max-time --- This option sets the time a connection needs to remain idle before sending keepalive probes and the time between individual keepalive probes. It is currently effective on operating systems offering the TCP_KEEPIDLE and -TCP_KEEPINTVL socket options (meaning Linux, recent AIX, HP-UX and more). This -option has no effect if --no-keepalive is used. +TCP_KEEPINTVL socket options (meaning Linux, recent AIX, HP-UX and more). +Keepalives are used by the TCP stack to detect broken networks on idle +connections. The number of missed keepalive probes before declaring the +connection down is OS dependent and is commonly 9 or 10. This option has no +effect if --no-keepalive is used. If this option is used several times, the last one will be used. If unspecified, the option defaults to 60 seconds. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/key-type.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/key-type.d index 4baa9afa..d3ef4e07 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/key-type.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/key-type.d @@ -1,9 +1,13 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: key-type Arg: Help: Private key file type (DER/PEM/ENG) Protocols: TLS Category: tls Example: --key-type DER --key here $URL +Added: 7.9.3 +See-also: key --- Private key file type. Specify which type your --key provided private key is. DER, PEM, and ENG are supported. If not specified, PEM is assumed. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/key.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/key.d index d7f5e22a..46b7b8fb 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/key.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/key.d @@ -1,13 +1,17 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: key Arg: Protocols: TLS SSH Help: Private key file name Category: tls ssh Example: --cert certificate --key here $URL +Added: 7.9.3 +See-also: key-type cert --- Private key file name. Allows you to provide your private key in this separate file. For SSH, if not specified, curl tries the following candidates in order: -\&'~/.ssh/id_rsa', '~/.ssh/id_dsa', './id_rsa', './id_dsa'. +'~/.ssh/id_rsa', '~/.ssh/id_dsa', './id_rsa', './id_dsa'. If curl is built against OpenSSL library, and the engine pkcs11 is available, then a PKCS#11 URI (RFC 7512) can be used to specify a private key located in a @@ -16,4 +20,9 @@ PKCS#11 URI. If a PKCS#11 URI is provided, then the --engine option will be set as "pkcs11" if none was provided and the --key-type option will be set as "ENG" if none was provided. +If curl is built against Secure Transport or Schannel then this option is +ignored for TLS protocols (HTTPS, etc). Those backends expect the private key +to be already present in the keychain or PKCS#12 file containing the +certificate. + If this option is used several times, the last one will be used. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/krb.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/krb.d index 3d9ce999..0ba97a79 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/krb.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/krb.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: krb Arg: Help: Enable Kerberos with security @@ -5,6 +7,8 @@ Protocols: FTP Requires: Kerberos Category: ftp Example: --krb clear ftp://example.com/ +Added: 7.3 +See-also: delegation ssl --- Enable Kerberos authentication and use. The level must be entered and should be one of 'clear', 'safe', 'confidential', or 'private'. Should you use a diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/libcurl.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/libcurl.d index b7371fff..24a1b103 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/libcurl.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/libcurl.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: libcurl Arg: Help: Dump libcurl equivalent code of this command line Added: 7.16.1 Category: curl Example: --libcurl client.c $URL +See-also: verbose --- Append this option to any ordinary curl command line, and you will get libcurl-using C source code written to the file that does the equivalent diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/limit-rate.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/limit-rate.d index 7c46e544..e25f4ac4 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/limit-rate.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/limit-rate.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: limit-rate Arg: Help: Limit transfer speed to RATE @@ -5,9 +7,11 @@ Category: connection Example: --limit-rate 100K $URL Example: --limit-rate 1000 $URL Example: --limit-rate 10M $URL +Added: 7.10 +See-also: speed-limit speed-time --- Specify the maximum transfer rate you want curl to use - for both downloads -and uploads. This feature is useful if you have a limited pipe and you'd like +and uploads. This feature is useful if you have a limited pipe and you would like your transfer not to use your entire bandwidth. To make it slower than it otherwise would be. @@ -16,6 +20,9 @@ Appending 'k' or 'K' will count the number as kilobytes, 'm' or 'M' makes it megabytes, while 'g' or 'G' makes it gigabytes. The suffixes (k, M, G, T, P) are 1024 based. For example 1k is 1024. Examples: 200K, 3m and 1G. +The rate limiting logic works on averaging the transfer speed to no more than +the set threshold over a period of multiple seconds. + If you also use the --speed-limit option, that option will take precedence and might cripple the rate-limiting slightly, to help keeping the speed-limit logic working. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/list-only.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/list-only.d index 29f9ba2f..74c88e44 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/list-only.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/list-only.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: list-only Short: l Protocols: FTP POP3 @@ -5,11 +7,12 @@ Help: List only mode Added: 4.0 Category: ftp pop3 Example: --list-only ftp://example.com/dir/ +See-also: quote request --- (FTP) When listing an FTP directory, this switch forces a name-only view. This is especially useful if the user wants to machine-parse the contents of an FTP -directory since the normal directory view doesn't use a standard look or +directory since the normal directory view does not use a standard look or format. When used like this, the option causes an NLST command to be sent to the server instead of LIST. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/local-port.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/local-port.d index 77664170..55961f82 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/local-port.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/local-port.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: local-port Arg: Help: Force use of RANGE for local port numbers Added: 7.15.2 Category: connection Example: --local-port 1000-3000 $URL +See-also: globoff --- Set a preferred single number or range (FROM-TO) of local port numbers to use for the connection(s). Note that port numbers by nature are a scarce resource diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/location-trusted.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/location-trusted.d index 98c49ffe..cd920f42 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/location-trusted.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/location-trusted.d @@ -1,11 +1,14 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: location-trusted Help: Like --location, and send auth to other hosts Protocols: HTTP See-also: user Category: http auth Example: --location-trusted -u user:password $URL +Added: 7.10.4 --- Like --location, but will allow sending the name + password to all hosts that the site may redirect to. This may or may not introduce a security breach if -the site redirects you to a site to which you'll send your authentication info -(which is plaintext in the case of HTTP Basic authentication). +the site redirects you to a site to which you will send your authentication +info (which is plaintext in the case of HTTP Basic authentication). diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/location.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/location.d index 08c939c1..7b532eff 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/location.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/location.d @@ -1,16 +1,20 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: location Short: L Help: Follow redirects Protocols: HTTP Category: http Example: -L $URL +Added: 4.9 +See-also: resolve alt-svc --- If the server reports that the requested page has moved to a different location (indicated with a Location: header and a 3XX response code), this option will make curl redo the request on the new place. If used together with --include or --head, headers from all requested pages will be shown. When authentication is used, curl only sends its credentials to the initial -host. If a redirect takes curl to a different host, it won't be able to +host. If a redirect takes curl to a different host, it will not be able to intercept the user+password. See also --location-trusted on how to change this. You can limit the amount of redirects to follow by using the --max-redirs option. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/login-options.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/login-options.d index de772885..2c244e4c 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/login-options.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/login-options.d @@ -1,10 +1,13 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: login-options Arg: -Protocols: IMAP POP3 SMTP +Protocols: IMAP LDAP POP3 SMTP Help: Server login options Added: 7.34.0 Category: imap pop3 smtp auth Example: --login-options 'AUTH=*' imap://example.com +See-also: user --- Specify the login options to use during server authentication. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/mail-auth.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/mail-auth.d index 49a02d5b..d077a5ed 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/mail-auth.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/mail-auth.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: mail-auth Arg:
Protocols: SMTP diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/mail-from.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/mail-from.d index be0547c9..26636005 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/mail-from.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/mail-from.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: mail-from Arg:
Help: Mail from this address diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/mail-rcpt-allowfails.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/mail-rcpt-allowfails.d index 36d555e1..6e1f6f82 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/mail-rcpt-allowfails.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/mail-rcpt-allowfails.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: mail-rcpt-allowfails Help: Allow RCPT TO command to fail for some recipients Protocols: SMTP Added: 7.69.0 Category: smtp Example: --mail-rcpt-allowfails --mail-rcpt dest@example.com smtp://example.com +See-also: mail-rcpt --- When sending data to multiple recipients, by default curl will abort SMTP conversation if at least one of the recipients causes RCPT TO command to diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/mail-rcpt.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/mail-rcpt.d index d4a2502e..1890f901 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/mail-rcpt.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/mail-rcpt.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: mail-rcpt Arg:
Help: Mail to this address @@ -5,8 +7,9 @@ Protocols: SMTP Added: 7.20.0 Category: smtp Example: --mail-rcpt user@example.net smtp://example.com +See-also: mail-rcpt-allowfails --- -Specify a single e-mail address, user name or mailing list name. Repeat this +Specify a single email address, user name or mailing list name. Repeat this option several times to send to multiple recipients. When performing an address verification (VRFY command), the recipient should be diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/manual.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/manual.d index c81754b7..7becf1ce 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/manual.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/manual.d @@ -1,7 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: manual Short: M Help: Display the full manual Category: curl Example: --manual +Added: 5.2 +See-also: verbose libcurl trace --- Manual. Display the huge help text. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/max-filesize.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/max-filesize.d index 0f8aca42..8ed66e9f 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/max-filesize.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/max-filesize.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: max-filesize Arg: Help: Maximum file size to download @@ -5,6 +7,7 @@ Protocols: FTP HTTP MQTT See-also: limit-rate Category: connection Example: --max-filesize 100K $URL +Added: 7.10.8 --- Specify the maximum size (in bytes) of a file to download. If the file requested is larger than this value, the transfer will not start and curl will diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/max-redirs.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/max-redirs.d index eade17f7..fc5d5c83 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/max-redirs.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/max-redirs.d @@ -1,9 +1,13 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: max-redirs Arg: Help: Maximum number of redirects allowed Protocols: HTTP Category: http Example: --max-redirs 3 --location $URL +Added: 7.5 +See-also: location --- Set maximum number of redirections to follow. When --location is used, to prevent curl from following too many redirects, by default, the limit is diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/max-time.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/max-time.d index cb86fa9f..c5362fc5 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/max-time.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/max-time.d @@ -1,16 +1,23 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: max-time Short: m Arg: Help: Maximum time allowed for transfer -See-also: connect-timeout +See-also: connect-timeout retry-max-time Category: connection Example: --max-time 10 $URL Example: --max-time 2.92 $URL +Added: 4.0 --- -Maximum time in seconds that you allow the whole operation to take. This is +Maximum time in seconds that you allow each transfer to take. This is useful for preventing your batch jobs from hanging for hours due to slow networks or links going down. Since 7.32.0, this option accepts decimal values, but the actual timeout will decrease in accuracy as the specified timeout increases in decimal precision. +If you enable retrying the transfer (--retry) then the maximum time counter is +reset each time the transfer is retried. You can use --retry-max-time to limit +the retry time. + If this option is used several times, the last one will be used. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/metalink.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/metalink.d index 1fc10874..c2677f05 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/metalink.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/metalink.d @@ -1,8 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: metalink Help: Process given URLs as metalink XML file Added: 7.27.0 Category: misc Example: --metalink file $URL +See-also: parallel --- This option was previously used to specify a metalink resource. Metalink support has been disabled in curl since 7.78.0 for security reasons. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/negotiate.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/negotiate.d index e862bc82..c2d5f8a0 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/negotiate.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/negotiate.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: negotiate Help: Use HTTP Negotiate (SPNEGO) authentication Protocols: HTTP See-also: basic ntlm anyauth proxy-negotiate Category: auth http Example: --negotiate -u : $URL +Added: 7.10.6 --- Enables Negotiate (SPNEGO) authentication. @@ -12,6 +15,6 @@ This option requires a library built with GSS-API or SSPI support. Use When using this option, you must also provide a fake --user option to activate the authentication code properly. Sending a '-u :' is enough as the user name -and password from the --user option aren't actually used. +and password from the --user option are not actually used. If this option is used several times, only the first one is used. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/netrc-file.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/netrc-file.d index df89d51f..2c986559 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/netrc-file.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/netrc-file.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: netrc-file Help: Specify FILE for netrc Arg: @@ -5,9 +7,10 @@ Added: 7.21.5 Mutexed: netrc Category: curl Example: --netrc-file netrc $URL +See-also: netrc user config --- This option is similar to --netrc, except that you provide the path (absolute -or relative) to the netrc file that curl should use. You can only specify one +or relative) to the netrc file that curl should use. You can only specify one netrc file per invocation. If several --netrc-file options are provided, the last one will be used. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/netrc-optional.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/netrc-optional.d index 3869a200..4c83295a 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/netrc-optional.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/netrc-optional.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: netrc-optional Help: Use either .netrc or URL Mutexed: netrc See-also: netrc-file Category: curl Example: --netrc-optional $URL +Added: 7.9.8 --- -Very similar to --netrc, but this option makes the .netrc usage **optional** +Similar to --netrc, but this option makes the .netrc usage **optional** and not mandatory as the --netrc option does. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/netrc.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/netrc.d index 21e33a16..3868f6da 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/netrc.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/netrc.d @@ -1,19 +1,25 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: netrc Short: n Help: Must read .netrc for user name and password Category: curl Example: --netrc $URL +Added: 4.6 +See-also: netrc-file config user --- Makes curl scan the *.netrc* (*_netrc* on Windows) file in the user's home directory for login name and password. This is typically used for FTP on Unix. If used with HTTP, curl will enable user authentication. See *netrc(5)* and *ftp(1)* for details on the file format. Curl will not -complain if that file doesn't have the right permissions (it should be +complain if that file does not have the right permissions (it should be neither world- nor group-readable). The environment variable "HOME" is used to find the home directory. -A quick and very simple example of how to setup a *.netrc* to allow curl -to FTP to the machine host.domain.com with user name \&'myself' and password -\&'secret' should look similar to: +A quick and simple example of how to setup a *.netrc* to allow curl to FTP to +the machine host.domain.com with user name 'myself' and password 'secret' +could look similar to: -.B "machine host.domain.com login myself password secret" + machine host.domain.com + login myself + password secret diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/next.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/next.d index bcbad68e..b4b2a414 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/next.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/next.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Short: : Long: next Tags: @@ -8,6 +10,7 @@ Help: Make next URL use its separate set of options Category: curl Example: $URL --next -d postthis www2.example.com Example: -I $URL --next https://example.net/ +See-also: parallel config --- Tells curl to use a separate operation for the following URL and associated options. This allows you to send several URL requests, each with their own @@ -20,6 +23,4 @@ options include --verbose, --trace, --trace-ascii and --fail-early. For example, you can do both a GET and a POST in a single command line: -.nf curl www1.example.com --next -d postthis www2.example.com -.fi diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/no-alpn.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/no-alpn.d index bc620763..004ececc 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/no-alpn.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/no-alpn.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: no-alpn Tags: HTTP/2 Protocols: HTTPS diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/no-buffer.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/no-buffer.d index fe8da4e9..ef9d29ca 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/no-buffer.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/no-buffer.d @@ -1,8 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: no-buffer Short: N Help: Disable buffering of the output stream Category: curl Example: --no-buffer $URL +Added: 6.5 +See-also: progress-bar --- Disables the buffering of the output stream. In normal work situations, curl will use a standard buffered output stream that will have the effect that it diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/no-keepalive.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/no-keepalive.d index a264b7ac..a5493333 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/no-keepalive.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/no-keepalive.d @@ -1,7 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: no-keepalive Help: Disable TCP keepalive on the connection Category: connection Example: --no-keepalive $URL +Added: 7.18.0 +See-also: keepalive-time --- Disables the use of keepalive messages on the TCP connection. curl otherwise enables them by default. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/no-npn.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/no-npn.d index 7a9239d3..f685502e 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/no-npn.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/no-npn.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: no-npn Tags: Versions HTTP/2 Protocols: HTTPS diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/no-progress-meter.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/no-progress-meter.d index 9c7413ee..fd57b136 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/no-progress-meter.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/no-progress-meter.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: no-progress-meter Help: Do not show the progress meter See-also: verbose silent diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/no-sessionid.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/no-sessionid.d index 70a32210..5b86a951 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/no-sessionid.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/no-sessionid.d @@ -1,11 +1,14 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: no-sessionid Help: Disable SSL session-ID reusing Protocols: TLS Added: 7.16.0 Category: tls Example: --no-sessionid $URL +See-also: insecure --- -Disable curl's use of SSL session-ID caching. By default all transfers are +Disable curl's use of SSL session-ID caching. By default all transfers are done using the cache. Note that while nothing should ever get hurt by attempting to reuse SSL session-IDs, there seem to be broken SSL implementations in the wild that may require you to disable this in order for diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/noproxy.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/noproxy.d index ee0978e0..a351fdeb 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/noproxy.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/noproxy.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: noproxy Arg: Help: List of hosts which do not use proxy Added: 7.19.4 Category: proxy Example: --noproxy "www.example" $URL +See-also: proxy --- Comma-separated list of hosts for which not to use a proxy, if one is specified. The only wildcard is a single * character, which matches all hosts, @@ -14,4 +17,4 @@ not www.notlocal.com. Since 7.53.0, This option overrides the environment variables that disable the proxy ('no_proxy' and 'NO_PROXY'). If there's an environment variable -disabling a proxy, you can set the noproxy list to \&"" to override it. +disabling a proxy, you can set the noproxy list to "" to override it. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ntlm-wb.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ntlm-wb.d index 89013706..039bd9c0 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ntlm-wb.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ntlm-wb.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: ntlm-wb Help: Use HTTP NTLM authentication with winbind Protocols: HTTP See-also: ntlm proxy-ntlm Category: auth http Example: --ntlm-wb -u user:password $URL +Added: 7.22.0 --- Enables NTLM much in the style --ntlm does, but hand over the authentication to the separate binary ntlmauth application that is executed when needed. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ntlm.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ntlm.d index 5a506326..66b513e6 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ntlm.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ntlm.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: ntlm Help: Use HTTP NTLM authentication Mutexed: basic negotiate digest anyauth @@ -6,6 +8,7 @@ Protocols: HTTP Requires: TLS Category: auth http Example: --ntlm -u user:password $URL +Added: 7.10.6 --- Enables NTLM authentication. The NTLM authentication method was designed by Microsoft and is used by IIS web servers. It is a proprietary protocol, diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/oauth2-bearer.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/oauth2-bearer.d index 1662a366..e5857b6c 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/oauth2-bearer.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/oauth2-bearer.d @@ -1,9 +1,13 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: oauth2-bearer Help: OAuth 2 Bearer Token Arg: -Protocols: IMAP POP3 SMTP HTTP +Protocols: IMAP LDAP POP3 SMTP HTTP Category: auth Example: --oauth2-bearer "mF_9.B5f-4.1JqM" $URL +Added: 7.33.0 +See-also: basic ntlm digest --- Specify the Bearer Token for OAUTH 2.0 server authentication. The Bearer Token is used in conjunction with the user name which can be specified as part of diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/output-dir.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/output-dir.d index 1664f459..20adf9fd 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/output-dir.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/output-dir.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: output-dir Arg: Help: Directory to save files in @@ -13,7 +15,7 @@ This option specifies the directory in which files should be stored, when The given output directory is used for all URLs and output options on the command line, up until the first --next. -If the specified target directory doesn't exist, the operation will fail +If the specified target directory does not exist, the operation will fail unless --create-dirs is also used. If this option is used multiple times, the last specified directory will be diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/output.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/output.d index ce9749d5..543d3e3e 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/output.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/output.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: output Arg: Short: o @@ -8,6 +10,7 @@ Example: -o file $URL Example: "http://{one,two}.example.com" -o "file_#1.txt" Example: "http://{site,host}.host[1-5].com" -o "#1_#2" Example: -o file $URL -o file2 https://example.net +Added: 4.0 --- Write output to instead of stdout. If you are using {} or [] to fetch multiple documents, you should quote the URL and you can use '#' followed by a @@ -26,7 +29,7 @@ this: curl -o aa example.com -o bb example.net -and the order of the -o options and the URLs doesn't matter, just that the +and the order of the -o options and the URLs does not matter, just that the first -o is for the first URL and so on, so the above command line can also be written as diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/page-footer b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/page-footer index c88cd5fa..c8a65be0 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/page-footer +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/page-footer @@ -21,8 +21,8 @@ SMTP, LDAP, etc. .IP "ALL_PROXY [protocol://][:port]" Sets the proxy server to use if no protocol-specific proxy is set. .IP "NO_PROXY " -list of host names that shouldn't go through any proxy. If set to an asterisk -\&'*' only, it matches all hosts. Each name in this list is matched as either +list of host names that should not go through any proxy. If set to an asterisk +'*' only, it matches all hosts. Each name in this list is matched as either a domain name which contains the hostname, or the hostname itself. This environment variable disables use of the proxy even when specified with @@ -38,33 +38,62 @@ The list of host names can also be include numerical IP addresses, and IPv6 versions should then be given without enclosing brackets. IPv6 numerical addresses are compared as strings, so they will only match if -the representations are the same: "::1" is the same as "::0:1" but they don't +the representations are the same: "::1" is the same as "::0:1" but they do not match. +.IP "APPDATA " +On Windows, this variable is used when trying to find the home directory. If +the primary home variable are all unset. +.IP "COLUMNS " +If set, the specified number of characters will be used as the terminal width +when the alternative progress-bar is shown. If not set, curl will try to +figure it out using other ways. +.IP "CURL_CA_BUNDLE " +If set, will be used as the \fI--cacert\fP value. +.IP "CURL_HOME " +If set, is the first variable curl checks when trying to find its home +directory. If not set, it continues to check \fBXDG_CONFIG_HOME\fP. .IP "CURL_SSL_BACKEND " If curl was built with support for "MultiSSL", meaning that it has built-in support for more than one TLS backend, this environment variable can be set to the case insensitive name of the particular backend to use when curl is -invoked. Setting a name that isn't a built-in alternative will make curl +invoked. Setting a name that is not a built-in alternative will make curl stay with the default. SSL backend names (case-insensitive): bearssl, gnutls, gskit, mbedtls, -mesalink, nss, openssl, rustls, schannel, secure-transport, wolfssl +nss, openssl, rustls, schannel, secure-transport, wolfssl +.IP "HOME " +If set, this is used to find the home directory when that is needed. Like when +looking for the default .curlrc. \fBCURL_HOME\fP and \fBXDG_CONFIG_HOME\fP +have preference. .IP "QLOGDIR " If curl was built with HTTP/3 support, setting this environment variable to a local directory will make curl produce qlogs in that directory, using file names named after the destination connection id (in hex). Do note that these files can become rather large. Works with both QUIC backends. +.IP SHELL +Used on VMS when trying to detect if using a DCL or a "unix" shell. +.IP "SSL_CERT_DIR " +If set, will be used as the \fI--capath\fP value. +.IP "SSL_CERT_FILE " +If set, will be used as the \fI--cacert\fP value. .IP "SSLKEYLOGFILE " If you set this environment variable to a file name, curl will store TLS secrets from its connections in that file when invoked to enable you to analyze the TLS traffic in real time using network analyzing tools such as Wireshark. This works with the following TLS backends: OpenSSL, libressl, BoringSSL, GnuTLS, NSS and wolfSSL. +.IP "USERPROFILE " +On Windows, this variable is used when trying to find the home directory. If +the other, primary, variable are all unset. If set, curl will use the path +"$USERPROFILE\\Application Data". +.IP "XDG_CONFIG_HOME " +If \fBCURL_HOME\fP is not set, this variable is checked when looking for a +default .curlrc file. .SH "PROXY PROTOCOL PREFIXES" -Since curl version 7.21.7, the proxy string may be specified with a -protocol:// prefix to specify alternative proxy protocols. +The proxy string may be specified with a protocol:// prefix to specify +alternative proxy protocols. (Added in 7.21.7) -If no protocol is specified in the proxy string or if the string doesn't match +If no protocol is specified in the proxy string or if the string does not match a supported one, the proxy will be treated as an HTTP proxy. The supported proxy protocol prefixes are as follows: @@ -84,6 +113,8 @@ Makes it the equivalent of --socks5-hostname There are a bunch of different error codes and their corresponding error messages that may appear under error conditions. At the time of this writing, the exit codes are: +.IP 0 +Success. The operation completed successfully according to the instructions. .IP 1 Unsupported protocol. This build of curl has no support for this protocol. .IP 2 @@ -93,55 +124,55 @@ URL malformed. The syntax was not correct. .IP 4 A feature or option that was needed to perform the desired request was not enabled or was explicitly disabled at build-time. To make curl able to do -this, you probably need another build of libcurl! +this, you probably need another build of libcurl. .IP 5 -Couldn't resolve proxy. The given proxy host could not be resolved. +Could not resolve proxy. The given proxy host could not be resolved. .IP 6 -Couldn't resolve host. The given remote host could not be resolved. +Could not resolve host. The given remote host could not be resolved. .IP 7 Failed to connect to host. .IP 8 -Weird server reply. The server sent data curl couldn't parse. +Weird server reply. The server sent data curl could not parse. .IP 9 FTP access denied. The server denied login or denied access to the particular resource or directory you wanted to reach. Most often you tried to change to a -directory that doesn't exist on the server. +directory that does not exist on the server. .IP 10 FTP accept failed. While waiting for the server to connect back when an active FTP session is used, an error code was sent over the control connection or similar. .IP 11 -FTP weird PASS reply. Curl couldn't parse the reply sent to the PASS request. +FTP weird PASS reply. Curl could not parse the reply sent to the PASS request. .IP 12 During an active FTP session while waiting for the server to connect back to curl, the timeout expired. .IP 13 -FTP weird PASV reply, Curl couldn't parse the reply sent to the PASV request. +FTP weird PASV reply, Curl could not parse the reply sent to the PASV request. .IP 14 -FTP weird 227 format. Curl couldn't parse the 227-line the server sent. +FTP weird 227 format. Curl could not parse the 227-line the server sent. .IP 15 -FTP can't get host. Couldn't resolve the host IP we got in the 227-line. +FTP cannot use host. Could not resolve the host IP we got in the 227-line. .IP 16 HTTP/2 error. A problem was detected in the HTTP2 framing layer. This is somewhat generic and can be one out of several problems, see the error message for details. .IP 17 -FTP couldn't set binary. Couldn't change transfer method to binary. +FTP could not set binary. Could not change transfer method to binary. .IP 18 Partial file. Only a part of the file was transferred. .IP 19 -FTP couldn't download/access the given file, the RETR (or similar) command +FTP could not download/access the given file, the RETR (or similar) command failed. .IP 21 FTP quote error. A quote command returned error from the server. .IP 22 -HTTP page not retrieved. The requested url was not found or returned another +HTTP page not retrieved. The requested URL was not found or returned another error with the HTTP error code being 400 or above. This return code only appears if --fail is used. .IP 23 -Write error. Curl couldn't write data to a local filesystem or similar. +Write error. Curl could not write data to a local filesystem or similar. .IP 25 -FTP couldn't STOR file. The server denied the STOR operation, used for FTP +FTP could not STOR file. The server denied the STOR operation, used for FTP uploading. .IP 26 Read error. Various reading problems. @@ -154,18 +185,18 @@ conditions. FTP PORT failed. The PORT command failed. Not all FTP servers support the PORT command, try doing a transfer using PASV instead! .IP 31 -FTP couldn't use REST. The REST command failed. This command is used for +FTP could not use REST. The REST command failed. This command is used for resumed FTP transfers. .IP 33 -HTTP range error. The range "command" didn't work. +HTTP range error. The range "command" did not work. .IP 34 HTTP post error. Internal post-request generation error. .IP 35 SSL connect error. The SSL handshaking failed. .IP 36 -Bad download resume. Couldn't continue an earlier aborted download. +Bad download resume. Could not continue an earlier aborted download. .IP 37 -FILE couldn't read file. Failed to open the file. Permissions? +FILE could not read file. Failed to open the file. Permissions? .IP 38 LDAP cannot bind. LDAP bind operation failed. .IP 39 @@ -186,10 +217,8 @@ option to curl that was passed on to libcurl and rejected. Read up in the manual! .IP 49 Malformed telnet option. -.IP 51 -The peer's SSL certificate or SSH MD5 fingerprint was not OK. .IP 52 -The server didn't reply anything, which here is considered an error. +The server did not reply anything, which here is considered an error. .IP 53 SSL crypto engine not found. .IP 54 @@ -201,13 +230,11 @@ Failure in receiving network data. .IP 58 Problem with the local certificate. .IP 59 -Couldn't use specified SSL cipher. +Could not use specified SSL cipher. .IP 60 Peer certificate cannot be authenticated with known CA certificates. .IP 61 Unrecognized transfer encoding. -.IP 62 -Invalid LDAP URL. .IP 63 Maximum file size exceeded. .IP 64 @@ -232,10 +259,6 @@ Unknown TFTP transfer ID. File already exists (TFTP). .IP 74 No such user (TFTP). -.IP 75 -Character conversion failed. -.IP 76 -Character conversion functions required. .IP 77 Problem reading the SSL CA cert (path? access rights?). .IP 78 @@ -279,6 +302,9 @@ is the protocol used for HTTP/3 transfers. .IP XX More error codes will appear here in future releases. The existing ones are meant to never change. +.SH BUGS +If you experience any problems with curl, submit an issue in the project's bug +tracker on GitHub: https://github.com/curl/curl/issues .SH AUTHORS / CONTRIBUTORS Daniel Stenberg is the main author, but the whole list of contributors is found in the separate THANKS file. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/page-header b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/page-header index 65b503fb..84bd39d0 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/page-header +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/page-header @@ -5,7 +5,7 @@ .\" * | (__| |_| | _ <| |___ .\" * \___|\___/|_| \_\_____| .\" * -.\" * Copyright (C) 1998 - 2021, Daniel Stenberg, , et al. +.\" * Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. .\" * .\" * This software is licensed as described in the file COPYING, which .\" * you should have received as part of this distribution. The terms @@ -18,17 +18,19 @@ .\" * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY .\" * KIND, either express or implied. .\" * +.\" * SPDX-License-Identifier: curl +.\" * .\" ************************************************************************** .\" .\" DO NOT EDIT. Generated by the curl project gen.pl man page generator. .\" -.TH curl 1 "16 Dec 2016" "Curl 7.52.0" "Curl Manual" +.TH curl 1 "%DATE" "curl %VERSION" "curl Manual" .SH NAME curl \- transfer a URL .SH SYNOPSIS .B curl [options / URLs] .SH DESCRIPTION -**curl** is a tool for transfering data from or to a server. It supports these +**curl** is a tool for transferring data from or to a server. It supports these protocols: DICT, FILE, FTP, FTPS, GOPHER, GOPHERS, HTTP, HTTPS, IMAP, IMAPS, LDAP, LDAPS, MQTT, POP3, POP3S, RTMP, RTMPS, RTSP, SCP, SFTP, SMB, SMBS, SMTP, SMTPS, TELNET or TFTP. The command is designed to work without user @@ -37,12 +39,12 @@ interaction. curl offers a busload of useful tricks like proxy support, user authentication, FTP upload, HTTP post, SSL connections, cookies, file transfer resume and more. As you will see below, the number of features will make your -head spin! +head spin. curl is powered by libcurl for all transfer-related features. See *libcurl(3)* for details. .SH URL -The URL syntax is protocol-dependent. You'll find a detailed description in +The URL syntax is protocol-dependent. You find a detailed description in RFC 3986. You can specify multiple URLs or parts of URLs by writing part sets within @@ -90,8 +92,8 @@ based on often-used host name prefixes. For example, for host names starting with "ftp." curl will assume you want to speak FTP. curl will do its best to use what you pass to it as a URL. It is not trying to -validate it as a syntactically correct URL by any means but is instead -**very** liberal with what it accepts. +validate it as a syntactically correct URL by any means but is fairly liberal +with what it accepts. curl will attempt to re-use connections for multiple file transfers, so that getting many files from the same server will not do multiple connects / @@ -187,13 +189,11 @@ or without a space between it and its value, although a space is a recommended separator. The long "double-dash" form, --data for example, requires a space between it and its value. -Short version options that don't need any additional values can be used +Short version options that do not need any additional values can be used immediately next to each other, like for example you can specify all the options -O, -L and -v at once as -OLv. In general, all boolean options are enabled with --**option** and yet again -disabled with --**no-**option. That is, you use the exact same option name -but prefix it with "no-". However, in this list we mostly only list and show -the --option version of them. (This concept with --no options was added in -7.19.0. Previously most options were toggled on/off through repeated use of -the same command line option.) +disabled with --**no-**option. That is, you use the same option name but +prefix it with "no-". However, in this list we mostly only list and show the +--option version of them. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/parallel-immediate.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/parallel-immediate.d index 4f7468de..40a8c51e 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/parallel-immediate.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/parallel-immediate.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: parallel-immediate Help: Do not wait for multiplexing (with --parallel) Added: 7.68.0 diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/parallel-max.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/parallel-max.d index 1f22fcb7..5e3ad420 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/parallel-max.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/parallel-max.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: parallel-max Arg: Help: Maximum concurrency for parallel transfers diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/parallel.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/parallel.d index 2a0ca434..d0e9b321 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/parallel.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/parallel.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Short: Z Long: parallel Help: Perform transfers in parallel Added: 7.66.0 Category: connection curl Example: --parallel $URL -o file1 $URL -o file2 +See-also: next verbose --- Makes curl perform its transfers in parallel as compared to the regular serial manner. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/pass.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/pass.d index 58e35582..127786e1 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/pass.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/pass.d @@ -1,9 +1,13 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: pass Arg: Help: Pass phrase for the private key Protocols: SSH TLS Category: ssh tls auth Example: --pass secret --key file $URL +Added: 7.9.3 +See-also: key user --- Passphrase for the private key. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/path-as-is.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/path-as-is.d index fb87def9..e9dc2e88 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/path-as-is.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/path-as-is.d @@ -1,8 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: path-as-is Help: Do not squash .. sequences in URL path Added: 7.42.0 Category: curl Example: --path-as-is https://example.com/../../etc/passwd +See-also: request-target --- Tell curl to not handle sequences of /../ or /./ in the given URL path. Normally curl will squash or merge them according to standards but with diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/pinnedpubkey.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/pinnedpubkey.d index dc98b29f..89df109b 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/pinnedpubkey.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/pinnedpubkey.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: pinnedpubkey Arg: Help: FILE/HASHES Public key to verify peer against @@ -5,11 +7,13 @@ Protocols: TLS Category: tls Example: --pinnedpubkey keyfile $URL Example: --pinnedpubkey 'sha256//ce118b51897f4452dc' $URL +Added: 7.39.0 +See-also: hostpubsha256 --- Tells curl to use the specified public key file (or hashes) to verify the peer. This can be a path to a file which contains a single public key in PEM or DER format, or any number of base64 encoded sha256 hashes preceded by -\'sha256//\' and separated by \';\' +'sha256//' and separated by ';'. When negotiating a TLS or SSL connection, the server sends a certificate indicating its identity. A public key is extracted from this certificate and diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/post301.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/post301.d index 744ef581..2c7a1362 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/post301.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/post301.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: post301 Help: Do not switch to GET after following a 301 Protocols: HTTP diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/post302.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/post302.d index 2c6d4b61..31c13bd3 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/post302.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/post302.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: post302 Help: Do not switch to GET after following a 302 Protocols: HTTP diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/post303.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/post303.d index a2fec18c..8d856ea6 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/post303.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/post303.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: post303 Help: Do not switch to GET after following a 303 Protocols: HTTP diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/preproxy.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/preproxy.d index c91565c0..3f10a68e 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/preproxy.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/preproxy.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: preproxy Arg: [protocol://]host[:port] Help: Use this proxy first Added: 7.52.0 Category: proxy Example: --preproxy socks5://proxy.example -x http://http.example $URL +See-also: proxy socks5 --- Use the specified SOCKS proxy before connecting to an HTTP or HTTPS --proxy. In such a case curl first connects to the SOCKS proxy and then connects (through diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/progress-bar.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/progress-bar.d index 96ac3009..3a785308 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/progress-bar.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/progress-bar.d @@ -1,8 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Short: # Long: progress-bar Help: Display transfer progress as a bar Category: verbose Example: -# -O $URL +Added: 5.10 +See-also: styled-output --- Make curl display transfer progress as a simple progress bar instead of the standard, more informational, meter. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proto-default.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proto-default.d index a659b840..f9d4f6d7 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proto-default.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proto-default.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proto-default Help: Use PROTOCOL for any URL missing a scheme Arg: Added: 7.45.0 Category: connection curl Example: --proto-default https ftp.example.com +See-also: proto proto-redir --- Tells curl to use *protocol* for any URL missing a scheme name. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proto-redir.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proto-redir.d index 81d495dd..ea8c7526 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proto-redir.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proto-redir.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proto-redir Arg: Help: Enable/disable PROTOCOLS on redirect Added: 7.20.2 Category: connection curl Example: --proto-redir =http,https $URL +See-also: proto --- Tells curl to limit what protocols it may use on redirect. Protocols denied by --proto are not overridden by this option. See --proto for how protocols are @@ -13,8 +16,6 @@ Example, allow only HTTP and HTTPS on redirect: curl --proto-redir -all,http,https http://example.com -By default curl will allow HTTP, HTTPS, FTP and FTPS on redirect (7.65.2). -Older versions of curl allowed all protocols on redirect except several -disabled for security reasons: Since 7.19.4 FILE and SCP are disabled, and -since 7.40.0 SMB and SMBS are also disabled. Specifying *all* or *+all* -enables all protocols on redirect, including those disabled for security. +By default curl will only allow HTTP, HTTPS, FTP and FTPS on redirect (since +7.65.2). Specifying *all* or *+all* enables all protocols on redirects, which +is not good for security. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proto.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proto.d index 6ff52c41..9fc564f8 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proto.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proto.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proto Arg: Help: Enable/disable PROTOCOLS @@ -8,7 +10,7 @@ Example: --proto =http,https,sftp $URL --- Tells curl to limit what protocols it may use for transfers. Protocols are evaluated left to right, are comma separated, and are each a protocol name or -\&'all', optionally prefixed by zero or more modifiers. Available modifiers are: +'all', optionally prefixed by zero or more modifiers. Available modifiers are: .RS .TP 3 .B + diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-anyauth.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-anyauth.d index 80f2b970..c7cdd040 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-anyauth.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-anyauth.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proxy-anyauth Help: Pick any proxy authentication method Added: 7.13.2 diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-basic.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-basic.d index 6d38c733..608c9fae 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-basic.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-basic.d @@ -1,8 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proxy-basic Help: Use Basic authentication on the proxy See-also: proxy proxy-anyauth proxy-digest Category: proxy auth Example: --proxy-basic --proxy-user user:passwd -x proxy $URL +Added: 7.12.0 --- Tells curl to use HTTP Basic authentication when communicating with the given proxy. Use --basic for enabling HTTP Basic with a remote host. Basic is the diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-cacert.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-cacert.d index 5c329447..c05a03c7 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-cacert.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-cacert.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proxy-cacert Help: CA certificate to verify peer against for proxy Arg: diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-capath.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-capath.d index 0429984f..600e06ee 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-capath.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-capath.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proxy-capath Help: CA directory to verify peer against for proxy Arg: diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-cert-type.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-cert-type.d index 2152f537..520a2b48 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-cert-type.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-cert-type.d @@ -1,8 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proxy-cert-type Arg: Added: 7.52.0 Help: Client certificate type for HTTPS proxy Category: proxy tls Example: --proxy-cert-type PEM --proxy-cert file -x https://proxy $URL +See-also: proxy-cert --- Same as --cert-type but used in HTTPS proxy context. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-cert.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-cert.d index 3cf54b73..684b52cd 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-cert.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-cert.d @@ -1,8 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proxy-cert Arg: Help: Set client certificate for proxy Added: 7.52.0 Category: proxy tls Example: --proxy-cert file -x https://proxy $URL +See-also: proxy-cert-type --- Same as --cert but used in HTTPS proxy context. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-ciphers.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-ciphers.d index b4c35809..2b5c9360 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-ciphers.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-ciphers.d @@ -1,8 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proxy-ciphers Arg: Help: SSL ciphers to use for proxy Added: 7.52.0 Category: proxy tls Example: --proxy-ciphers ECDHE-ECDSA-AES256-CCM8 -x https://proxy $URL +See-also: ciphers curves proxy --- Same as --ciphers but used in HTTPS proxy context. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-crlfile.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-crlfile.d index 1ac19996..9ece3619 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-crlfile.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-crlfile.d @@ -1,8 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proxy-crlfile Arg: Help: Set a CRL list for proxy Added: 7.52.0 Category: proxy tls Example: --proxy-crlfile rejects.txt -x https://proxy $URL +See-also: crlfile proxy --- Same as --crlfile but used in HTTPS proxy context. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-digest.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-digest.d index cc187023..0bcc9f30 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-digest.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-digest.d @@ -1,8 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proxy-digest Help: Use Digest authentication on the proxy See-also: proxy proxy-anyauth proxy-basic Category: proxy tls Example: --proxy-digest --proxy-user user:passwd -x proxy $URL +Added: 7.12.0 --- Tells curl to use HTTP Digest authentication when communicating with the given proxy. Use --digest for enabling HTTP Digest with a remote host. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-header.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-header.d index 273a773d..64980ed2 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-header.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-header.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proxy-header Arg:
Help: Pass custom header(s) to proxy @@ -7,6 +9,7 @@ Category: proxy Example: --proxy-header "X-First-Name: Joe" -x http://proxy $URL Example: --proxy-header "User-Agent: surprise" -x http://proxy $URL Example: --proxy-header "Host:" -x http://proxy $URL +See-also: proxy --- Extra header to include in the request when sending HTTP to a proxy. You may specify any number of extra headers. This is the equivalent option to --header diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-insecure.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-insecure.d index 3f4f7c18..4579246f 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-insecure.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-insecure.d @@ -1,7 +1,10 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proxy-insecure Help: Do HTTPS proxy connections without verifying the proxy Added: 7.52.0 Category: proxy tls Example: --proxy-insecure -x https://proxy $URL +See-also: proxy insecure --- Same as --insecure but used in HTTPS proxy context. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-key-type.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-key-type.d index 31f47afa..c7b226dc 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-key-type.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-key-type.d @@ -1,8 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proxy-key-type Arg: Help: Private key file type for proxy Added: 7.52.0 Category: proxy tls Example: --proxy-key-type DER --proxy-key here -x https://proxy $URL +See-also: proxy-key proxy --- Same as --key-type but used in HTTPS proxy context. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-key.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-key.d index 1b979730..044f72e8 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-key.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-key.d @@ -1,7 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proxy-key Help: Private key for HTTPS proxy Arg: Category: proxy tls Example: --proxy-key here -x https://proxy $URL +Added: 7.52.0 +See-also: proxy-key-type proxy --- Same as --key but used in HTTPS proxy context. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-negotiate.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-negotiate.d index 5085a7cb..340873ae 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-negotiate.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-negotiate.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proxy-negotiate Help: Use HTTP Negotiate (SPNEGO) authentication on the proxy Added: 7.17.1 diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-ntlm.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-ntlm.d index 074b7df8..424dc9ce 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-ntlm.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-ntlm.d @@ -1,8 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proxy-ntlm Help: Use NTLM authentication on the proxy See-also: proxy-negotiate proxy-anyauth Category: proxy auth Example: --proxy-ntlm --proxy-user user:passwd -x http://proxy $URL +Added: 7.10.7 --- Tells curl to use HTTP NTLM authentication when communicating with the given proxy. Use --ntlm for enabling NTLM with a remote host. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-pass.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-pass.d index b7146841..dbd97799 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-pass.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-pass.d @@ -1,8 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proxy-pass Arg: Help: Pass phrase for the private key for HTTPS proxy Added: 7.52.0 Category: proxy tls auth Example: --proxy-pass secret --proxy-key here -x https://proxy $URL +See-also: proxy proxy-key --- Same as --pass but used in HTTPS proxy context. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-pinnedpubkey.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-pinnedpubkey.d index b7f50a76..b6c644b0 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-pinnedpubkey.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-pinnedpubkey.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proxy-pinnedpubkey Arg: Help: FILE/HASHES public key to verify proxy with @@ -5,11 +7,13 @@ Protocols: TLS Category: proxy tls Example: --proxy-pinnedpubkey keyfile $URL Example: --proxy-pinnedpubkey 'sha256//ce118b51897f4452dc' $URL +Added: 7.59.0 +See-also: pinnedpubkey proxy --- Tells curl to use the specified public key file (or hashes) to verify the proxy. This can be a path to a file which contains a single public key in PEM or DER format, or any number of base64 encoded sha256 hashes preceded by -\'sha256//\' and separated by \';\' +'sha256//' and separated by ';'. When negotiating a TLS or SSL connection, the server sends a certificate indicating its identity. A public key is extracted from this certificate and diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-service-name.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-service-name.d index fbed1757..7ab263fd 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-service-name.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-service-name.d @@ -1,8 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proxy-service-name Arg: Help: SPNEGO proxy service name Added: 7.43.0 Category: proxy tls Example: --proxy-service-name "shrubbery" -x proxy $URL +See-also: service-name proxy --- This option allows you to change the service name for proxy negotiation. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-ssl-allow-beast.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-ssl-allow-beast.d index b3e701f0..787b50fe 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-ssl-allow-beast.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-ssl-allow-beast.d @@ -1,7 +1,10 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proxy-ssl-allow-beast Help: Allow security flaw for interop for HTTPS proxy Added: 7.52.0 Category: proxy tls Example: --proxy-ssl-allow-beast -x https://proxy $URL +See-also: ssl-allow-beast proxy --- Same as --ssl-allow-beast but used in HTTPS proxy context. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-tls13-ciphers.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-tls13-ciphers.d index 62578f7f..285e0cbb 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-tls13-ciphers.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-tls13-ciphers.d @@ -1,9 +1,13 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proxy-tls13-ciphers Arg: help: TLS 1.3 proxy cipher suites Protocols: TLS Category: proxy tls Example: --proxy-tls13-ciphers TLS_AES_128_GCM_SHA256 -x proxy $URL +Added: 7.61.0 +See-also: tls13-ciphers curves --- Specifies which cipher suites to use in the connection to your HTTPS proxy when it negotiates TLS 1.3. The list of ciphers suites must specify valid diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-tlsauthtype.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-tlsauthtype.d index c00928ed..fbee25fa 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-tlsauthtype.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-tlsauthtype.d @@ -1,8 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proxy-tlsauthtype Arg: Help: TLS authentication type for HTTPS proxy Added: 7.52.0 Category: proxy tls auth Example: --proxy-tlsauthtype SRP -x https://proxy $URL +See-also: proxy proxy-tlsuser --- Same as --tlsauthtype but used in HTTPS proxy context. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-tlspassword.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-tlspassword.d index 89b551d6..c74400d9 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-tlspassword.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-tlspassword.d @@ -1,8 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proxy-tlspassword Arg: Help: TLS password for HTTPS proxy Added: 7.52.0 Category: proxy tls auth Example: --proxy-tlspassword passwd -x https://proxy $URL +See-also: proxy proxy-tlsuser --- Same as --tlspassword but used in HTTPS proxy context. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-tlsuser.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-tlsuser.d index b3c400ed..8e60cb58 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-tlsuser.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-tlsuser.d @@ -1,8 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proxy-tlsuser Arg: Help: TLS username for HTTPS proxy Added: 7.52.0 Category: proxy tls auth Example: --proxy-tlsuser smith -x https://proxy $URL +See-also: proxy proxy-tlspassword --- Same as --tlsuser but used in HTTPS proxy context. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-tlsv1.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-tlsv1.d index c54782e8..65ab3ee2 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-tlsv1.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-tlsv1.d @@ -1,7 +1,10 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proxy-tlsv1 Help: Use TLSv1 for HTTPS proxy Added: 7.52.0 Category: proxy tls auth Example: --proxy-tlsv1 -x https://proxy $URL +See-also: proxy --- Same as --tlsv1 but used in HTTPS proxy context. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-user.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-user.d index 81d29f2a..13e127a6 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-user.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy-user.d @@ -1,9 +1,13 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proxy-user Short: U Arg: Help: Proxy user and password Category: proxy auth Example: --proxy-user name:pwd -x proxy $URL +Added: 4.0 +See-also: proxy-pass --- Specify the user name and password to use for proxy authentication. @@ -14,7 +18,7 @@ from your environment by specifying a single colon with this option: "-U :". On systems where it works, curl will hide the given option argument from process listings. This is not enough to protect credentials from possibly getting seen by other users on the same system as they will still be visible -for a brief moment before cleared. Such sensitive data should be retrieved -from a file instead or similar and never used in clear text in a command line. +for a moment before cleared. Such sensitive data should be retrieved from a +file instead or similar and never used in clear text in a command line. If this option is used several times, the last one will be used. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy.d index 81d9bc95..2295abd7 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy.d @@ -1,16 +1,23 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proxy Short: x Arg: [protocol://]host[:port] Help: Use this proxy Category: proxy Example: --proxy http://proxy.example $URL +Added: 4.0 +See-also: socks5 proxy-basic --- Use the specified proxy. The proxy string can be specified with a protocol:// prefix. No protocol specified or http:// will be treated as HTTP proxy. Use socks4://, socks4a://, socks5:// or socks5h:// to request a specific SOCKS version to be used. -(The protocol support was added in curl 7.21.7) +(Added in 7.21.7) + +Unix domain sockets are supported for socks proxy. Set localhost for the host +part. e.g. socks5h://localhost/path/to/socket.sock HTTPS proxy support via https:// protocol prefix was added in 7.52.0 for OpenSSL, GnuTLS and NSS. @@ -23,7 +30,7 @@ If the port number is not specified in the proxy string, it is assumed to be This option overrides existing environment variables that set the proxy to use. If there's an environment variable setting a proxy, you can set proxy to -\&"" to override it. +"" to override it. All operations that are performed over an HTTP proxy will transparently be converted to HTTP. It means that certain protocol specific operations might @@ -34,7 +41,7 @@ User and password that might be provided in the proxy string are URL decoded by curl. This allows you to pass in special characters such as @ by using %40 or pass in a colon with %3a. -The proxy host can be specified the exact same way as the proxy environment +The proxy host can be specified the same way as the proxy environment variables, including the protocol prefix (http://) and the embedded user + password. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy1.0.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy1.0.d index f7483456..07b77826 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy1.0.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxy1.0.d @@ -1,8 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proxy1.0 Arg: Help: Use HTTP/1.0 proxy on given port Category: proxy Example: --proxy1.0 -x http://proxy $URL +Added: 7.19.4 +See-also: proxy socks5 preproxy --- Use the specified HTTP 1.0 proxy. If the port number is not specified, it is assumed at port 1080. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxytunnel.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxytunnel.d index 712c755a..ec44fd75 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxytunnel.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/proxytunnel.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: proxytunnel Short: p Help: Operate through an HTTP proxy tunnel (using CONNECT) See-also: proxy Category: proxy Example: --proxytunnel -x http://proxy $URL +Added: 7.3 --- When an HTTP proxy is used --proxy, this option will make curl tunnel through the proxy. The tunnel approach is made with the HTTP proxy CONNECT request and diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/pubkey.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/pubkey.d index c1fb5d8e..c1dc99a5 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/pubkey.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/pubkey.d @@ -1,9 +1,13 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: pubkey Arg: Protocols: SFTP SCP Help: SSH Public key file name Category: sftp scp auth Example: --pubkey file.pub sftp://example.com/ +Added: 7.16.2 +See-also: pass --- Public key file name. Allows you to provide your public key in this separate file. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/quote.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/quote.d index 2707c87d..e410574b 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/quote.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/quote.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: quote Arg: Short: Q @@ -5,14 +7,19 @@ Help: Send command(s) to server before transfer Protocols: FTP SFTP Category: ftp sftp Example: --quote "DELE file" ftp://example.com/foo +Added: 5.3 +See-also: request --- Send an arbitrary command to the remote FTP or SFTP server. Quote commands are sent BEFORE the transfer takes place (just after the initial PWD command in an FTP transfer, to be exact). To make commands take place after a successful -transfer, prefix them with a dash '-'. To make commands be sent after curl -has changed the working directory, just before the transfer command(s), prefix -the command with a '+' (this is only supported for FTP). You may specify any -number of commands. +transfer, prefix them with a dash '-'. + +(FTP only) To make commands be sent after curl has changed the working +directory, just before the file transfer command(s), prefix the command with a +'+'. This is not performed when a directory listing is performed. + +You may specify any number of commands. By default curl will stop at first failure. To make curl continue even if the command fails, prefix the command with an asterisk (*). Otherwise, if the @@ -25,8 +32,8 @@ servers, or one of the commands listed below to SFTP servers. This option can be used multiple times. SFTP is a binary protocol. Unlike for FTP, curl interprets SFTP quote commands -itself before sending them to the server. File names may be quoted -shell-style to embed spaces or special characters. Following is the list of +itself before sending them to the server. File names may be quoted +shell-style to embed spaces or special characters. Following is the list of all supported SFTP quote commands: .RS .IP "atime date file" diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/random-file.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/random-file.d index a207c1e1..dea2ec72 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/random-file.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/random-file.d @@ -1,9 +1,15 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: random-file Arg: Help: File for reading random data from Category: misc Example: --random-file rubbish $URL +Added: 7.7 +See-also: egd-file --- +Deprecated option. This option is ignored by curl since 7.84.0. Prior to that +it only had an effect on curl if built to use old versions of OpenSSL. + Specify the path name to file containing what will be considered as random -data. The data may be used to seed the random engine for SSL connections. See -also the --egd-file option. +data. The data may be used to seed the random engine for SSL connections. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/range.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/range.d index 0637f8fc..ca77de90 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/range.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/range.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: range Short: r Help: Retrieve only the bytes within RANGE @@ -5,6 +7,8 @@ Arg: Protocols: HTTP FTP SFTP FILE Category: http ftp sftp file Example: --range 22-44 $URL +Added: 4.0 +See-also: continue-at append --- Retrieve a byte range (i.e. a partial document) from an HTTP/1.1, FTP or SFTP server or a local FILE. Ranges can be specified in a number of ways. @@ -34,13 +38,13 @@ response, which will be returned as-is by curl! Parsing or otherwise transforming this response is the responsibility of the caller. Only digit characters (0-9) are valid in the 'start' and 'stop' fields of the -\&'start-stop' range syntax. If a non-digit character is given in the range, +'start-stop' range syntax. If a non-digit character is given in the range, the server's response will be unspecified, depending on the server's configuration. You should also be aware that many HTTP/1.1 servers do not have this feature -enabled, so that when you attempt to get a range, you'll instead get the whole -document. +enabled, so that when you attempt to get a range, you will instead get the +whole document. FTP and SFTP range downloads only support the simple 'start-stop' syntax (optionally with one of the numbers omitted). FTP use depends on the extended diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/raw.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/raw.d index c44d33f5..f87e926a 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/raw.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/raw.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: raw Help: Do HTTP "raw"; no transfer decoding Added: 7.16.2 Protocols: HTTP Category: http Example: --raw $URL +See-also: tr-encoding --- When used, it disables all internal HTTP decoding of content or transfer encodings and instead makes them passed on unaltered, raw. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/referer.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/referer.d index 3f6b7c7e..64c9c8b4 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/referer.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/referer.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: referer Short: e Arg: @@ -8,11 +10,12 @@ Category: http Example: --referer "https://fake.example" $URL Example: --referer "https://fake.example;auto" -L $URL Example: --referer ";auto" -L $URL +Added: 4.0 --- Sends the "Referrer Page" information to the HTTP server. This can also be set -with the --header flag of course. When used with --location you can append +with the --header flag of course. When used with --location you can append ";auto" to the --referer URL to make curl automatically set the previous URL -when it follows a Location: header. The \&";auto" string can be used alone, -even if you don't set an initial --referer. +when it follows a Location: header. The ";auto" string can be used alone, +even if you do not set an initial --referer. If this option is used several times, the last one will be used. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/remote-header-name.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/remote-header-name.d index 6e0b98bd..0f22b846 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/remote-header-name.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/remote-header-name.d @@ -1,21 +1,30 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: remote-header-name Short: J Protocols: HTTP Help: Use the header-provided filename Category: output Example: -OJ https://example.com/file +Added: 7.20.0 +See-also: remote-name --- This option tells the --remote-name option to use the server-specified -Content-Disposition filename instead of extracting a filename from the URL. +Content-Disposition filename instead of extracting a filename from the URL. If +the server-provided file name contains a path, that will be stripped off +before the file name is used. + +The file is saved in the current directory, or in the directory specified with +--output-dir. If the server specifies a file name and a file with that name already exists -in the current working directory it will not be overwritten and an error will -occur. If the server doesn't specify a file name then this option has no +in the destination directory, it will not be overwritten and an error will +occur. If the server does not specify a file name then this option has no effect. There's no attempt to decode %-sequences (yet) in the provided file name, so this option may provide you with rather unexpected file names. **WARNING**: Exercise judicious use of this option, especially on Windows. A -rogue server could send you the name of a DLL or other file that could possibly -be loaded automatically by Windows or some third party software. +rogue server could send you the name of a DLL or other file that could be +loaded automatically by Windows or some third party software. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/remote-name-all.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/remote-name-all.d index e27bd5f4..8b2db66a 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/remote-name-all.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/remote-name-all.d @@ -1,8 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: remote-name-all Help: Use the remote file name for all URLs Added: 7.19.0 Category: output Example: --remote-name-all ftp://example.com/file1 ftp://example.com/file2 +See-also: remote-name --- This option changes the default action for all given URLs to be dealt with as if --remote-name were used for each one. So if you want to disable that for a diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/remote-name.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/remote-name.d index 68928794..49a7aa31 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/remote-name.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/remote-name.d @@ -1,15 +1,19 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: remote-name Short: O Help: Write output to a file named as the remote file Category: important output Example: -O https://example.com/filename +Added: 4.0 +See-also: remote-name-all output-dir remote-header-name --- Write output to a local file named like the remote file we get. (Only the file part of the remote file is used, the path is cut off.) The file will be saved in the current working directory. If you want the file saved in a different directory, make sure you change the current working -directory before invoking curl with this option. +directory before invoking curl with this option or use --output-dir. The remote file name to use for saving is extracted from the given URL, nothing else, and if it already exists it will be overwritten. If you want the diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/remote-time.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/remote-time.d index 9c463ae8..4b384c93 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/remote-time.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/remote-time.d @@ -1,8 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: remote-time Short: R Help: Set the remote file's time on the local output Category: output Example: --remote-time -o foo $URL +Added: 7.9 +See-also: remote-name time-cond --- When used, this will make curl attempt to figure out the timestamp of the remote file, and if that is available make the local file get that same diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/request-target.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/request-target.d index 5f9e4755..18a386d6 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/request-target.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/request-target.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: request-target Arg: Help: Specify the target for this request @@ -5,8 +7,9 @@ Protocols: HTTP Added: 7.55.0 Category: http Example: --request-target "*" -X OPTIONS $URL +See-also: request --- Tells curl to use an alternative "target" (path) instead of using the path as provided in the URL. Particularly useful when wanting to issue HTTP requests -without leading slash or other data that doesn't follow the regular URL +without leading slash or other data that does not follow the regular URL pattern, like "OPTIONS *". diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/request.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/request.d index 0db0bc9f..6d804046 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/request.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/request.d @@ -1,19 +1,23 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: request Short: X -Arg: -Help: Specify request command to use +Arg: +Help: Specify request method to use Category: connection Example: -X "DELETE" $URL Example: -X NLST ftp://example.com/ +Added: 6.0 +See-also: request-target --- (HTTP) Specifies a custom request method to use when communicating with the -HTTP server. The specified request method will be used instead of the method +HTTP server. The specified request method will be used instead of the method otherwise used (which defaults to GET). Read the HTTP 1.1 specification for details and explanations. Common additional HTTP requests include PUT and DELETE, but related technologies like WebDAV offers PROPFIND, COPY, MOVE and more. -Normally you don't need this option. All sorts of GET, HEAD, POST and PUT +Normally you do not need this option. All sorts of GET, HEAD, POST and PUT requests are rather invoked by using dedicated command line options. This option only changes the actual word used in the HTTP request, it does not @@ -22,7 +26,7 @@ request, using -X HEAD will not suffice. You need to use the --head option. The method string you set with --request will be used for all requests, which if you for example use --location may cause unintended side-effects when curl -doesn't change request method according to the HTTP 30x response codes - and +does not change request method according to the HTTP 30x response codes - and similar. (FTP) @@ -30,8 +34,8 @@ Specifies a custom FTP command to use instead of LIST when doing file lists with FTP. (POP3) -Specifies a custom POP3 command to use instead of LIST or RETR. (Added in -7.26.0) +Specifies a custom POP3 command to use instead of LIST or RETR. +(Added in 7.26.0) (IMAP) Specifies a custom IMAP command to use instead of LIST. (Added in 7.30.0) diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/resolve.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/resolve.d index 6464c42f..eecaa78a 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/resolve.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/resolve.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: resolve Arg: <[+]host:port:addr[,addr]...> Help: Resolve the host+port to this address Added: 7.21.3 -Category: connection +Category: connection dns Example: --resolve example.com:443:127.0.0.1 $URL +See-also: connect-to alt-svc --- Provide a custom address for a specific host and port pair. Using this, you can make the curl requests(s) use a specified address and prevent the diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/retry-all-errors.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/retry-all-errors.d index 5cab5dda..da86a42a 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/retry-all-errors.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/retry-all-errors.d @@ -1,8 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: retry-all-errors Help: Retry all errors (use with --retry) Added: 7.71.0 Category: curl -Example: --retry-all-errors $URL +Example: --retry 5 --retry-all-errors $URL +See-also: retry --- Retry on any error. This option is used together with --retry. @@ -17,9 +20,9 @@ transfers as close as possible to how they were started, but this is not possible with redirected input or output. For example, before retrying it removes output data from a failed partial transfer that was written to an output file. However this is not true of data redirected to a | pipe or > -file, which are not reset. We strongly suggest don't parse or record output -via redirect in combination with this option, since you may receive duplicate -data. +file, which are not reset. We strongly suggest you do not parse or record +output via redirect in combination with this option, since you may receive +duplicate data. By default curl will not error on an HTTP response code that indicates an HTTP error, if the transfer was successful. For example, if a server replies 404 diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/retry-connrefused.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/retry-connrefused.d index ad079e09..7517bf78 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/retry-connrefused.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/retry-connrefused.d @@ -1,8 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: retry-connrefused Help: Retry on connection refused (use with --retry) Added: 7.52.0 Category: curl Example: --retry-connrefused --retry $URL +See-also: retry retry-all-errors --- In addition to the other conditions, consider ECONNREFUSED as a transient error too for --retry. This option is used together with --retry. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/retry-delay.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/retry-delay.d index 28391290..45b0ed9a 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/retry-delay.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/retry-delay.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: retry-delay Arg: Help: Wait time between retries Added: 7.12.3 Category: curl Example: --retry-delay 5 --retry $URL +See-also: retry --- Make curl sleep this amount of time before each retry when a transfer has failed with a transient error (it changes the default backoff time algorithm diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/retry-max-time.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/retry-max-time.d index acccff5d..40d24210 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/retry-max-time.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/retry-max-time.d @@ -1,15 +1,18 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: retry-max-time Arg: Help: Retry only within this period Added: 7.12.3 Category: curl Example: --retry-max-time 30 --retry 10 $URL +See-also: retry --- The retry timer is reset before the first transfer attempt. Retries will be -done as usual (see --retry) as long as the timer hasn't reached this given -limit. Notice that if the timer hasn't reached the limit, the request will be +done as usual (see --retry) as long as the timer has not reached this given +limit. Notice that if the timer has not reached the limit, the request will be made and while performing, it may take longer than this given time period. To -limit a single request\'s maximum time, use --max-time. Set this option to +limit a single request's maximum time, use --max-time. Set this option to zero to not timeout retries. If this option is used several times, the last one will be used. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/retry.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/retry.d index 6238383f..1d4e01c8 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/retry.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/retry.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: retry Arg: Added: 7.12.3 Help: Retry request if transient problems occur Category: curl Example: --retry 7 $URL +See-also: retry-max-time --- If a transient error is returned when curl tries to perform a transfer, it will retry this number of times before giving up. Setting the number to 0 @@ -13,7 +16,7 @@ response code. When curl is about to retry a transfer, it will first wait one second and then for all forthcoming retries it will double the waiting time until it reaches -10 minutes which then will be the delay between the rest of the retries. By +10 minutes which then will be the delay between the rest of the retries. By using --retry-delay you disable this exponential backoff algorithm. See also --retry-max-time to limit the total time allowed for retries. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/sasl-authzid.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/sasl-authzid.d index 9065bd5e..a1f035e0 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/sasl-authzid.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/sasl-authzid.d @@ -1,14 +1,17 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: sasl-authzid Arg: Help: Identity for SASL PLAIN authentication Added: 7.66.0 Category: auth Example: --sasl-authzid zid imap://example.com/ +See-also: login-options --- -Use this authorisation identity (authzid), during SASL PLAIN authentication, +Use this authorization identity (authzid), during SASL PLAIN authentication, in addition to the authentication identity (authcid) as specified by --user. -If the option isn't specified, the server will derive the authzid from the +If the option is not specified, the server will derive the authzid from the authcid, but if specified, and depending on the server implementation, it may be used to access another user's inbox, that the user has been granted access to, or a shared mailbox for example. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/sasl-ir.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/sasl-ir.d index 5004306a..fb8fb8c3 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/sasl-ir.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/sasl-ir.d @@ -1,7 +1,10 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: sasl-ir Help: Enable initial response in SASL authentication Added: 7.31.0 Category: auth Example: --sasl-ir imap://example.com/ +See-also: sasl-authzid --- Enable initial response in SASL authentication. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/service-name.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/service-name.d index 3a5559bc..887a09eb 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/service-name.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/service-name.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: service-name Help: SPNEGO service name Arg: Added: 7.43.0 Category: misc Example: --service-name sockd/server $URL +See-also: negotiate proxy-service-name --- This option allows you to change the service name for SPNEGO. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/show-error.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/show-error.d index e8b21771..9a5d29e5 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/show-error.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/show-error.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: show-error Short: S Help: Show error even when -s is used See-also: no-progress-meter Category: curl Example: --show-error --silent $URL +Added: 5.9 --- When used with --silent, it makes curl show an error message if it fails. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/silent.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/silent.d index 7122c542..f0a788aa 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/silent.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/silent.d @@ -1,11 +1,14 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: silent Short: s Help: Silent mode See-also: verbose stderr no-progress-meter Category: important verbose Example: -s $URL +Added: 4.0 --- -Silent or quiet mode. Don't show progress meter or error messages. Makes Curl +Silent or quiet mode. Do not show progress meter or error messages. Makes Curl mute. It will still output the data you ask for, potentially even to the terminal/stdout unless you redirect it. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks4.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks4.d index 1cae1e1f..5c4f4b1b 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks4.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks4.d @@ -1,19 +1,25 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: socks4 Arg: Help: SOCKS4 proxy on given host + port Added: 7.15.2 Category: proxy Example: --socks4 hostname:4096 $URL +See-also: socks4a socks5 socks5-hostname --- Use the specified SOCKS4 proxy. If the port number is not specified, it is assumed at port 1080. Using this socket type make curl resolve the host name and passing the address on to the proxy. +To specify proxy on a unix domain socket, use localhost for host, e.g. +socks4://localhost/path/to/socket.sock + This option overrides any previous use of --proxy, as they are mutually exclusive. -Since 7.21.7, this option is superfluous since you can specify a socks4 proxy -with --proxy using a socks4:// protocol prefix. +This option is superfluous since you can specify a socks4 proxy with --proxy +using a socks4:// protocol prefix. (Added in 7.21.7) Since 7.52.0, --preproxy can be used to specify a SOCKS proxy at the same time --proxy is used with an HTTP/HTTPS proxy. In such a case curl first connects to diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks4a.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks4a.d index 8edefdd1..4b8c5f72 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks4a.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks4a.d @@ -1,18 +1,24 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: socks4a Arg: Help: SOCKS4a proxy on given host + port Added: 7.18.0 Category: proxy Example: --socks4a hostname:4096 $URL +See-also: socks4 socks5 socks5-hostname --- Use the specified SOCKS4a proxy. If the port number is not specified, it is assumed at port 1080. This asks the proxy to resolve the host name. +To specify proxy on a unix domain socket, use localhost for host, e.g. +socks4a://localhost/path/to/socket.sock + This option overrides any previous use of --proxy, as they are mutually exclusive. -Since 7.21.7, this option is superfluous since you can specify a socks4a proxy -with --proxy using a socks4a:// protocol prefix. +This option is superfluous since you can specify a socks4a proxy with --proxy +using a socks4a:// protocol prefix. (Added in 7.21.7) Since 7.52.0, --preproxy can be used to specify a SOCKS proxy at the same time --proxy is used with an HTTP/HTTPS proxy. In such a case curl first connects to diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks5-basic.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks5-basic.d index f32e0bf3..d5c1b8a6 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks5-basic.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks5-basic.d @@ -1,8 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: socks5-basic Help: Enable username/password auth for SOCKS5 proxies Added: 7.55.0 Category: proxy auth Example: --socks5-basic --socks5 hostname:4096 $URL +See-also: socks5 --- Tells curl to use username/password authentication when connecting to a SOCKS5 proxy. The username/password authentication is enabled by default. Use diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks5-gssapi-nec.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks5-gssapi-nec.d index 73cac7a2..3f85b9a0 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks5-gssapi-nec.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks5-gssapi-nec.d @@ -1,10 +1,13 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: socks5-gssapi-nec Help: Compatibility with NEC SOCKS5 server Added: 7.19.4 Category: proxy auth Example: --socks5-gssapi-nec --socks5 hostname:4096 $URL +See-also: socks5 --- As part of the GSS-API negotiation a protection mode is negotiated. RFC 1961 says in section 4.3/4.4 it should be protected, but the NEC reference -implementation does not. The option --socks5-gssapi-nec allows the +implementation does not. The option --socks5-gssapi-nec allows the unprotected exchange of the protection mode negotiation. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks5-gssapi-service.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks5-gssapi-service.d index 451be8e2..f092f7d2 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks5-gssapi-service.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks5-gssapi-service.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: socks5-gssapi-service Arg: Help: SOCKS5 proxy service name for GSS-API Added: 7.19.4 Category: proxy auth Example: --socks5-gssapi-service sockd --socks5 hostname:4096 $URL +See-also: socks5 --- The default service name for a socks server is rcmd/server-fqdn. This option allows you to change it. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks5-gssapi.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks5-gssapi.d index 2ce80695..ea2ffe55 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks5-gssapi.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks5-gssapi.d @@ -1,8 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: socks5-gssapi Help: Enable GSS-API auth for SOCKS5 proxies Added: 7.55.0 Category: proxy auth Example: --socks5-gssapi --socks5 hostname:4096 $URL +See-also: socks5 --- Tells curl to use GSS-API authentication when connecting to a SOCKS5 proxy. The GSS-API authentication is enabled by default (if curl is compiled with diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks5-hostname.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks5-hostname.d index 729a7bf8..04d8dbf4 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks5-hostname.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks5-hostname.d @@ -1,18 +1,24 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: socks5-hostname Arg: Help: SOCKS5 proxy, pass host name to proxy Added: 7.18.0 Category: proxy Example: --socks5-hostname proxy.example:7000 $URL +See-also: socks5 socks4a --- Use the specified SOCKS5 proxy (and let the proxy resolve the host name). If the port number is not specified, it is assumed at port 1080. +To specify proxy on a unix domain socket, use localhost for host, e.g. +socks5h://localhost/path/to/socket.sock + This option overrides any previous use of --proxy, as they are mutually exclusive. -Since 7.21.7, this option is superfluous since you can specify a socks5 -hostname proxy with --proxy using a socks5h:// protocol prefix. +This option is superfluous since you can specify a socks5 hostname proxy with +--proxy using a socks5h:// protocol prefix. (Added in 7.21.7) Since 7.52.0, --preproxy can be used to specify a SOCKS proxy at the same time --proxy is used with an HTTP/HTTPS proxy. In such a case curl first connects to diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks5.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks5.d index 99c740f8..0959ebdc 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks5.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/socks5.d @@ -1,18 +1,24 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: socks5 Arg: Help: SOCKS5 proxy on given host + port Added: 7.18.0 Category: proxy Example: --socks5 proxy.example:7000 $URL +See-also: socks5-hostname socks4a --- Use the specified SOCKS5 proxy - but resolve the host name locally. If the port number is not specified, it is assumed at port 1080. +To specify proxy on a unix domain socket, use localhost for host, e.g. +socks5://localhost/path/to/socket.sock + This option overrides any previous use of --proxy, as they are mutually exclusive. -Since 7.21.7, this option is superfluous since you can specify a socks5 proxy -with --proxy using a socks5:// protocol prefix. +This option is superfluous since you can specify a socks5 proxy with --proxy +using a socks5:// protocol prefix. (Added in 7.21.7) Since 7.52.0, --preproxy can be used to specify a SOCKS proxy at the same time --proxy is used with an HTTP/HTTPS proxy. In such a case curl first connects to diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/speed-limit.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/speed-limit.d index 7bf8d5fb..41357435 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/speed-limit.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/speed-limit.d @@ -1,11 +1,15 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: speed-limit Short: Y Arg: Help: Stop transfers slower than this Category: connection Example: --speed-limit 300 --speed-time 10 $URL +Added: 4.7 +See-also: speed-time limit-rate max-time --- -If a download is slower than this given speed (in bytes per second) for +If a transfer is slower than this given speed (in bytes per second) for speed-time seconds it gets aborted. speed-time is set with --speed-time and is 30 if not set. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/speed-time.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/speed-time.d index 60952145..0df15031 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/speed-time.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/speed-time.d @@ -1,15 +1,19 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: speed-time Short: y Arg: Help: Trigger 'speed-limit' abort after this time Category: connection Example: --speed-limit 300 --speed-time 10 $URL +Added: 4.7 +See-also: speed-limit limit-rate --- -If a download is slower than speed-limit bytes per second during a speed-time -period, the download gets aborted. If speed-time is used, the default +If a transfer runs slower than speed-limit bytes per second during a speed-time +period, the transfer is aborted. If speed-time is used, the default speed-limit will be 1 unless set with --speed-limit. -This option controls transfers and thus will not affect slow connects etc. If -this is a concern for you, try the --connect-timeout option. +This option controls transfers (in both directions) but will not affect slow +connects etc. If this is a concern for you, try the --connect-timeout option. If this option is used several times, the last one will be used. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ssl-allow-beast.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ssl-allow-beast.d index f54cf641..361fd248 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ssl-allow-beast.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ssl-allow-beast.d @@ -1,13 +1,16 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: ssl-allow-beast Help: Allow security flaw to improve interop Added: 7.25.0 Category: tls Example: --ssl-allow-beast $URL +See-also: proxy-ssl-allow-beast insecure --- This option tells curl to not work around a security flaw in the SSL3 and -TLS1.0 protocols known as BEAST. If this option isn't used, the SSL layer may -use workarounds known to cause interoperability problems with some older SSL -implementations. +TLS1.0 protocols known as BEAST. If this option is not used, the SSL layer +may use workarounds known to cause interoperability problems with some older +SSL implementations. **WARNING**: this option loosens the SSL security, and by using this flag you ask for exactly that. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ssl-no-revoke.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ssl-no-revoke.d index dde77aa1..84b00923 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ssl-no-revoke.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ssl-no-revoke.d @@ -1,8 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: ssl-no-revoke Help: Disable cert revocation checks (Schannel) Added: 7.44.0 Category: tls Example: --ssl-no-revoke $URL +See-also: crlfile --- (Schannel) This option tells curl to disable certificate revocation checks. WARNING: this option loosens the SSL security, and by using this flag you ask diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ssl-reqd.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ssl-reqd.d index 489be00d..0c071843 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ssl-reqd.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ssl-reqd.d @@ -1,11 +1,18 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: ssl-reqd Help: Require SSL/TLS -Protocols: FTP IMAP POP3 SMTP +Protocols: FTP IMAP POP3 SMTP LDAP Added: 7.20.0 Category: tls Example: --ssl-reqd ftp://example.com +See-also: ssl insecure --- -Require SSL/TLS for the connection. Terminates the connection if the server -doesn't support SSL/TLS. +Require SSL/TLS for the connection. Terminates the connection if the server +does not support SSL/TLS. + +This option is handled in LDAP since version 7.81.0. It is fully supported +by the openldap backend and rejected by the generic ldap backend if explicit +TLS is required. This option was formerly known as --ftp-ssl-reqd. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ssl-revoke-best-effort.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ssl-revoke-best-effort.d index 2db32192..7594783d 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ssl-revoke-best-effort.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ssl-revoke-best-effort.d @@ -1,8 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: ssl-revoke-best-effort Help: Ignore missing/offline cert CRL dist points Added: 7.70.0 Category: tls Example: --ssl-revoke-best-effort $URL +See-also: crlfile insecure --- (Schannel) This option tells curl to ignore certificate revocation checks when they failed due to missing/offline distribution points for the revocation check diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ssl.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ssl.d index bc339fae..e9f23a38 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ssl.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/ssl.d @@ -1,13 +1,22 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: ssl Help: Try SSL/TLS -Protocols: FTP IMAP POP3 SMTP +Protocols: FTP IMAP POP3 SMTP LDAP Added: 7.20.0 Category: tls Example: --ssl pop3://example.com/ +See-also: insecure ciphers --- -Try to use SSL/TLS for the connection. Reverts to a non-secure connection if -the server doesn't support SSL/TLS. See also --ftp-ssl-control and --ssl-reqd +Try to use SSL/TLS for the connection. Reverts to a non-secure connection if +the server does not support SSL/TLS. See also --ftp-ssl-control and --ssl-reqd for different levels of encryption required. +This option is handled in LDAP since version 7.81.0. It is fully supported +by the openldap backend and ignored by the generic ldap backend. + +Please note that a server may close the connection if the negotiation does +not succeed. + This option was formerly known as --ftp-ssl (Added in 7.11.0). That option name can still be used but will be removed in a future version. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/sslv2.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/sslv2.d index d96a6cc8..0a541d0e 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/sslv2.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/sslv2.d @@ -1,8 +1,10 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Short: 2 Long: sslv2 Tags: Versions Protocols: SSL -Added: +Added: 5.9 Mutexed: sslv3 tlsv1 tlsv1.1 tlsv1.2 Requires: TLS See-also: http1.1 http2 diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/sslv3.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/sslv3.d index 3ee483d2..ba529102 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/sslv3.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/sslv3.d @@ -1,8 +1,10 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Short: 3 Long: sslv3 Tags: Versions Protocols: SSL -Added: +Added: 5.9 Mutexed: sslv2 tlsv1 tlsv1.1 tlsv1.2 Requires: TLS See-also: http1.1 http2 diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/stderr.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/stderr.d index c0f0efa3..274c7423 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/stderr.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/stderr.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: stderr Arg: Help: Where to redirect stderr See-also: verbose silent Category: verbose Example: --stderr output.txt $URL +Added: 6.2 --- Redirect all writes to stderr to the specified file instead. If the file name is a plain '-', it is instead written to stdout. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/styled-output.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/styled-output.d index bf636019..2cc11e99 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/styled-output.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/styled-output.d @@ -1,8 +1,11 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: styled-output Help: Enable styled output for HTTP headers Added: 7.61.0 Category: verbose Example: --styled-output -I $URL +See-also: head verbose --- Enables the automatic use of bold font styles when writing HTTP headers to the terminal. Use --no-styled-output to switch them off. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/suppress-connect-headers.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/suppress-connect-headers.d index 71078e88..62e88205 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/suppress-connect-headers.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/suppress-connect-headers.d @@ -1,10 +1,13 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: suppress-connect-headers Help: Suppress proxy CONNECT response headers See-also: dump-header include proxytunnel Category: proxy Example: --suppress-connect-headers --include -x proxy $URL +Added: 7.54.0 --- -When --proxytunnel is used and a CONNECT request is made don't output proxy +When --proxytunnel is used and a CONNECT request is made do not output proxy CONNECT response headers. This option is meant to be used with --dump-header or --include which are used to show protocol headers in the output. It has no effect on debug options such as --verbose or --trace, or any statistics. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/tcp-fastopen.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/tcp-fastopen.d index e7e9d2e9..36a5e287 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/tcp-fastopen.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/tcp-fastopen.d @@ -1,7 +1,10 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: tcp-fastopen Added: 7.49.0 Help: Use TCP Fast Open Category: connection Example: --tcp-fastopen $URL +See-also: false-start --- Enable use of TCP Fast Open (RFC7413). diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/tcp-nodelay.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/tcp-nodelay.d index 97cd30aa..a62d7f2c 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/tcp-nodelay.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/tcp-nodelay.d @@ -1,11 +1,14 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: tcp-nodelay Help: Use the TCP_NODELAY option Added: 7.11.2 Category: connection Example: --tcp-nodelay $URL +See-also: no-buffer --- Turn on the TCP_NODELAY option. See the *curl_easy_setopt(3)* man page for details about this option. Since 7.50.2, curl sets this option by default and you need to explicitly -switch it off if you don't want it on. +switch it off if you do not want it on. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/telnet-option.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/telnet-option.d index 3475cb59..4eed7acf 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/telnet-option.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/telnet-option.d @@ -1,9 +1,13 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: telnet-option Short: t Arg: Help: Set telnet option Category: telnet Example: -t TTYPE=vt100 telnet://example.com/ +Added: 7.7 +See-also: config --- Pass options to the telnet protocol. Supported options are: diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/tftp-blksize.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/tftp-blksize.d index 3b19e5cf..823f69ca 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/tftp-blksize.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/tftp-blksize.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: tftp-blksize Arg: Help: Set TFTP BLKSIZE option @@ -5,6 +7,7 @@ Protocols: TFTP Added: 7.20.0 Category: tftp Example: --tftp-blksize 1024 tftp://example.com/file +See-also: tftp-no-options --- Set TFTP BLKSIZE option (must be >512). This is the block size that curl will try to use when transferring data to or from a TFTP server. By default 512 diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/tftp-no-options.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/tftp-no-options.d index 9ff334b8..cdff872c 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/tftp-no-options.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/tftp-no-options.d @@ -1,9 +1,12 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: tftp-no-options Help: Do not send any TFTP options Protocols: TFTP Added: 7.48.0 Category: tftp Example: --tftp-no-options tftp://192.168.0.1/ +See-also: tftp-blksize --- Tells curl not to send TFTP options requests. diff --git a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/time-cond.d b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/time-cond.d index f82f497f..5fde2518 100644 --- a/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/time-cond.d +++ b/trunk/libs/libcurl/curl-7.x/docs/cmdline-opts/time-cond.d @@ -1,3 +1,5 @@ +c: Copyright (C) 1998 - 2022, Daniel Stenberg, , et al. +SPDX-License-Identifier: curl Long: time-cond Short: z Arg: