diff options
Diffstat (limited to 'external/curl/curl-7.26.0_win-proxy.patch')
| -rw-r--r-- | external/curl/curl-7.26.0_win-proxy.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/external/curl/curl-7.26.0_win-proxy.patch b/external/curl/curl-7.26.0_win-proxy.patch index 4c5327f64529..580479ae4aa2 100644 --- a/external/curl/curl-7.26.0_win-proxy.patch +++ b/external/curl/curl-7.26.0_win-proxy.patch @@ -1,5 +1,5 @@ ---- curl-7.26.0/lib/Makefile.vc10 -+++ misc/build/curl-7.26.0/lib/Makefile.vc10 +--- curl-7.26.0/lib/Makefile.vc12 ++++ misc/build/curl-7.26.0/lib/Makefile.vc12 @@ -118,7 +118,7 @@ WINSSLLIBS = crypt32.lib ZLIBLIBSDLL = zdll.lib @@ -13,7 +13,7 @@ +++ misc/build/curl-7.26.0/lib/url.c @@ -78,6 +78,10 @@ bool curl_win32_idn_to_ascii(const char *in, char **out); - #endif /* USE_LIBIDN */ + #endif /* USE_LIBIDN2 */ +#ifdef WIN32 +#include <WinHttp.h> @@ -52,7 +52,7 @@ #ifndef CURL_DISABLE_HTTP /* If proxy was not specified, we check for default proxy environment -@@ -4613,7 +4633,63 @@ +@@ -4613,7 +4633,64 @@ * For compatibility, the all-uppercase versions of these variables are * checked if the lowercase versions don't exist. */ @@ -83,9 +83,10 @@ + if(!check_noproxy(conn->host.name, no_proxy)) { + /* Look for the http proxy setting */ + char* tok; ++ char *saveptr; + + if(NULL != ieProxy) { -+ tok = strtok(ieProxy, ";"); ++ tok = strtok_s(ieProxy, ";", &saveptr); + if(strchr(tok, '=') == NULL) { + proxy = strdup(ieProxy); + } @@ -95,7 +96,7 @@ + /* We found HTTP proxy value, then use it */ + proxy = strdup(tok + 5); + } -+ tok = strtok(NULL, ";"); ++ tok = strtok_s(NULL, ";", &saveptr); + } + while(NULL != tok); + } |