[gs-commits] mupdf 1.16.1.epub-prerelease-37 Update Curl to latest rel

[email protected] (Robin Watts) Thu, 2 Jan 2020 15:21:50 +0000 (UTC)
Newsgroups	gmane.comp.printing.ghostscript.cvs
Message-ID	<[email protected]>
commit 6d59aa335ba86391f50e8726d0ed9be4366ab1a4
Author: Robin Watts <[email protected]>
Date:   Thu Jan 2 12:44:23 2020 +0000

    Update Curl to latest release (7_66_0).
    
    This removes the need for the previously added hack, so we
    remove that.

diff --git a/platform/win32/libcurl.vcxproj b/platform/win32/libcurl.vcxproj
index 5136563..118867e 100644
--- a/platform/win32/libcurl.vcxproj
+++ b/platform/win32/libcurl.vcxproj
@@ -204,6 +204,7 @@
     <ClCompile Include="..\..\thirdparty\curl\lib\curl_endian.c" />
     <ClCompile Include="..\..\thirdparty\curl\lib\curl_fnmatch.c" />
     <ClCompile Include="..\..\thirdparty\curl\lib\curl_gethostname.c" />
+    <ClCompile Include="..\..\thirdparty\curl\lib\curl_get_line.c" />
     <ClCompile Include="..\..\thirdparty\curl\lib\curl_gssapi.c" />
     <ClCompile Include="..\..\thirdparty\curl\lib\curl_memrchr.c" />
     <ClCompile Include="..\..\thirdparty\curl\lib\curl_multibyte.c" />
@@ -265,7 +266,6 @@
     <ClCompile Include="..\..\thirdparty\curl\lib\openldap.c" />
     <ClCompile Include="..\..\thirdparty\curl\lib\parsedate.c" />
     <ClCompile Include="..\..\thirdparty\curl\lib\pingpong.c" />
-    <ClCompile Include="..\..\thirdparty\curl\lib\pipeline.c" />
     <ClCompile Include="..\..\thirdparty\curl\lib\pop3.c" />
     <ClCompile Include="..\..\thirdparty\curl\lib\progress.c" />
     <ClCompile Include="..\..\thirdparty\curl\lib\psl.c" />
@@ -285,8 +285,6 @@
     <ClCompile Include="..\..\thirdparty\curl\lib\socks_sspi.c" />
     <ClCompile Include="..\..\thirdparty\curl\lib\speedcheck.c" />
     <ClCompile Include="..\..\thirdparty\curl\lib\splay.c" />
-    <ClCompile Include="..\..\thirdparty\curl\lib\ssh-libssh.c" />
-    <ClCompile Include="..\..\thirdparty\curl\lib\ssh.c" />
     <ClCompile Include="..\..\thirdparty\curl\lib\strcase.c" />
     <ClCompile Include="..\..\thirdparty\curl\lib\strdup.c" />
     <ClCompile Include="..\..\thirdparty\curl\lib\strerror.c" />
@@ -312,7 +310,6 @@
     <ClCompile Include="..\..\thirdparty\curl\lib\vauth\spnego_sspi.c" />
     <ClCompile Include="..\..\thirdparty\curl\lib\vauth\vauth.c" />
     <ClCompile Include="..\..\thirdparty\curl\lib\version.c" />
-    <ClCompile Include="..\..\thirdparty\curl\lib\vtls\cyassl.c" />
     <ClCompile Include="..\..\thirdparty\curl\lib\vtls\gskit.c" />
     <ClCompile Include="..\..\thirdparty\curl\lib\vtls\gtls.c" />
     <ClCompile Include="..\..\thirdparty\curl\lib\vtls\mbedtls.c" />
@@ -325,6 +322,7 @@
     <ClCompile Include="..\..\thirdparty\curl\lib\vtls\schannel_verify.c" />
     <ClCompile Include="..\..\thirdparty\curl\lib\vtls\sectransp.c" />
     <ClCompile Include="..\..\thirdparty\curl\lib\vtls\vtls.c" />
+    <ClCompile Include="..\..\thirdparty\curl\lib\vtls\wolfssl.c" />
     <ClCompile Include="..\..\thirdparty\curl\lib\warnless.c" />
     <ClCompile Include="..\..\thirdparty\curl\lib\wildcard.c" />
     <ClCompile Include="..\..\thirdparty\curl\lib\x509asn1.c" />
@@ -347,6 +345,7 @@
     <ClInclude Include="..\..\thirdparty\curl\lib\config-dos.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\config-mac.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\config-os400.h" />
+    <ClInclude Include="..\..\thirdparty\curl\lib\config-plan9.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\config-riscos.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\config-symbian.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\config-tpf.h" />
@@ -365,6 +364,7 @@
     <ClInclude Include="..\..\thirdparty\curl\lib\curl_endian.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\curl_fnmatch.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\curl_gethostname.h" />
+    <ClInclude Include="..\..\thirdparty\curl\lib\curl_get_line.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\curl_gssapi.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\curl_hmac.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\curl_ldap.h" />
@@ -422,10 +422,10 @@
     <ClInclude Include="..\..\thirdparty\curl\lib\nonblock.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\parsedate.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\pingpong.h" />
-    <ClInclude Include="..\..\thirdparty\curl\lib\pipeline.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\pop3.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\progress.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\psl.h" />
+    <ClInclude Include="..\..\thirdparty\curl\lib\quic.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\rand.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\rtsp.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\select.h" />
@@ -442,7 +442,6 @@
     <ClInclude Include="..\..\thirdparty\curl\lib\socks.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\speedcheck.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\splay.h" />
-    <ClInclude Include="..\..\thirdparty\curl\lib\ssh.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\strcase.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\strdup.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\strerror.h" />
@@ -459,7 +458,6 @@
     <ClInclude Include="..\..\thirdparty\curl\lib\vauth\digest.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\vauth\ntlm.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\vauth\vauth.h" />
-    <ClInclude Include="..\..\thirdparty\curl\lib\vtls\cyassl.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\vtls\gskit.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\vtls\gtls.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\vtls\mbedtls.h" />
@@ -471,12 +469,13 @@
     <ClInclude Include="..\..\thirdparty\curl\lib\vtls\schannel.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\vtls\sectransp.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\vtls\vtls.h" />
+    <ClInclude Include="..\..\thirdparty\curl\lib\vtls\wolfssl.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\warnless.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\wildcard.h" />
     <ClInclude Include="..\..\thirdparty\curl\lib\x509asn1.h" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\thirdparty\curl\lib\Makefile.inc" />
+    <None Include="..\..\thirdparty\curl\lib\firefox-db2pem.sh" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\thirdparty\curl\lib\libcurl.rc" />
diff --git a/platform/win32/libcurl.vcxproj.filters b/platform/win32/libcurl.vcxproj.filters
index 71b54e0..6b50ed1 100644
--- a/platform/win32/libcurl.vcxproj.filters
+++ b/platform/win32/libcurl.vcxproj.filters
@@ -246,9 +246,6 @@
     <ClCompile Include="..\..\thirdparty\curl\lib\pingpong.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\curl\lib\pipeline.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\thirdparty\curl\lib\pop3.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -306,12 +303,6 @@
     <ClCompile Include="..\..\thirdparty\curl\lib\splay.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\curl\lib\ssh-libssh.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\thirdparty\curl\lib\ssh.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\thirdparty\curl\lib\strcase.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -360,9 +351,6 @@
     <ClCompile Include="..\..\thirdparty\curl\lib\x509asn1.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\thirdparty\curl\lib\vtls\cyassl.c">
-      <Filter>Source Files\vtls</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\thirdparty\curl\lib\vtls\gskit.c">
       <Filter>Source Files\vtls</Filter>
     </ClCompile>
@@ -435,6 +423,12 @@
     <ClCompile Include="..\..\thirdparty\curl\lib\vauth\vauth.c">
       <Filter>Source Files\vauth</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\thirdparty\curl\lib\curl_get_line.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\thirdparty\curl\lib\vtls\wolfssl.c">
+      <Filter>Source Files\vtls</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\thirdparty\curl\lib\altsvc.h">
@@ -686,9 +680,6 @@
     <ClInclude Include="..\..\thirdparty\curl\lib\pingpong.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\curl\lib\pipeline.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\thirdparty\curl\lib\pop3.h">
       <Filter>Source Files</Filter>
     </ClInclude>
@@ -746,9 +737,6 @@
     <ClInclude Include="..\..\thirdparty\curl\lib\splay.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\curl\lib\ssh.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\thirdparty\curl\lib\strcase.h">
       <Filter>Source Files</Filter>
     </ClInclude>
@@ -797,9 +785,6 @@
     <ClInclude Include="..\..\thirdparty\curl\lib\x509asn1.h">
       <Filter>Source Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\thirdparty\curl\lib\vtls\cyassl.h">
-      <Filter>Source Files\vtls</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\thirdparty\curl\lib\vtls\gskit.h">
       <Filter>Source Files\vtls</Filter>
     </ClInclude>
@@ -869,9 +854,21 @@
     <ClInclude Include="..\..\thirdparty\curl\include\curl\urlapi.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\thirdparty\curl\lib\config-plan9.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\curl\lib\curl_get_line.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\curl\lib\quic.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\thirdparty\curl\lib\vtls\wolfssl.h">
+      <Filter>Source Files\vtls</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\thirdparty\curl\lib\Makefile.inc">
+    <None Include="..\..\thirdparty\curl\lib\firefox-db2pem.sh">
       <Filter>Source Files</Filter>
     </None>
   </ItemGroup>
@@ -880,4 +877,4 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/platform/x11/curl_stream.c b/platform/x11/curl_stream.c
index 10ffa35..b7a612e 100644
--- a/platform/x11/curl_stream.c
+++ b/platform/x11/curl_stream.c
@@ -13,24 +13,6 @@
 #include <pthread.h>
 #endif
 
-#ifdef _WIN32
-#if _MSC_VER >= 1910
-/* Horrible hack to make this work with VS2017 and higher. */
-static FILE _iob[3];
-static int got_iob = 0;
-FILE * __cdecl __iob_func(void)
-{
-	if (!got_iob) {
-		_iob[0] = *stdin;
-		_iob[1] = *stdout;
-		_iob[2] = *stderr;
-		got_iob = 1;
-	}
-	return _iob;
-}
-#endif
-#endif
-
 #undef DEBUG_BLOCK_FETCHING
 
 #ifdef DEBUG_BLOCK_FETCHING
diff --git a/thirdparty/curl b/thirdparty/curl
index 6394b3a..f43c6fb 160000
--- a/thirdparty/curl
+++ b/thirdparty/curl
@@ -1 +1 @@
-Subproject commit 6394b3a31f969c02c846c22cc0dcc29fe2af2d70
+Subproject commit f43c6fbb2dbdf68dfdd0f0c3399e3711a621614a

http://git.ghostscript.com/?p=mupdf.git;a=commit;h=6d59aa335ba86391f50e8726d0ed9be4366ab1a4

--
MuPDF library
Artifex Software, Inc.