Update to curl 7.51.0.

Fixes bug 697337.

3 files changed, 23 insertions, 36 deletions

diff --git a/Makethird b/Makethird
index d4c8dc3a..a4c15dde 100644
--- a/Makethird
+++ b/Makethird
@@ -542,32 +542,25 @@ CURL_SRC := \
 	amigaos.c \
 	asyn-ares.c \
 	asyn-thread.c \
-	axtls.c \
 	base64.c \
-	bundles.c \
 	conncache.c \
 	connect.c \
 	content_encoding.c \
 	cookie.c \
 	curl_addrinfo.c \
-	curl_darwinssl.c \
 	curl_fnmatch.c \
 	curl_gethostname.c \
 	curl_gssapi.c \
 	curl_memrchr.c \
 	curl_multibyte.c \
-	curl_ntlm.c \
 	curl_ntlm_core.c \
-	curl_ntlm_msgs.c \
 	curl_ntlm_wb.c \
-	curl_rand.c \
 	curl_rtmp.c \
 	curl_sasl.c \
-	curl_schannel.c \
 	curl_sspi.c \
 	curl_threads.c \
-	cyassl.c \
 	dict.c \
+	dotdot.c \
 	easy.c \
 	escape.c \
 	file.c \
@@ -578,7 +571,6 @@ CURL_SRC := \
 	getenv.c \
 	getinfo.c \
 	gopher.c \
-	gtls.c \
 	hash.c \
 	hmac.c \
 	hostasyn.c \
@@ -591,14 +583,12 @@ CURL_SRC := \
 	http_chunks.c \
 	http_digest.c \
 	http_negotiate.c \
-	http_negotiate_sspi.c \
 	http_proxy.c \
 	idn_win32.c \
 	if2ip.c \
 	imap.c \
 	inet_ntop.c \
 	inet_pton.c \
-	krb4.c \
 	krb5.c \
 	ldap.c \
 	llist.c \
@@ -610,17 +600,12 @@ CURL_SRC := \
 	netrc.c \
 	non-ascii.c \
 	nonblock.c \
-	nss.c \
 	openldap.c \
 	parsedate.c \
 	pingpong.c \
 	pipeline.c \
-	polarssl.c \
-	polarssl_threadlock.c \
 	pop3.c \
 	progress.c \
-	qssl.c \
-	rawstr.c \
 	rtsp.c \
 	security.c \
 	select.c \
@@ -633,10 +618,8 @@ CURL_SRC := \
 	speedcheck.c \
 	splay.c \
 	ssh.c \
-	sslgen.c \
-	ssluse.c \
+	strcase.c \
 	strdup.c \
-	strequal.c \
 	strerror.c \
 	strtok.c \
 	strtoofft.c \
@@ -646,6 +629,7 @@ CURL_SRC := \
 	transfer.c \
 	url.c \
 	version.c \
+	vtls.c \
 	warnless.c \
 	wildcard.c \
 
@@ -655,11 +639,14 @@ $(CURL_OUT):
 	$(MKDIR_CMD)
 
 CRL_CFLAGS := -DHAVE_CONFIG_H -DBUILDING_LIBCURL -DCURL_STATICLIB \
-	-DCURL_DISABLE_LDAP -I$(CURL_DIR)/include
+	-DCURL_DISABLE_LDAP -I$(CURL_DIR)/include -I$(CURL_DIR)/lib
 
 $(CURL_OUT)/%.o: $(CURL_DIR)/lib/%.c	| $(CURL_OUT)
 	$(CC_CMD) $(CRL_CFLAGS)
 
+$(CURL_OUT)/%.o: $(CURL_DIR)/lib/vtls/%.c	| $(CURL_OUT)
+	$(CC_CMD) $(CRL_CFLAGS)
+
 CURL_CFLAGS := -I$(CURL_DIR)/include
 CURL_LIBS := $(SYS_CURL_DEPS)
 
diff --git a/platform/win32/mupdf-curl.vcproj b/platform/win32/mupdf-curl.vcproj
index 07e9b403..d76ae1d4 100644
--- a/platform/win32/mupdf-curl.vcproj
+++ b/platform/win32/mupdf-curl.vcproj
@@ -42,7 +42,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include"
+				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib"
 				PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_CURL=1;USE_OUTPUT_DEBUG_STRING"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -116,7 +116,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include"
+				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib"
 				PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_CURL=1;USE_OUTPUT_DEBUG_STRING"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -191,7 +191,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include"
+				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib"
 				PreprocessorDefinitions="FZ_LARGEFILE;HAVE_CURL=1"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -268,7 +268,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include"
+				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib"
 				PreprocessorDefinitions="FZ_LARGEFILE;HAVE_CURL=1"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -342,7 +342,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include"
+				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib"
 				PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1;DEBUG=1;HAVE_CURL=1;USE_OUTPUT_DEBUG_STRING"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -416,7 +416,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include"
+				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib"
 				PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1;DEBUG=1;HAVE_CURL=1;USE_OUTPUT_DEBUG_STRING"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -489,7 +489,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include"
+				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib"
 				PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_LIBCRYPTO;HAVE_CURL=1;USE_OUTPUT_DEBUG_STRING"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -564,7 +564,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include"
+				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib"
 				PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_LIBCRYPTO;HAVE_CURL=1;USE_OUTPUT_DEBUG_STRING"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -640,7 +640,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include"
+				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib"
 				PreprocessorDefinitions="FZ_LARGEFILE;HAVE_LIBCRYPTO;HAVE_CURL=1"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -718,7 +718,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include"
+				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib"
 				PreprocessorDefinitions="FZ_LARGEFILE;HAVE_LIBCRYPTO;HAVE_CURL=1"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -793,7 +793,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include"
+				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib"
 				PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1;DEBUG=1;HAVE_CURL=1;USE_OUTPUT_DEBUG_STRING"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -867,7 +867,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include"
+				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib"
 				PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;MEMENTO=1;DEBUG=1;HAVE_CURL=1;USE_OUTPUT_DEBUG_STRING"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -942,7 +942,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include"
+				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib"
 				PreprocessorDefinitions="FZ_LARGEFILE;HAVE_CURL=1"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -1019,7 +1019,7 @@
 				Name="VCCLCompilerTool"
 				Optimization="2"
 				EnableIntrinsicFunctions="true"
-				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include"
+				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib"
 				PreprocessorDefinitions="FZ_LARGEFILE;HAVE_CURL=1"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="true"
@@ -1093,7 +1093,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include"
+				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib"
 				PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_CURL=1;USE_OUTPUT_DEBUG_STRING"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
@@ -1167,7 +1167,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include"
+				AdditionalIncludeDirectories="..\..\include,..\..\thirdparty\curl\include,..\..\thirdparty\curl\lib"
 				PreprocessorDefinitions="FZ_LARGEFILE;FT2_BUILD_LIBRARY;OPJ_STATIC;DEBUG=1;HAVE_CURL=1;USE_OUTPUT_DEBUG_STRING"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
diff --git a/thirdparty/curl b/thirdparty/curl
-Subproject 41fc6eb8f6ad286dce9de79b4dc8fc02ccee6b0
+Subproject 578c7638561cf9506e9e9a1761527d40261ac0c