Update to 7.60.0 - May 15 2018.

Changes:

  Add CURLOPT_HAPROXYPROTOCOL, support for the HAProxy PROXY protocol
  Add --haproxy-protocol for the command line tool
  Add CURLOPT_DNS_SHUFFLE_ADDRESSES, shuffle returned IP addresses

Bugfixes:

  FTP: shutdown response buffer overflow CVE-2018-1000300
  RTSP: bad headers buffer over-read CVE-2018-1000301
  FTP: fix typo in recursive callback detection for seeking
  test1208: marked flaky
  HTTP: make header-less responses still count correct body size
  user-agent.d:: mention --proxy-header as well
  http2: fixes typo
  cleanup: misc typos in strings and comments
  rate-limit: use three second window to better handle high speeds
  examples/hiperfifo.c: improved
  pause: when changing pause state, update socket state
  multi: improved pending transfers handling => improved performance
  curl_version_info.3: fix ssl_version description
  add_handle/easy_perform: clear errorbuffer on start if set
  darwinssl: fix iOS build
  cmake: add support for brotli
  parsedate: support UT timezone
  vauth/ntlm.h: fix the #ifdef header guard
  lib/curl_path.h: added #ifdef header guard
  vauth/cleartext: fix integer overflow check
  CURLINFO_COOKIELIST.3: made the example not leak memory
  cookie.d: mention that "-" as filename means stdin
  CURLINFO_SSL_VERIFYRESULT.3: fixed the example
  http2: read pending frames (including GOAWAY) in connection-check
  timeval: remove compilation warning by casting
  cmake: avoid warn-as-error during config checks
  travis-ci: enable -Werror for CMake builds
  openldap: fix for NULL return from ldap_get_attribute_ber()
  threaded resolver: track resolver time and set suitable timeout values
  cmake: Add advapi32 as explicit link library for win32
  docs: fix CURLINFO_*_T examples use of CURL_FORMAT_CURL_OFF_T
  test1148: set a fixed locale for the test
  cookies: when reading from a file, only remove_expired once
  cookie: store cookies per top-level-domain-specific hash table
  openssl: fix build with LibreSSL 2.7
  tls: fix mbedTLS 2.7.0 build + handle sha256 failures
  openssl: RESTORED verify locations when verifypeer==0
  file: restore old behavior for file:////foo/bar URLs
  FTP: allow PASV on IPv6 connections when a proxy is being used
  build-openssl.bat: allow custom paths for VS and perl
  winbuild: make the clean target work without build-type
  build-openssl.bat: Refer to VS2017 as VC14.1 instead of VC15
  curl: retry on FTP 4xx, ignore other protocols
  configure: detect (and use) sa_family_t
  examples/sftpuploadresume: Fix Windows large file seek
  build: cleanup to fix clang warnings/errors
  winbuild: updated the documentation
  lib: silence null-dereference warnings
  travis: bump to clang 6 and gcc 7
  travis: build libpsl and make builds use it
  proxy: show getenv proxy use in verbose output
  duphandle: make sure CURLOPT_RESOLVE is duplicated
  all: Refactor malloc+memset to use calloc
  checksrc: Fix typo
  system.h: Add sparcv8plus to oracle/sunpro 32-bit detection
  vauth: Fix typo
  ssh: show libSSH2 error code when closing fails
  test1148: tolerate progress updates better
  urldata: make service names unconditional
  configure: keep LD_LIBRARY_PATH changes local
  ntlm_sspi: fix authentication using Credential Manager
  schannel: add client certificate authentication
  winbuild: Support custom devel paths for each dependency
  schannel: add support for CURLOPT_CAINFO
  http2: handle on_begin_headers() called more than once
  openssl: support OpenSSL 1.1.1 verbose-mode trace messages
  openssl: fix subjectAltName check on non-ASCII platforms
  http2: avoid strstr() on data not zero terminated
  http2: clear the "drain counter" when a stream is closed
  http2: handle GOAWAY properly
  tool_help: clarify --max-time unit of time is seconds
  curl.1: clarify that options and URLs can be mixed
  http2: convert an assert to run-time check
  curl_global_sslset: always provide available backends
  ftplistparser: keep state between invokes
  Curl_memchr: zero length input can't match
  examples/sftpuploadresume: typecast fseek argument to long
  examples/http2-upload: expand buffer to avoid silly warning
  ctype: restore character classification for non-ASCII platforms
  mime: avoid NULL pointer dereference risk
  cookies: ensure that we have cookies before writing jar
  os400.c: fix checksrc warnings
  configure: provide --with-wolfssl as an alias for --with-cyassl
  cyassl: adapt to libraries without TLS 1.0 support built-in
  http2: get rid of another strstr
  checksrc: force indentation of lines after an else
  cookies: remove unused macro
  CURLINFO_PROTOCOL.3: mention the existing defined names
  tests: provide 'manual' as a feature to optionally require
  travis: enable libssh2 on both macos and Linux
  CURLOPT_URL.3: added ENCODING section
  wolfssl: Fix non-blocking connect
  vtls: don't define MD5_DIGEST_LENGTH for wolfssl
  docs: remove extraneous commas in man pages
  URL: fix ASCII dependency in strcpy_url and strlen_url
  ssh-libssh.c: fix left shift compiler warning
  configure: only check for CA bundle for file-using SSL backends
  travis: add an mbedtls build
  http: don't set the "rewind" flag when not uploading anything
  configure: put CURLDEBUG and DEBUGBUILD in lib/curl_config.h
  transfer: don't unset writesockfd on setup of multiplexed conns
  vtls: use unified "supports" bitfield member in backends
  URLs: fix one more http url
  travis: add a build using WolfSSL
  openssl: change FILE ops to BIO ops
  travis: add build using NSS
  smb: reject negative file sizes
  cookies: accept parameter names as cookie name
  http2: getsock fix for uploads
  all over: fixed format specifiers
  http2: use the correct function pointer typedef

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

1 files changed, 7 insertions, 4 deletions

diff --git a/tests/data/Makefile.inc b/tests/data/Makefile.inc
index 97daf00c..12373ba6 100644
--- a/tests/data/Makefile.inc
+++ b/tests/data/Makefile.inc
@@ -127,9 +127,9 @@ test1120 test1121 test1122 test1123 test1124 test1125 test1126 test1127 \
 test1128 test1129 test1130 test1131 test1132 test1133 test1134 test1135 \
 test1136 test1137 test1138 test1139 test1140 test1141 test1142 test1143 \
 test1144 test1145 test1146 test1147 test1148 test1149 test1150 test1151 \
-test1152 test1153 test1154 \
+test1152 test1153 test1154 test1155 \
 \
-test1160 test1161 test1162 test1163 \
+test1160 test1161 test1162 test1163 test1164 \
 test1170 test1171 \
 test1200 test1201 test1202 test1203 test1204 test1205 test1206 test1207 \
 test1208 test1209 test1210 test1211 test1212 test1213 test1214 test1215 \
@@ -165,7 +165,7 @@ test1424 test1425 test1426 test1427 \
 test1428 test1429 test1430 test1431 test1432 test1433 test1434 test1435 \
 test1436 test1437 test1438 test1439 test1440 test1441 test1442 test1443 \
 test1444 test1445 test1446 test1447 test1448 test1449 test1450 test1451 \
-test1452 test1453 test1454 \
+test1452 test1453 test1454 test1455 test1456 \
 test1500 test1501 test1502 test1503 test1504 test1505 test1506 test1507 \
 test1508 test1509 test1510 test1511 test1512 test1513 test1514 test1515 \
 test1516 test1517 \
@@ -177,6 +177,7 @@ test1533 test1534 test1535 test1536 test1537 test1538 \
 test1540 \
 test1550 test1551 test1552 test1553 test1554 test1555 test1556 \
 test1600 test1601 test1602 test1603 test1604 test1605 test1606 test1607 \
+test1608 \
 \
 test1700 test1701 test1702 \
 \
@@ -194,4 +195,6 @@ test2048 test2049 test2050 test2051 test2052 test2053 test2054 test2055 \
 test2056 test2057 test2058 test2059 test2060 test2061 test2062 test2063 \
 test2064 test2065 test2066 test2067 test2068 test2069 \
 \
-test2070 test2071 test2072 test2073
+test2070 test2071 test2072 test2073 \
+\
+test3000 test3001