diff options
author | Filipe David Borba Manana <fdmanana@apache.org> | 2010-12-23 11:27:37 +0000 |
---|---|---|
committer | Filipe David Borba Manana <fdmanana@apache.org> | 2010-12-23 11:27:37 +0000 |
commit | abf46298f3e98bebd89d8daa001374cba57dcfce (patch) | |
tree | ba8756f517ae3a544d5bdb4046d4c7e5bb65a7c1 /src/couchdb/couch_db.hrl | |
parent | 214b6f9b9d4c9cd9182d2ce56b9a5ffd9f6d0864 (diff) |
Merged revision 1052227 from trunk:
Fix: replicator didn't use the HTTP settings defined in the .ini config
Issue found by Randall Leeds. Thanks.
Closes COUCHDB-992
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1052229 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/couchdb/couch_db.hrl')
-rw-r--r-- | src/couchdb/couch_db.hrl | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/couchdb/couch_db.hrl b/src/couchdb/couch_db.hrl index 74d2c630..6e205ec1 100644 --- a/src/couchdb/couch_db.hrl +++ b/src/couchdb/couch_db.hrl @@ -268,13 +268,7 @@ body = nil, options = [ {response_format,binary}, - {inactivity_timeout, 30000}, - {max_sessions, list_to_integer( - couch_config:get("replicator", "max_http_sessions", "10") - )}, - {max_pipeline_size, list_to_integer( - couch_config:get("replicator", "max_http_pipeline_size", "10") - )} + {inactivity_timeout, 30000} ], retries = 10, pause = 500, |