From 18aa349c005696dc9de51edc1f2c7cdc12b1d8b8 Mon Sep 17 00:00:00 2001
From: Rom Walton <rwalton@ssl.berkeley.edu>
Date: Wed, 14 Sep 2005 20:22:10 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=8015
---
 checkin_notes      | 4 ++++
 client/http_curl.C | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/checkin_notes b/checkin_notes
index 5bc7b695a4..429cc65c67 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -11776,7 +11776,11 @@ Charlie 13 Sept 2005
 
 Rom    14 Sept 2005
     - Update to account management.
+    - Override system defaults and specify timeouts for network transfers,
+        network connections, and network speed.  
     
+    client/
+        http_curl.C
     clientgui/
         WizAttachAccountManager.cpp, .h
         WizAttachProject.cpp
diff --git a/client/http_curl.C b/client/http_curl.C
index 3df95f7ba9..28cd45a319 100644
--- a/client/http_curl.C
+++ b/client/http_curl.C
@@ -318,6 +318,12 @@ The checking this option controls is of the identity that the server claims. The
     curlErr = curl_easy_setopt(curlEasy, CURLOPT_NOSIGNAL, 1L);
     // bypass progress meter
     curlErr = curl_easy_setopt(curlEasy, CURLOPT_NOPROGRESS, 1L);
+
+    // setup timeouts
+    curlErr = curl_easy_setopt(curlEasy, CURLOPT_TIMEOUT, 0L);
+    curlErr = curl_easy_setopt(curlEasy, CURLOPT_LOW_SPEED_LIMIT, 50L);
+    curlErr = curl_easy_setopt(curlEasy, CURLOPT_LOW_SPEED_TIME, 30L);
+    curlErr = curl_easy_setopt(curlEasy, CURLOPT_CONNECTTIMEOUT, 60L);
     
     // force curl to use HTTP/1.0 (which the old BOINC http libraries did)
     //curlErr = curl_easy_setopt(curlEasy, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);