diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-01-21 17:46:34 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-01-21 17:46:34 +0100 |
| commit | 3770ec8978fceeff87ad4a9abcdd6fab19ce355a (patch) | |
| tree | 3a5ee307ed9facabb9484d4b27ab4de1d35e5ae8 /curl | |
| parent | 1a0d5a73948049ed7ae1001899efdf125922586f (diff) | |
More massaging to avoid odd layout-related warnings/errors from GCC
(...whatever it is that causes them to be raised at least in my build).
Change-Id: I52889de876e448ae8e90ec328e65cda2025968e2
Diffstat (limited to 'curl')
| -rw-r--r-- | curl/curl-7.26.0_win-proxy.patch | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/curl/curl-7.26.0_win-proxy.patch b/curl/curl-7.26.0_win-proxy.patch index cf6a2772e4c2..78cee0206685 100644 --- a/curl/curl-7.26.0_win-proxy.patch +++ b/curl/curl-7.26.0_win-proxy.patch @@ -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) +@@ -4111,6 +4115,22 @@ static bool check_noproxy(const char* name, const char* no_proxy) return FALSE; } @@ -31,9 +31,10 @@ +{ + int bufSize; + char* out = NULL; -+ if ( wStr != NULL ) ++ if( wStr != NULL ) + { -+ bufSize = WideCharToMultiByte( CP_ACP, 0, wStr, -1, NULL, 0, NULL, 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 ); + } @@ -52,14 +53,15 @@ #ifndef CURL_DISABLE_HTTP /* If proxy was not specified, we check for default proxy environment -@@ -4138,7 +4158,57 @@ static char *detect_proxy(struct connectdata *conn) +@@ -4138,7 +4158,58 @@ static char *detect_proxy(struct connectdata *conn) * For compatibility, the all-uppercase versions of these variables are * checked if the lowercase versions don't exist. */ - char *no_proxy=NULL; +#ifdef WIN32 + WINHTTP_CURRENT_USER_IE_PROXY_CONFIG *ieProxyConfig; -+ ieProxyConfig = (WINHTTP_CURRENT_USER_IE_PROXY_CONFIG*)malloc(sizeof(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; @@ -72,7 +74,7 @@ + /* Convert the ieNoProxy into a proper no_proxy value */ + no_proxy = strdup(ieNoProxy); + pos = strpbrk(no_proxy, "; "); -+ while (NULL != pos) { ++ while(NULL != pos) { + no_proxy[pos-no_proxy] = ','; + pos = strpbrk(no_proxy, "; "); + } |