[pull] master from curl:master

.github/workflows/non-native.yml

@@ -318,7 +318,6 @@ jobs:
       - name: 'configure'
         run: |
           if [ -n '${{ matrix.build.generate }}' ]; then
-            export OPENSSL_DIR=/
             # https://cmake.org/cmake/help/latest/manual/cmake-toolchains.7.html#cross-compiling-for-ios-tvos-visionos-or-watchos
             [ -n '${{ matrix.build.generator }}' ] && options='-G ${{ matrix.build.generator }}'
             cmake -B bld -DCMAKE_UNITY_BUILD=ON -DCURL_TEST_BUNDLES=ON -DCURL_WERROR=ON \

.gitignore

@@ -8,11 +8,15 @@
 *.exp
 *.la
 *.lib
+*.a
+*.res
 *.lo
 *.o
 *.obj
 *.pdb
 *.pyc
+*.orig
+*.rej
 *~
 .*.sw?
 .cproject
@@ -60,6 +64,7 @@ missing
 mkinstalldirs
 tags
 test-driver
+stamp-h*
 scripts/_curl
 scripts/curl.fish
 curl_fuzzer

CMake/CurlTests.c

@@ -50,7 +50,6 @@ int main(void)
   int flags = 0;
   if(0 != fcntl(0, F_SETFL, flags | O_NONBLOCK))
     return 1;
-  ;
   return 0;
 }
 #endif

CMakeLists.txt

@@ -515,6 +515,19 @@ endif()
 
 find_package(Perl)
 
+if(PERL_EXECUTABLE)
+  add_custom_target(curl-ca-bundle
+    COMMENT "Generating a fresh ca-bundle.crt" VERBATIM USES_TERMINAL
+    COMMAND "${PERL_EXECUTABLE}" "${PROJECT_SOURCE_DIR}/scripts/mk-ca-bundle.pl" -b -l -u "lib/ca-bundle.crt"
+    DEPENDS "${PROJECT_SOURCE_DIR}/scripts/mk-ca-bundle.pl"
+  )
+  add_custom_target(curl-ca-firefox
+    COMMENT "generating a fresh ca-bundle.crt" VERBATIM USES_TERMINAL
+    COMMAND "${PERL_EXECUTABLE}" "${PROJECT_SOURCE_DIR}/scripts/firefox-db2pem.sh" "lib/ca-bundle.crt"
+    DEPENDS "${PROJECT_SOURCE_DIR}/scripts/firefox-db2pem.sh"
+  )
+endif()
+
 option(BUILD_LIBCURL_DOCS "Build libcurl man pages" ON)
 option(BUILD_MISC_DOCS "Build misc man pages (e.g. curl-config and mk-ca-bundle)" ON)
 option(ENABLE_CURL_MANUAL "Build the man page for curl and enable its -M/--manual option" ON)

Makefile.am

@@ -81,9 +81,8 @@ PLAN9_DIST = plan9/include/mkfile \
  plan9/src/mkfile.inc             \
  plan9/src/mkfile
 
-EXTRA_DIST = CHANGES.md COPYING Makefile.dist             \
- RELEASE-NOTES $(CMAKE_DIST) $(VC_DIST) $(WINBUILD_DIST)  \
- $(PLAN9_DIST) Dockerfile
+EXTRA_DIST = CHANGES.md COPYING RELEASE-NOTES Dockerfile \
+ $(CMAKE_DIST) $(VC_DIST) $(WINBUILD_DIST) $(PLAN9_DIST)
 
 DISTCLEANFILES = buildinfo.txt
 
@@ -97,7 +96,7 @@ pkgconfig_DATA = libcurl.pc
 
 dist-hook:
 	rm -rf $(top_builddir)/tests/log
-	find $(distdir) -name "*.dist" -a \! -name Makefile.dist -exec rm {} \;
+	find $(distdir) -name "*.dist" -exec rm {} \;
 	(distit=`find $(srcdir) -name "*.dist" | grep -v Makefile`; \
 	for file in $$distit; do \
 	  strip=`echo $$file | sed -e s/^$(srcdir)// -e s/\.dist//`; \

docs/examples/.gitignore

@@ -2,120 +2,4 @@
 #
 # SPDX-License-Identifier: curl
 
-10-at-a-time
-address-scope
-altsvc
-anyauthput
-block_ip
-certinfo
-chkspeed
-connect-to
-cookie_interface
-debug
-default-scheme
-externalsocket
-fileupload
-fopen
-ftp-wildcard
-ftpget
-ftpgetinfo
-ftpgetresp
-ftpsget
-ftpupload
-ftpuploadfrommem
-ftpuploadresume
-getinfo
-getinmemory
-getredirect
-getreferrer
-headerapi
-hsts-preload
-http-options
-http-post
-http2-download
-http2-pushinmemory
-http2-serverpush
-http2-upload
-http3
-http3-present
-httpcustomheader
-httpput
-httpput-postfields
-https
-imap-append
-imap-authzid
-imap-copy
-imap-create
-imap-delete
-imap-examine
-imap-fetch
-imap-list
-imap-lsub
-imap-multi
-imap-noop
-imap-search
-imap-ssl
-imap-store
-imap-tls
-interface
-ipv6
-keepalive
-localport
-maxconnects
-multi-app
-multi-debugcallback
-multi-double
-multi-formadd
-multi-legacy
-multi-poll
-multi-post
-multi-single
-netrc
-new-gitignore
-parseurl
-persistent
-pop3-authzid
-pop3-dele
-pop3-list
-pop3-multi
-pop3-noop
-pop3-retr
-pop3-ssl
-pop3-stat
-pop3-tls
-pop3-top
-pop3-uidl
-post-callback
-postinmemory
-postit2
-postit2-formadd
-progressfunc
-protofeats
-range
-resolve
-rtsp
-rtsp-options
-sendrecv
-sepheaders
-sftpget
-sftpuploadresume
-shared-connection-cache
-simple
-simplepost
-simplessl
-smtp-authzid
-smtp-expn
-smtp-mail
-smtp-mime
-smtp-multi
-smtp-ssl
-smtp-tls
-smtp-vrfy
-sslbackend
-unixsocket
-url2file
-urlapi
-usercertinmem
-websocket
-websocket-cb
-xmlstream
+/[0-9a-z_-]+

docs/examples/Makefile.inc

@@ -82,7 +82,7 @@ check_PROGRAMS = \
   ipv6 \
   keepalive \
   localport \
-  maxconnects  \
+  maxconnects \
   multi-app \
   multi-debugcallback \
   multi-double \

docs/libcurl/Makefile.inc

@@ -41,8 +41,8 @@ man_MANS = \
  curl_easy_reset.3 \
  curl_easy_send.3 \
  curl_easy_setopt.3 \
- curl_easy_ssls_import.3 \
  curl_easy_ssls_export.3 \
+ curl_easy_ssls_import.3 \
  curl_easy_strerror.3 \
  curl_easy_unescape.3 \
  curl_easy_upkeep.3 \
@@ -56,8 +56,8 @@ man_MANS = \
  curl_global_cleanup.3 \
  curl_global_init.3 \
  curl_global_init_mem.3 \
- curl_global_trace.3 \
  curl_global_sslset.3 \
+ curl_global_trace.3 \
  curl_mime_addpart.3 \
  curl_mime_data.3 \
  curl_mime_data_cb.3 \
@@ -87,11 +87,11 @@ man_MANS = \
  curl_multi_socket_all.3 \
  curl_multi_strerror.3 \
  curl_multi_timeout.3 \
- curl_multi_wakeup.3 \
  curl_multi_wait.3 \
  curl_multi_waitfds.3 \
- curl_pushheader_bynum.3 \
+ curl_multi_wakeup.3 \
  curl_pushheader_byname.3 \
+ curl_pushheader_bynum.3 \
  curl_share_cleanup.3 \
  curl_share_init.3 \
  curl_share_setopt.3 \
@@ -113,8 +113,8 @@ man_MANS = \
  curl_ws_recv.3 \
  curl_ws_send.3 \
  libcurl-easy.3 \
- libcurl-env.3 \
  libcurl-env-dbg.3 \
+ libcurl-env.3 \
  libcurl-errors.3 \
  libcurl-multi.3 \
  libcurl-security.3 \

lib/.gitignore

@@ -2,12 +2,6 @@
 #
 # SPDX-License-Identifier: curl
 
-*.a
-*.orig
-*.rej
-*.res
-TAGS
 curl_config.h
 curl_config.h.in
 libcurl.vers
-stamp-h1

lib/Makefile.am

@@ -28,11 +28,9 @@ CMAKE_DIST = CMakeLists.txt curl_config.h.cmake
 CHECKSRC_DIST = .checksrc vauth/.checksrc vquic/.checksrc vssh/.checksrc \
  vtls/.checksrc
 
-EXTRA_DIST = config-win32.h config-plan9.h                              \
- config-riscos.h config-mac.h curl_config.h.in libcurl.rc               \
- config-os400.h setup-os400.h                                           \
- $(CMAKE_DIST) setup-win32.h Makefile.soname optiontable.pl libcurl.def \
- $(CHECKSRC_DIST)
+EXTRA_DIST = config-mac.h config-os400.h config-plan9.h config-riscos.h \
+ config-win32.h curl_config.h.in libcurl.rc libcurl.def                 \
+ $(CMAKE_DIST) Makefile.soname optiontable.pl $(CHECKSRC_DIST)
 
 lib_LTLIBRARIES = libcurl.la
 
@@ -145,9 +143,10 @@ CS_1 =
 CS_ = $(CS_0)
 
 checksrc:
-	$(CHECKSRC)(@PERL@ $(top_srcdir)/scripts/checksrc.pl -D$(srcdir)    \
-	-W$(srcdir)/curl_config.h $(srcdir)/*.[ch] $(srcdir)/vauth/*.[ch]   \
-	$(srcdir)/vtls/*.[ch] $(srcdir)/vquic/*.[ch] $(srcdir)/vssh/*.[ch])
+	$(CHECKSRC)(@PERL@ $(top_srcdir)/scripts/checksrc.pl -D$(srcdir)         \
+	  -W$(srcdir)/libcurl_unity.c -W$(srcdir)/curl_config.h $(srcdir)/*.[ch] \
+	  $(srcdir)/vauth/*.[ch] $(srcdir)/vtls/*.[ch] $(srcdir)/vquic/*.[ch]    \
+	  $(srcdir)/vssh/*.[ch])
 
 if DEBUGBUILD
 # for debug builds, we scan the sources on all regular make invokes

lib/Makefile.inc

@@ -349,7 +349,9 @@ LIB_HFILES =         \
   select.h           \
   sendf.h            \
   setopt.h           \
+  setup-os400.h      \
   setup-vms.h        \
+  setup-win32.h      \
   share.h            \
   sigpipe.h          \
   slist.h            \

lib/ftp.c

@@ -4108,8 +4108,8 @@ static CURLcode ftp_disconnect(struct Curl_easy *data,
 }
 
 #ifdef _MSC_VER
-/* warning C4706: assignment within conditional expression */
-#pragma warning(disable:4706)
+#pragma warning(push)
+#pragma warning(disable:4706) /* assignment within conditional expression */
 #endif
 
 /***********************************************************************
@@ -4266,6 +4266,10 @@ CURLcode ftp_parse_url_path(struct Curl_easy *data)
   return CURLE_OK;
 }
 
+#ifdef _MSC_VER
+#pragma warning(pop)
+#endif
+
 /* call this when the DO phase has completed */
 static CURLcode ftp_dophase_done(struct Curl_easy *data, bool connected)
 {

lib/ldap.c

@@ -57,7 +57,7 @@
 #ifdef USE_WIN32_LDAP           /* Use Windows LDAP implementation. */
 # ifdef _MSC_VER
 #  pragma warning(push)
-#  pragma warning(disable: 4201)
+#  pragma warning(disable:4201)
 # endif
 # include <subauth.h>  /* for [P]UNICODE_STRING */
 # ifdef _MSC_VER