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 | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/external/curl/curl-7.26.0_win-proxy.patch b/external/curl/curl-7.26.0_win-proxy.patch index 99402a437e5a..4c5327f64529 100644 --- a/external/curl/curl-7.26.0_win-proxy.patch +++ b/external/curl/curl-7.26.0_win-proxy.patch @@ -1,18 +1,18 @@ --- curl-7.26.0/lib/Makefile.vc10 +++ misc/build/curl-7.26.0/lib/Makefile.vc10 -@@ -116,7 +116,7 @@ LFLAGS = /nologo /machine:$(MACHINE) - SSLLIBS = libeay32.lib ssleay32.lib +@@ -118,7 +118,7 @@ + WINSSLLIBS = crypt32.lib ZLIBLIBSDLL = zdll.lib ZLIBLIBS = zlib.lib -WINLIBS = ws2_32.lib wldap32.lib advapi32.lib -+WINLIBS = ws2_32.lib wldap32.lib advapi32.lib winhttp.lib ++WINLIBS = ws2_32.lib wldap32.lib advapi32.lib winhttp.lib crypt32.lib CFLAGS = $(CFLAGS) $(EXCFLAGS) CFGSET = FALSE --- curl-7.26.0/lib/url.c +++ misc/build/curl-7.26.0/lib/url.c -@@ -80,6 +80,10 @@ void idn_free (void *ptr); - int curl_win32_idn_to_ascii(const char *in, char **out); +@@ -78,6 +78,10 @@ + bool curl_win32_idn_to_ascii(const char *in, char **out); #endif /* USE_LIBIDN */ +#ifdef WIN32 @@ -22,7 +22,7 @@ #include "urldata.h" #include "netrc.h" -@@ -4111,6 +4115,21 @@ static bool check_noproxy(const char* name, const char* no_proxy) +@@ -4586,6 +4590,21 @@ return FALSE; } @@ -33,9 +33,9 @@ + char* out = NULL; + if(wStr != NULL) { + bufSize = WideCharToMultiByte( -+ CP_ACP, 0, wStr, -1, NULL, 0, NULL, NULL ); -+ out = ( char* )malloc( bufSize * sizeof(char)); -+ WideCharToMultiByte( CP_ACP, 0, wStr, -1, out, bufSize, NULL, NULL ); ++ CP_ACP, 0, wStr, -1, NULL, 0, NULL, NULL); ++ out = (char*)malloc(bufSize * sizeof(char)); ++ WideCharToMultiByte(CP_ACP, 0, wStr, -1, out, bufSize, NULL, NULL); + } + return out; +} @@ -44,7 +44,7 @@ /**************************************************************** * Detect what (if any) proxy to use. Remember that this selects a host * name and is not limited to HTTP proxies only. -@@ -4119,6 +4138,7 @@ static bool check_noproxy(const char* name, const char* no_proxy) +@@ -4594,6 +4613,7 @@ static char *detect_proxy(struct connectdata *conn) { char *proxy = NULL; @@ -52,7 +52,7 @@ #ifndef CURL_DISABLE_HTTP /* If proxy was not specified, we check for default proxy environment -@@ -4138,7 +4158,63 @@ static char *detect_proxy(struct connectdata *conn) +@@ -4613,7 +4633,63 @@ * For compatibility, the all-uppercase versions of these variables are * checked if the lowercase versions don't exist. */ @@ -93,7 +93,7 @@ + do { + if(strncmp(tok, "http=", 5) == 0) { + /* We found HTTP proxy value, then use it */ -+ proxy = strdup( tok + 5 ); ++ proxy = strdup(tok + 5); + } + tok = strtok(NULL, ";"); + } @@ -109,15 +109,15 @@ + /* TODO Handle the Proxy config Auto Detection case */ + } + -+ GlobalFree( ieProxyConfig->lpszAutoConfigUrl ); -+ GlobalFree( ieProxyConfig->lpszProxy ); -+ GlobalFree( ieProxyConfig->lpszProxyBypass ); ++ GlobalFree(ieProxyConfig->lpszAutoConfigUrl); ++ GlobalFree(ieProxyConfig->lpszProxy); ++ GlobalFree(ieProxyConfig->lpszProxyBypass); + } +#else /* !WIN32 */ char proxy_env[128]; no_proxy=curl_getenv("no_proxy"); -@@ -4189,6 +4265,7 @@ static char *detect_proxy(struct connectdata *conn) +@@ -4663,6 +4739,7 @@ } } /* if(!check_noproxy(conn->host.name, no_proxy)) - it wasn't specified non-proxy */ |