From 47b42e2b3fa15abf910fab7b86b1452f5a62b00c Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Mon, 1 Aug 2011 23:17:12 +0000
Subject: [PATCH] - client: undo the above.  doesn't work

svn path=/trunk/boinc/; revision=23914
---
 checkin_notes        |  6 ++++++
 client/file_xfer.cpp | 12 ++++--------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/checkin_notes b/checkin_notes
index 4fb414e946..e834c885c9 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -4507,3 +4507,9 @@ David  1 Aug 2011
 
     client/
         file_xfer.cpp
+
+David  1 Aug 2011
+    - client: undo the above.  doesn't work
+
+    client/
+        file_xfer.cpp
diff --git a/client/file_xfer.cpp b/client/file_xfer.cpp
index 9b49fd600c..1d8160d888 100644
--- a/client/file_xfer.cpp
+++ b/client/file_xfer.cpp
@@ -118,12 +118,9 @@ int FILE_XFER::init_upload(FILE_INFO& file_info) {
             "    <core_client_release>%d</core_client_release>\n"
             "<file_upload>\n"
             "<file_info>\n"
-            "    <name>%s</name>\n"
-            "    <url>%s</url>\n"
-            "    <max_nbytes>%.0f</max_nbytes>\n"
-            "    <generated_locally/>\n"
-            "    <upload_when_present/>\n"
-            "    <nbytes>%.0f</nbytes>\n"
+            "<name>%s</name>\n"
+            "<nbytes>%.0f</nbytes>\n"
+            "<max_nbytes>%.0f</max_nbytes>\n"
             "<md5_cksum>%s</md5_cksum>\n"
             "<xml_signature>\n"
             "%s"
@@ -133,9 +130,8 @@ int FILE_XFER::init_upload(FILE_INFO& file_info) {
             "<data>\n",
             BOINC_MAJOR_VERSION, BOINC_MINOR_VERSION, BOINC_RELEASE,
             file_info.name,
-            file_info.upload_urls.urls[0],
-            file_info.max_nbytes,
             file_info.nbytes,
+            file_info.max_nbytes,
             file_info.md5_cksum,
             file_info.xml_signature,
             file_info.upload_offset