Merge 74427 - 2010-12-21 Jian Li <jianli@chromium.org>...

WebCore/platform/network/FormData.cpp

 /*
  * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 207 matching lines @@
                     }
                 } else {
                     // For non-file blob, use the identifier part of the URL as the name.
                     name = "Blob" + BlobURL::getIdentifier(value.blob()->url());
                     name = name.replace("-", ""); // For safety, remove '-' from the filename since some servers may not like it.
                 }
 
                 // We have to include the filename=".." part in the header, even if the filename is empty
                 FormDataBuilder::addFilenameToMultiPartHeader(header, encoding, name);
 
-                // Add the content type if it is available.
-                if (!value.blob()->type().isEmpty())
-                    FormDataBuilder::addContentTypeToMultiPartHeader(header, value.blob()->type().latin1());
+                // Add the content type if available, or "application/octet-stream" otherwise (RFC 1867).
+                String contentType;
+                if (value.blob()->type().isEmpty())
+                    contentType = "application/octet-stream";
+                else
+                    contentType = value.blob()->type();
+                FormDataBuilder::addContentTypeToMultiPartHeader(header, contentType.latin1());
             }
 
             FormDataBuilder::finishMultiPartHeader(header);
 
             // Append body
             appendData(header.data(), header.size());
             if (value.blob()) {
                 if (value.blob()->isFile()) {
                     // Do not add the file if the path is empty.
                     if (!static_cast<File*>(value.blob())->path().isEmpty())
@@ skipping 76 matching lines @@
             String directory = directoryName(e.m_generatedFilename);
             deleteFile(e.m_generatedFilename);
             deleteEmptyDirectory(directory);
             e.m_generatedFilename = String();
         }
     }
     m_hasGeneratedFiles = false;
 }
 
 } // namespace WebCore