From 7c6adea5637826a80a5745fdd9dd5310da5a8ad8 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Thu, 3 Sep 2009 04:20:09 +0000
Subject: [PATCH] - client: fix crashing bug in proxy autodetect

svn path=/trunk/boinc/; revision=18997
---
 checkin_notes         | 6 ++++++
 client/sysmon_win.cpp | 7 +------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 07808ab602..a3beac1303 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -7473,3 +7473,9 @@ Rom    2 Sept 2009
         boinc_gl.h
     win_build/
         *.vcproj
+
+David  2 Sept 2009
+    - client: fix crashing bug in proxy autodetect
+
+    client/
+        sysmon_win.cpp
diff --git a/client/sysmon_win.cpp b/client/sysmon_win.cpp
index ba7fc452d3..16c41ecfe7 100644
--- a/client/sysmon_win.cpp
+++ b/client/sysmon_win.cpp
@@ -128,7 +128,6 @@ static void windows_detect_autoproxy_settings() {
     char              proxy_server[256];
     int                       proxy_port = 0;
     char               proxy_file[256];
-    std::wstring              user_agent_string;
     std::wstring              network_test_url;
     size_t                    pos;
 
@@ -142,11 +141,10 @@ static void windows_detect_autoproxy_settings() {
         WINHTTP_AUTO_DETECT_TYPE_DHCP | WINHTTP_AUTO_DETECT_TYPE_DNS_A;
     autoproxy_options.fAutoLogonIfChallenged = TRUE;
 
-    user_agent_string = A2W(std::string(get_user_agent_string())).c_str();
     network_test_url = A2W(config.network_test_url).c_str();
 
     hWinHttp = pWinHttpOpen(
-        user_agent_string.c_str(),
+        L"BOINC client",
         WINHTTP_ACCESS_TYPE_NO_PROXY,
         WINHTTP_NO_PROXY_NAME,
         WINHTTP_NO_PROXY_BYPASS,
@@ -348,9 +346,6 @@ static DWORD WINAPI WindowsMonitorSystemThread( LPVOID  ) {
         log_message_error("Failed to create the WindowsMonitorSystem timer.");
     }
 
-    // Check for a proxy at startup
-    gstate.proxy_info.need_autodetect_proxy_settings = true;
-
     while (GetMessage(&msg, NULL, 0, 0)) {
         TranslateMessage(&msg);
         DispatchMessage(&msg);