tizen beta release

[framework/web/webkit-efl.git] / Source / WebCore / platform / network / FormDataBuilder.cpp

diff --git a/Source/WebCore/platform/network/FormDataBuilder.cpp b/Source/WebCore/platform/network/FormDataBuilder.cpp
index 3174614..a8b3904 100755 (executable)
--- a/Source/WebCore/platform/network/FormDataBuilder.cpp
+++ b/Source/WebCore/platform/network/FormDataBuilder.cpp
@@ -181,14 +181,21 @@ void FormDataBuilder::finishMultiPartHeader(Vector<char>& buffer)
     append(buffer, "\r\n\r\n");
 }
 
-void FormDataBuilder::addKeyValuePairAsFormData(Vector<char>& buffer, const CString& key, const CString& value)
+void FormDataBuilder::addKeyValuePairAsFormData(Vector<char>& buffer, const CString& key, const CString& value, FormData::EncodingType encodingType)
 {
-    if (!buffer.isEmpty())
-        append(buffer, '&');
-
-    encodeStringAsFormData(buffer, key);
-    append(buffer, '=');
-    encodeStringAsFormData(buffer, value);
+    if (encodingType == FormData::TextPlain) {
+        if (!buffer.isEmpty())
+            append(buffer, "\r\n");
+        append(buffer, key);
+        append(buffer, '=');
+        append(buffer, value);
+    } else {
+        if (!buffer.isEmpty())
+            append(buffer, '&');
+        encodeStringAsFormData(buffer, key);
+        append(buffer, '=');
+        encodeStringAsFormData(buffer, value);
+    }
 }
 
 void FormDataBuilder::encodeStringAsFormData(Vector<char>& buffer, const CString& string)