Back out trunk r1367

src/common/windows/http_upload.cc

Index: src/common/windows/http_upload.cc
===================================================================
--- src/common/windows/http_upload.cc	(revision 1368)
+++ src/common/windows/http_upload.cc	(working copy)
@@ -64,7 +64,8 @@
 // static
 bool HTTPUpload::SendRequest(const wstring &url,
                              const map<wstring, wstring> &parameters,
-                             const map<wstring, wstring> &files,
+                             const wstring &upload_file,
+                             const wstring &file_part_name,
                              int *timeout,
                              wstring *response_body,
                              int *response_code) {
@@ -142,7 +143,8 @@
                         HTTP_ADDREQ_FLAG_ADD);
 
   string request_body;
-  if (!GenerateRequestBody(parameters, files, boundary, &request_body)) {
+  if (!GenerateRequestBody(parameters, upload_file,
+                           file_part_name, boundary, &request_body)) {
     return false;
   }
 
@@ -266,9 +268,15 @@
 
 // static
 bool HTTPUpload::GenerateRequestBody(const map<wstring, wstring> &parameters,
-                                     const map<wstring, wstring> &files,
+                                     const wstring &upload_file,
+                                     const wstring &file_part_name,
                                      const wstring &boundary,
                                      string *request_body) {
+  vector<char> contents;
+  if (!GetFileContents(upload_file, &contents)) {
+    return false;
+  }
+
   string boundary_str = WideToUTF8(boundary);
   if (boundary_str.empty()) {
     return false;
@@ -285,36 +293,28 @@
                          WideToUTF8(pos->second) + "\r\n");
   }
 
-  for (map<wstring, wstring>::const_iterator pos = files.begin();
-       pos != files.end(); ++pos) {
-    vector<char> contents;
-    if (!GetFileContents(pos->second, &contents)) {
-      return false;
-    }
+  // Now append the upload file as a binary (octet-stream) part
+  string filename_utf8 = WideToUTF8(upload_file);
+  if (filename_utf8.empty()) {
+    return false;
+  }
 
-    // Now append the upload files as a binary (octet-stream) part
-    string filename_utf8 = WideToUTF8(pos->second);
-    if (filename_utf8.empty()) {
-      return false;
-    }
+  string file_part_name_utf8 = WideToUTF8(file_part_name);
+  if (file_part_name_utf8.empty()) {
+    return false;
+  }
 
-    string file_part_name_utf8 = WideToUTF8(pos->first);
-    if (file_part_name_utf8.empty()) {
-      return false;
-    }
+  request_body->append("--" + boundary_str + "\r\n");
+  request_body->append("Content-Disposition: form-data; "
+                       "name=\"" + file_part_name_utf8 + "\"; "
+                       "filename=\"" + filename_utf8 + "\"\r\n");
+  request_body->append("Content-Type: application/octet-stream\r\n");
+  request_body->append("\r\n");
 
-    request_body->append("--" + boundary_str + "\r\n");
-    request_body->append("Content-Disposition: form-data; "
-      "name=\"" + file_part_name_utf8 + "\"; "
-      "filename=\"" + filename_utf8 + "\"\r\n");
-    request_body->append("Content-Type: application/octet-stream\r\n");
-    request_body->append("\r\n");
-
-    if (!contents.empty()) {
+  if (!contents.empty()) {
       request_body->append(&(contents[0]), contents.size());
-    }
-    request_body->append("\r\n");
   }
+  request_body->append("\r\n");
   request_body->append("--" + boundary_str + "--\r\n");
   return true;
 }