You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by kx...@apache.org on 2015/10/15 18:35:37 UTC
[03/25] couch commit: updated refs/heads/master to 92598cd
Rename abort_multi_part_stream into abort_multipart_stream for consistency
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/5618ad91
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/5618ad91
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/5618ad91
Branch: refs/heads/master
Commit: 5618ad91dbe2c1ae0ebedfc92862b41fedf90392
Parents: 88d814a
Author: ILYA Khlopotov <ii...@ca.ibm.com>
Authored: Fri Nov 28 11:49:39 2014 -0800
Committer: ILYA Khlopotov <ii...@ca.ibm.com>
Committed: Wed May 6 06:55:58 2015 -0700
----------------------------------------------------------------------
src/couch_httpd_db.erl | 2 +-
src/couch_httpd_multipart.erl | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/5618ad91/src/couch_httpd_db.erl
----------------------------------------------------------------------
diff --git a/src/couch_httpd_db.erl b/src/couch_httpd_db.erl
index e8c2629..6069c69 100644
--- a/src/couch_httpd_db.erl
+++ b/src/couch_httpd_db.erl
@@ -587,7 +587,7 @@ db_doc_req(#httpd{method='PUT'}=Req, Db, DocId) ->
Result
catch throw:Err ->
% Document rejected by a validate_doc_update function.
- couch_httpd_multipart:abort_multi_part_stream(Parser),
+ couch_httpd_multipart:abort_multipart_stream(Parser),
throw(Err)
end;
_Else ->
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/5618ad91/src/couch_httpd_multipart.erl
----------------------------------------------------------------------
diff --git a/src/couch_httpd_multipart.erl b/src/couch_httpd_multipart.erl
index 037bd9f..6ca5692 100644
--- a/src/couch_httpd_multipart.erl
+++ b/src/couch_httpd_multipart.erl
@@ -2,7 +2,7 @@
-export([encode_multipart_stream/5]).
-export([decode_multipart_stream/3]).
--export([abort_multi_part_stream/1]).
+-export([abort_multipart_stream/1]).
-include_lib("couch/include/couch_db.hrl").
@@ -191,7 +191,7 @@ atts_to_mp([{Att, Name, LengthBin, Type, Encoding} | RestAtts], Boundary, WriteF
WriteFun(<<"\r\n--", Boundary/binary>>),
atts_to_mp(RestAtts, Boundary, WriteFun, AttFun).
-abort_multi_part_stream(Parser) ->
+abort_multipart_stream(Parser) ->
MonRef = erlang:monitor(process, Parser),
Parser ! abort_parsing,
receive