diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-01-23 15:32:36 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-01-30 13:01:22 +0000 |
| commit | 39dc5c9a4a8fe47ed8698601065306ccea04cb4b (patch) | |
| tree | c8b0cf64a7fef05b03849b876d3b65854aa14219 /external | |
| parent | d0f40119e25df0aff6974c76cf3dc64a9629492e (diff) | |
curl: upgrade to version 7.52.1
- fixes some four CVEs
- and a ton of other fixes & improvements
Reviewed-on: https://gerrit.libreoffice.org/33471
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commits 6d9e4803806d1474039e25092a3c1ee268b0b9f8
and 2be42d9480fc831144e4d5b216b0a01ffbdb5c8f)
Change-Id: I2312f30f72c914c7e930c59ddbe44fb8a282c0a5
Reviewed-on: https://gerrit.libreoffice.org/33473
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/curl/curl-7.26.0_win-proxy.patch | 12 | ||||
| -rw-r--r-- | external/curl/curl-msvc.patch.1 | 8 |
2 files changed, 6 insertions, 14 deletions
diff --git a/external/curl/curl-7.26.0_win-proxy.patch b/external/curl/curl-7.26.0_win-proxy.patch index cf41850fc865..1c478868d7d2 100644 --- a/external/curl/curl-7.26.0_win-proxy.patch +++ b/external/curl/curl-7.26.0_win-proxy.patch @@ -27,14 +27,14 @@ } +#ifdef _WIN32 -+static char* wstrToCstr(LPWSTR wStr) ++static char *wstrToCstr(LPWSTR wStr) +{ + int bufSize; -+ char* out = NULL; ++ char *out = NULL; + if(wStr != NULL) { + bufSize = WideCharToMultiByte( + CP_ACP, 0, wStr, -1, NULL, 0, NULL, NULL); -+ out = (char*)malloc(bufSize * sizeof(char)); ++ out = (char *)malloc(bufSize * sizeof(char)); + WideCharToMultiByte(CP_ACP, 0, wStr, -1, out, bufSize, NULL, NULL); + } + return out; @@ -59,13 +59,13 @@ - char *no_proxy=NULL; +#ifdef _WIN32 + WINHTTP_CURRENT_USER_IE_PROXY_CONFIG *ieProxyConfig; -+ ieProxyConfig = (WINHTTP_CURRENT_USER_IE_PROXY_CONFIG*) ++ ieProxyConfig = (WINHTTP_CURRENT_USER_IE_PROXY_CONFIG *) + malloc(sizeof(WINHTTP_CURRENT_USER_IE_PROXY_CONFIG)); + if(WinHttpGetIEProxyConfigForCurrentUser(ieProxyConfig)) { + if(!ieProxyConfig->fAutoDetect) { + char *ieProxy; + char *ieNoProxy; -+ char* pos; ++ char *pos; + + ieProxy = wstrToCstr(ieProxyConfig->lpszProxy); + ieNoProxy = wstrToCstr(ieProxyConfig->lpszProxyBypass); @@ -82,7 +82,7 @@ + + if(!check_noproxy(conn->host.name, no_proxy)) { + /* Look for the http proxy setting */ -+ char* tok; ++ char *tok; + char *saveptr; + + if(NULL != ieProxy) { diff --git a/external/curl/curl-msvc.patch.1 b/external/curl/curl-msvc.patch.1 index 88ced0a75493..57a292bb69a3 100644 --- a/external/curl/curl-msvc.patch.1 +++ b/external/curl/curl-msvc.patch.1 @@ -11,14 +11,6 @@ MSVC: using SOLARINC and EXCFLAGS CFGSET = FALSE -@@ -632,7 +632,6 @@ - $(DIROBJ)\vtls.obj \ - $(DIROBJ)\openssl.obj \ - $(DIROBJ)\strdup.obj \ -- $(DIROBJ)\strequal.obj \ - $(DIROBJ)\strerror.obj \ - $(DIROBJ)\strtok.obj \ - $(DIROBJ)\strtoofft.obj \ @@ -620,11 +620,11 @@ debug-dll-ssl-dll\libcurl.res \ debug-dll-zlib-dll\libcurl.res \ |