diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-05-16 11:16:07 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-05-17 00:23:48 +0200 |
| commit | 47dc3115f12ff16dc326b6edd12c46e6a6ef1843 (patch) | |
| tree | cbd19f674af1e53260c45a5cbc5def7bf39f5ecb /external/curl | |
| parent | 59ef304cff3b363fdcbf8bc56762c9349de78d24 (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
Change-Id: Ic3229577083286501162aa5979a94ce934739557
Reviewed-on: https://gerrit.libreoffice.org/54418
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'external/curl')
| -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; |