commit 9d8be06e4ba823165f385667a360e7c050427918
author Nick Vatamaniuc <vatamane@apache.org> Tue Mar 07 20:29:33 2017 -0500
committer Nick Vatamaniuc <vatamane@apache.org> Tue Mar 07 20:29:33 2017 -0500
tree 693a0f7b4b608e30ec4e6b94c69ba79bdfa6d98d
parent f99e30c38997e33538493204d5d58ea1a0f62de8
parent 0420f404a7ba2c5c5964f2ae5a87cda1c2178387

Merge branch '64229-add-new-request-parameter'

Closes #233

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 @@
 
 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 @@
     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.

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 @@
             }, 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,