Updated Branches: refs/heads/master ac20a10e9 -> 2b4ab67a9
Ignore multipart epilogue COUCHDB-1632 Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/2b4ab67a Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/2b4ab67a Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/2b4ab67a Branch: refs/heads/master Commit: 2b4ab67a951592c31cece2bb5dc0ea84d3099090 Parents: ac20a10 Author: Robert Newson <[email protected]> Authored: Wed Dec 19 10:18:36 2012 +0000 Committer: Robert Newson <[email protected]> Committed: Wed Dec 19 10:18:36 2012 +0000 ---------------------------------------------------------------------- share/www/script/test/attachments_multipart.js | 2 +- src/couchdb/couch_doc.erl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/2b4ab67a/share/www/script/test/attachments_multipart.js ---------------------------------------------------------------------- diff --git a/share/www/script/test/attachments_multipart.js b/share/www/script/test/attachments_multipart.js index 9b9ddbd..37dd461 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); http://git-wip-us.apache.org/repos/asf/couchdb/blob/2b4ab67a/src/couchdb/couch_doc.erl ---------------------------------------------------------------------- diff --git a/src/couchdb/couch_doc.erl b/src/couchdb/couch_doc.erl index 349df4a..1742cff 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),
