Update to 7.59.0 - March 14 2018.

Changes:

  curl: add --proxy-pinnedpubkey
  added: CURLOPT_TIMEVALUE_LARGE and CURLINFO_FILETIME_T
  CURLOPT_RESOLVE: Add support for multiple IP addresses per entry
  Add option CURLOPT_HAPPY_EYEBALLS_TIMEOUT_MS
  Add new tool option --happy-eyeballs-timeout-ms
  Add CURLOPT_RESOLVER_START_FUNCTION and CURLOPT_RESOLVER_START_DATA

Bugfixes:

  openldap: check ldap_get_attribute_ber() results for NULL before using
  FTP: reject path components with control codes
  readwrite: make sure excess reads don't go beyond buffer end
  lib555: drop text conversion and encode data as ascii codes
  lib517: make variable static to avoid compiler warning
  lib544: sync ascii code data with textual data
  GSKit: restore pinnedpubkey functionality
  darwinssl: Don't import client certificates into Keychain on macOS
  parsedate: fix date parsing for systems with 32 bit long
  openssl: fix pinned public key build error in FIPS mode
  SChannel/WinSSL: Implement public key pinning
  cookies: remove verbose "cookie size:" output
  progress-bar: don't use stderr explicitly, use bar->out
  Fixes for MSDOS
  build: open VC15 projects with VS 2017
  curl_ctype: private is*() type macros and functions
  configure: set PATH_SEPARATOR to colon for PATH w/o separator
  winbuild: make linker generate proper PDB
  curl_easy_reset: clear digest auth state
  curl/curl.h: fix comment typo for CURLOPT_DNS_LOCAL_IP6
  range: commonize FTP and FILE range handling
  progress-bar docs: update to match implementation
  fnmatch: do not match the empty string with a character set
  fnmatch: accept an alphanum to be followed by a non-alphanum in char set
  build: fix termios issue on android cross-compile
  getdate: return -1 for out of range
  formdata: use the mime-content type function
  time-cond: fix reading the file modification time on Windows
  build-openssl.bat: Extend VC15 support to include Enterprise and Professional
  build-wolfssl.bat: Extend VC15 support to include Enterprise and Professional
  openssl: Don't add verify locations when verifypeer==0
  fnmatch: optimize processing of consecutive *s and ?s pattern characters
  schannel: fix compiler warnings
  content_encoding: Add "none" alias to "identity"
  get_posix_time: only check for overflows if they can happen
  http_chunks: don't write chunks twice with CURLOPT_HTTP_TRANSFER_DECODING
  README: language fix
  sha256: build with OpenSSL < 0.9.8
  smtp: fix processing of initial dot in data
  --tlsauthtype: works only if libcurl is built with TLS-SRP support
  tests: new tests for http raw mode
  libcurl-security.3: man page discussion security concerns when using libcurl
  curl_gssapi: make sure this file too uses our *printf()
  BINDINGS: fix curb link (and remove ruby-curl-multi)
  nss: use PK11_CreateManagedGenericObject() if available
  travis: add build with iconv enabled
  ssh: add two missing state names
  CURLOPT_HEADERFUNCTION.3: mention folded headers
  http: fix the max header length detection logic
  header callback: don't chop headers into smaller pieces
  CURLOPT_HEADER.3: clarify problems with different data sizes
  curl --version: show PSL if the run-time lib has it enabled
  examples/sftpuploadresume: resume upload via CURLOPT_APPEND
  Return error if called recursively from within callbacks
  sasl: prefer PLAIN mechanism over LOGIN
  winbuild: Use CALL to run batch scripts
  curl_share_setopt.3: connection cache is shared within multi handles
  winbuild: Use macros for the names of some build utilities
  projects/README: remove reference to dead IDN link/package
  lib655: silence compiler warning
  configure: Fix version check for OpenSSL 1.1.1
  docs/MANUAL: formfind.pl is not accessible on the site anymore
  unit1309: fix warning on Windows x64
  unit1307: proper cleanup on OOM to fix torture tests
  curl_ctype: fix macro redefinition warnings
  build: get CFLAGS (including -werror) used for examples and tests
  NO_PROXY: fix for IPv6 numericals in the URL
  krb5: use nondeprecated functions
  winbuild: prefer documented zlib library names
  http2: mark the connection for close on GOAWAY
  limit-rate: kick in even before "limit" data has been received
  HTTP: allow "header;" to replace an internal header with a blank one
  http2: verbose output new MAX_CONCURRENT_STREAMS values
  SECURITY: distros' max embargo time is 14 days
  curl tool: accept --compressed also if Brotli is enabled and zlib is not
  WolfSSL: adding TLSv1.3
  checksrc.pl: add -i and -m options
  CURLOPT_COOKIEFILE.3: "-" as file name means stdin

Bug: http://b/78771319
Test: builds, boots, `vendor/google/tools/fake-ota on streaming` works
Change-Id: I18731dd7c91df36ca92a5dffc8631dee22785e34

1 files changed, 26 insertions, 4 deletions

diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 32790ff8..28500aeb 100644
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -45,6 +45,11 @@
 

 CFGSET=FALSE

 WINBUILD_DIR=`cd`

+

+# Utilities.

+# If a path is required that contains characters such as space, quote the path.

+MT         = mt.exe

+RC         = rc.exe

 ZIP        = zip.exe

 

 # Allow changing C compiler via environment variable CC (default cl.exe)

@@ -68,7 +73,7 @@ LNKDLL     = link.exe /DLL
 LNKLIB     = link.exe /lib

 

 CFLAGS_PDB = /Zi

-LFLAGS_PDB = /incremental:no /opt:ref,icf

+LFLAGS_PDB = /incremental:no /opt:ref,icf /DEBUG

 

 CFLAGS_LIBCURL_STATIC  = /DCURL_STATICLIB

 

@@ -176,12 +181,26 @@ CARES          = static
 CARES_CFLAGS   = /DUSE_ARES /I"$(DEVEL_INCLUDE)/cares"

 !ENDIF

 

+# Depending on how zlib is built the libraries have different names, we 

+# try to handle them all. 

 !IF "$(WITH_ZLIB)"=="dll"

+!IF EXISTS("$(DEVEL_LIB)\zlibwapi.lib")

+ZLIB_LIBS = zlibwapi.lib

+!ELSEIF EXISTS("$(DEVEL_LIB)\zdll.lib")

+ZLIB_LIBS   = zdll.lib

+!ELSE

 ZLIB_LIBS   = zlib.lib

+!ENDIF

 USE_ZLIB    = true

 ZLIB        = dll

 !ELSEIF "$(WITH_ZLIB)"=="static"

+!IF EXISTS("$(DEVEL_LIB)\zlibstat.lib")

+ZLIB_LIBS   = zlibstat.lib

+!ELSEIF EXISTS("$(DEVEL_LIB)\zlib.lib")

+ZLIB_LIBS   = zlib.lib

+!ELSE

 ZLIB_LIBS   = zlib_a.lib

+!ENDIF

 USE_ZLIB    = true

 ZLIB        = static

 !ENDIF

@@ -267,7 +286,7 @@ GEN_PDB = true
 

 

 !IFDEF EMBED_MANIFEST

-MANIFESTTOOL = mt -manifest $(DIRDIST)\bin\$(PROGRAM_NAME).manifest -outputresource:$(DIRDIST)\bin\$(PROGRAM_NAME);1

+MANIFESTTOOL = $(MT) -manifest $(DIRDIST)\bin\$(PROGRAM_NAME).manifest -outputresource:$(DIRDIST)\bin\$(PROGRAM_NAME);1

 !ENDIF

 

 # Runtime library configuration

@@ -496,7 +515,7 @@ $(CURL_DIROBJ):
 	$(CURL_CC) $(CFLAGS) /Fo"$@"  $<

 

 $(LIB_DIROBJ)\libcurl.res: $(LIBCURL_SRC_DIR)\libcurl.rc

-	rc $(RC_FLAGS)

+	$(RC) $(RC_FLAGS)

 

 #

 # curl.exe

@@ -520,7 +539,8 @@ CURL_LIBCURL_LIBNAME=$(LIB_NAME_IMP)
 CURL_FROM_LIBCURL=$(CURL_DIROBJ)\tool_hugehelp.obj \

  $(CURL_DIROBJ)\nonblock.obj \

  $(CURL_DIROBJ)\strtoofft.obj \

- $(CURL_DIROBJ)\warnless.obj

+ $(CURL_DIROBJ)\warnless.obj \

+ $(CURL_DIROBJ)\curl_ctype.obj

  

 $(PROGRAM_NAME): $(CURL_DIROBJ) $(CURL_FROM_LIBCURL) $(EXE_OBJS)

 	$(CURL_LINK) $(CURL_LFLAGS) $(CURL_LIBCURL_LIBNAME) $(WIN_LIBS) $(CURL_FROM_LIBCURL) $(EXE_OBJS)

@@ -537,6 +557,8 @@ $(CURL_DIROBJ)\strtoofft.obj: ../lib/strtoofft.c
 	$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/strtoofft.c

 $(CURL_DIROBJ)\warnless.obj: ../lib/warnless.c

 	$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/warnless.c

+$(CURL_DIROBJ)\curl_ctype.obj: ../lib/curl_ctype.c

+	$(CURL_CC) $(CURL_CFLAGS) /Fo"$@" ../lib/curl_ctype.c

 $(CURL_DIROBJ)\curl.res: $(CURL_SRC_DIR)\curl.rc

 	rc $(CURL_RC_FLAGS)