You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by va...@apache.org on 2017/03/08 01:29:51 UTC
[1/2] couch commit: updated refs/heads/master to 9d8be06
Repository: couchdb-couch
Updated Branches:
refs/heads/master f99e30c38 -> 9d8be06e4
Rename max_document_size to max_http_request_size
`max_document_size` is implemented as `max_http_request_size`. There was no
real check for document size. In some cases the implementation was close enough
of a proxy (PUT-ing and GET-ing single docs), but in some edge cases, like
_bulk_docs requests the discrepancy between request size and document size
could be rather large.
The section was changed accordingly from `couchdb` to `httpd`. `httpd` was
chosen as it applies to both clustered as well as local interface.
There is a parallel effort to implement an actual max_document_size check. The
set of commit should be merged close enough together to allow for a backwards
compatible transition.
COUCHDB-2992
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/0420f404
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/0420f404
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/0420f404
Branch: refs/heads/master
Commit: 0420f404a7ba2c5c5964f2ae5a87cda1c2178387
Parents: f99e30c
Author: Nick Vatamaniuc <va...@apache.org>
Authored: Tue Mar 7 19:03:32 2017 -0500
Committer: Nick Vatamaniuc <va...@apache.org>
Committed: Tue Mar 7 19:03:32 2017 -0500
----------------------------------------------------------------------
src/couch_httpd.erl | 5 ++---
src/couch_httpd_external.erl | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/0420f404/src/couch_httpd.erl
----------------------------------------------------------------------
diff --git a/src/couch_httpd.erl b/src/couch_httpd.erl
index 8e7dfeb..380b73f 100644
--- a/src/couch_httpd.erl
+++ b/src/couch_httpd.erl
@@ -451,7 +451,7 @@ validate_ctype(Req, Ctype) ->
check_max_request_length(Req) ->
Len = list_to_integer(header_value(Req, "Content-Length", "0")),
- MaxLen = config:get_integer("couchdb", "max_document_size", 4294967296),
+ MaxLen = config:get_integer("httpd", "max_http_request_size", 4294967296),
case Len > MaxLen of
true ->
exit({body_too_large, Len});
@@ -576,8 +576,7 @@ body_length(#httpd{mochi_req=MochiReq}) ->
MochiReq:get(body_length).
body(#httpd{mochi_req=MochiReq, req_body=undefined}) ->
- MaxSize = list_to_integer(
- config:get("couchdb", "max_document_size", "4294967296")),
+ MaxSize = config:get_integer("httpd", "max_http_request_size", 4294967296),
MochiReq:recv_body(MaxSize);
body(#httpd{req_body=ReqBody}) ->
ReqBody.
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/0420f404/src/couch_httpd_external.erl
----------------------------------------------------------------------
diff --git a/src/couch_httpd_external.erl b/src/couch_httpd_external.erl
index 626a3fb..1f2f1e8 100644
--- a/src/couch_httpd_external.erl
+++ b/src/couch_httpd_external.erl
@@ -63,8 +63,8 @@ json_req_obj(#httpd{mochi_req=Req,
}, Db, DocId) ->
Body = case ReqBody of
undefined ->
- MaxSize = list_to_integer(
- config:get("couchdb", "max_document_size", "4294967296")),
+ MaxSize = config:get_integer("httpd", "max_http_request_size",
+ 4294967296),
Req:recv_body(MaxSize);
Else -> Else
end,
[2/2] couch commit: updated refs/heads/master to 9d8be06
Posted by va...@apache.org.
Merge branch '64229-add-new-request-parameter'
Closes #233
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/9d8be06e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/9d8be06e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/9d8be06e
Branch: refs/heads/master
Commit: 9d8be06e4ba823165f385667a360e7c050427918
Parents: f99e30c 0420f40
Author: Nick Vatamaniuc <va...@apache.org>
Authored: Tue Mar 7 20:29:33 2017 -0500
Committer: Nick Vatamaniuc <va...@apache.org>
Committed: Tue Mar 7 20:29:33 2017 -0500
----------------------------------------------------------------------
src/couch_httpd.erl | 5 ++---
src/couch_httpd_external.erl | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------