system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-14 17:16:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

winhttp: Strip scheme from http_proxy environment variable.

Browse source
This commit is contained in:
Juan Lang 2009-07-21 11:36:52 -07:00 committed by Alexandre Julliard
parent 2b460a6c5a
commit 68fdc5cb2e
1 changed files with 36 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
dlls/winhttp/session.c
View file

@ -929,19 +929,44 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info )
}
else if ((envproxy = getenv( "http_proxy" )))
{
WCHAR *envproxyW;
int len;
char *colon, *http_proxy;
len = MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, NULL, 0 );
if ((envproxyW = GlobalAlloc( 0, len * sizeof(WCHAR))))
if ((colon = strchr( envproxy, ':' )))
{
MultiByteToWideChar( CP_UNIXCP, 0, envproxy, -1, envproxyW, len );
direct = FALSE;
info->dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY;
info->lpszProxy = envproxyW;
info->lpszProxyBypass = NULL;
TRACE("http proxy (from environment) = %s\n",
debugstr_w(info->lpszProxy));
if (*(colon + 1) == '/' && *(colon + 2) == '/')
{
static const char http[] = "http://";
/* It's a scheme, check that it's http */
if (!strncmp( envproxy, http, strlen( http ) ))
http_proxy = envproxy + strlen( http );
else
{
WARN("unsupported scheme in $http_proxy: %s\n", envproxy);
http_proxy = NULL;
}
}
else
http_proxy = envproxy;
}
else
http_proxy = envproxy;
if (http_proxy)
{
WCHAR *http_proxyW;
int len;
len = MultiByteToWideChar( CP_UNIXCP, 0, http_proxy, -1, NULL, 0 );
if ((http_proxyW = GlobalAlloc( 0, len * sizeof(WCHAR))))
{
MultiByteToWideChar( CP_UNIXCP, 0, http_proxy, -1, http_proxyW, len );
direct = FALSE;
info->dwAccessType = WINHTTP_ACCESS_TYPE_NAMED_PROXY;
info->lpszProxy = http_proxyW;
info->lpszProxyBypass = NULL;
TRACE("http proxy (from environment) = %s\n",
debugstr_w(info->lpszProxy));
}
}
}
if (direct)