winhttp(3/3): Check environment if the registry settings are present but bogus

[Juan Lang]

--Juan
-------------- next part --------------
From 267a51a7a2dd483e16b47fba49189fd7e55fdd53 Mon Sep 17 00:00:00 2001
From: Juan Lang <juan.lang at gmail.com>
Date: Tue, 21 Jul 2009 11:38:54 -0700
Subject: [PATCH 3/3] Check environment if the registry settings are present but bogus

---
 dlls/winhttp/session.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c
index 2ed53b0..683a6fb 100644
--- a/dlls/winhttp/session.c
+++ b/dlls/winhttp/session.c
@@ -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;
 
-- 
1.6.3.2