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

winhttp: Check environment if the registry settings are present but bogus.

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

5
dlls/winhttp/session.c
View file

@ -851,7 +851,7 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info )
{
LONG l;
HKEY key;
BOOL direct = TRUE;
BOOL got_from_reg = FALSE, direct = TRUE;
char *envproxy;
TRACE("%p\n", info);
@ -913,6 +913,7 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info )
}
if (sane)
{
got_from_reg = TRUE;
direct = FALSE;
info->dwAccessType =
WINHTTP_ACCESS_TYPE_NAMED_PROXY;
@ -927,7 +928,7 @@ BOOL WINAPI WinHttpGetDefaultProxyConfiguration( WINHTTP_PROXY_INFO *info )
}
RegCloseKey( key );
}
else if ((envproxy = getenv( "http_proxy" )))
if (!got_from_reg && (envproxy = getenv( "http_proxy" )))
{
char *colon, *http_proxy;