diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-05-16 11:16:07 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-05-23 13:56:24 +0200 |
| commit | 3c5dba79e9198ee12696b718025621dd81909358 (patch) | |
| tree | 9705cddc6fcd3e0c590d7846db0d74315dcbd6b0 /external | |
| parent | a16a53deab649b2165d998ef43567346f83cb4bf (diff) | |
curl: upgrade to release 7.60.0
This fixes the following CVEs:
* FTP: shutdown response buffer overflow CVE-2018-1000300
* RTSP: bad headers buffer over-read CVE-2018-1000301
Reviewed-on: https://gerrit.libreoffice.org/54418
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Conflicts:
download.lst
Change-Id: Ic3229577083286501162aa5979a94ce934739557
Reviewed-on: https://gerrit.libreoffice.org/54464
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 8ddb3ca84b66050c394140fa4f7290e3607d84f5)
Diffstat (limited to 'external')
| -rw-r--r-- | external/curl/curl-7.26.0_win-proxy.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/external/curl/curl-7.26.0_win-proxy.patch b/external/curl/curl-7.26.0_win-proxy.patch index e51c5d017818..5361433a917b 100644 --- a/external/curl/curl-7.26.0_win-proxy.patch +++ b/external/curl/curl-7.26.0_win-proxy.patch @@ -4,8 +4,8 @@ CFLAGS_LIBCURL_STATIC = /DCURL_STATICLIB --WIN_LIBS = ws2_32.lib wldap32.lib advapi32.lib -+WIN_LIBS = ws2_32.lib wldap32.lib advapi32.lib winhttp.lib +-WIN_LIBS = ws2_32.lib wldap32.lib advapi32.lib crypt32.lib ++WIN_LIBS = ws2_32.lib wldap32.lib advapi32.lib crypt32.lib winhttp.lib BASE_NAME = libcurl BASE_NAME_DEBUG = $(BASE_NAME)_debug @@ -112,9 +112,9 @@ const char *protop = conn->handler->scheme; char *envp = proxy_env; @@ -4663,6 +4739,7 @@ - if(!proxy) - proxy = curl_getenv("ALL_PROXY"); } + if(proxy) + infof(conn->data, "Uses proxy env variable %s == '%s'\n", envp, proxy); +#endif /* WIN32 */ return proxy; |