From 66a975e4499a4c9a846e69a2265344ecab216f25 Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Fri, 23 Feb 2007 18:30:56 +0000
Subject: [PATCH] *** empty log message ***

svn path=/trunk/boinc/; revision=12145
---
 checkin_notes                   | 12 ++++++++++++
 client/http_curl.C              |  7 ++++++-
 clientgui/ViewTransfers.cpp     |  5 -----
 clientgui/ViewTransfersGrid.cpp |  5 -----
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 5d84899f1e..eeb3f3a1bf 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -1955,3 +1955,15 @@ David  23 Feb 2007
         sim.C,h
     sched/
         server_types.C
+
+David  23 Feb 2007
+	- core client: disable connection caching in Curl.
+		This may reduce cases where file uploads hang
+		because a server process holds file lock.
+	- manager: fix status text for file transfers
+
+	client/
+		http_curl.C
+	clientgui/
+		ViewTransfers.cpp
+		ViewTransfersGrid.cpp
diff --git a/client/http_curl.C b/client/http_curl.C
index f71f905700..2f58860c88 100644
--- a/client/http_curl.C
+++ b/client/http_curl.C
@@ -339,6 +339,11 @@ The checking this option controls is of the identity that the server claims. The
     curlErr = curl_easy_setopt(curlEasy, CURLOPT_AUTOREFERER, 1L);
     curlErr = curl_easy_setopt(curlEasy, CURLOPT_FOLLOWLOCATION, 1L);
 
+    // disable connection caching; if a file upload handler connection
+    // is interrupted, the file will stay locked indefinitely
+    //
+    curlErr = curl_easy_setopt(curlEasy, CURLOPT_FORBID_REUSE, 1L);
+
     // if we tell Curl to accept any encoding (e.g. deflate)
     // it seems to accept them all, which screws up projects that
     // use gzip at the application level.
@@ -461,7 +466,7 @@ The checking this option controls is of the identity that the server claims. The
     }
 
     // turn on debug info if tracing enabled
-    if (log_flags.http_xfer_debug) {
+    if (log_flags.http_debug) {
         static int trace_count = 0;
         curlErr = curl_easy_setopt(curlEasy, CURLOPT_DEBUGFUNCTION, libcurl_debugfunction);
         curlErr = curl_easy_setopt(curlEasy, CURLOPT_DEBUGDATA, this );
diff --git a/clientgui/ViewTransfers.cpp b/clientgui/ViewTransfers.cpp
index 37d8b88c64..2fd6afd83f 100644
--- a/clientgui/ViewTransfers.cpp
+++ b/clientgui/ViewTransfers.cpp
@@ -537,11 +537,6 @@ wxInt32 CViewTransfers::FormatStatus(wxInt32 item, wxString& strBuffer) const {
         }
     }
 
-    if (status.task_mode == RUN_MODE_NEVER) {
-        strBuffer = wxT(" (") + strBuffer + wxT(") ");
-        strBuffer = _("Suspended") + strBuffer;
-    }
-
     return 0;
 }
 
diff --git a/clientgui/ViewTransfersGrid.cpp b/clientgui/ViewTransfersGrid.cpp
index e393e5488c..519fd21121 100644
--- a/clientgui/ViewTransfersGrid.cpp
+++ b/clientgui/ViewTransfersGrid.cpp
@@ -423,11 +423,6 @@ wxInt32 CViewTransfersGrid::FormatStatus(wxInt32 item, wxString& strBuffer) cons
         }
     }
 
-    if (status.task_mode == RUN_MODE_NEVER) {
-        strBuffer = wxT(" (") + strBuffer + wxT(") ");
-        strBuffer = _("Suspended") + strBuffer;
-    }
-
 	strBuffer = wxString(" ", wxConvUTF8) + strBuffer;
 
     return 0;