diff options
| author | Robert Newson <rnewson@apache.org> | 2012-12-19 10:18:36 +0000 |
|---|---|---|
| committer | Robert Newson <rnewson@apache.org> | 2012-12-19 10:18:36 +0000 |
| commit | 2b4ab67a951592c31cece2bb5dc0ea84d3099090 (patch) | |
| tree | 998c46ca1f5865853d39ebf05bcd19a4c2a264ba | |
| parent | ac20a10e9c8ddab103ebe44213c19773fa0183bc (diff) | |
| download | couchdb-2b4ab67a951592c31cece2bb5dc0ea84d3099090.tar.gz | |
Ignore multipart epilogue
COUCHDB-1632
| -rw-r--r-- | share/www/script/test/attachments_multipart.js | 2 | ||||
| -rw-r--r-- | src/couchdb/couch_doc.erl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/share/www/script/test/attachments_multipart.js b/share/www/script/test/attachments_multipart.js index 9b9ddbd39..37dd461cf 100644 --- a/share/www/script/test/attachments_multipart.js +++ b/share/www/script/test/attachments_multipart.js @@ -53,7 +53,7 @@ couchTests.attachments_multipart= function(debug) { "\r\n--abc123\r\n" + "\r\n" + "this is 19 chars lo" + - "\r\n--abc123--" + "\r\n--abc123--epilogue" }); var result = JSON.parse(xhr.responseText); diff --git a/src/couchdb/couch_doc.erl b/src/couchdb/couch_doc.erl index 349df4a1f..1742cffe1 100644 --- a/src/couchdb/couch_doc.erl +++ b/src/couchdb/couch_doc.erl @@ -511,7 +511,7 @@ atts_to_mp([Att | RestAtts], Boundary, WriteFun, doc_from_multi_part_stream(ContentType, DataFun) -> Parent = self(), Parser = spawn_link(fun() -> - {<<"--">>, _, _} = couch_httpd:parse_multipart_request( + {<<"--",_/binary>>, _, _} = couch_httpd:parse_multipart_request( ContentType, DataFun, fun(Next) -> mp_parse_doc(Next, []) end), unlink(Parent), |