summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-04-16Don't call mochiweb_util:parse_qs/1 with an undefined argument.Jan Lehnardt
Found this while debugging COUCHDB-1116. Closes COUCHDB-1116 git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1094031 13f79535-47bb-0310-9956-ffa450edef68
2011-04-16Don't expect a 202 repsponse code when cancelling a replication.Jan Lehnardt
Closes COUCHDB-1016 Patch by Felix Hummel. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1094025 13f79535-47bb-0310-9956-ffa450edef68
2011-04-14Merged revision 1092247 from trunkFilipe David Borba Manana
Include OTP minor release information in the Server header This is mostly to help diagnose issues that might be related to specific OTP releases. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1092251 13f79535-47bb-0310-9956-ffa450edef68
2011-04-14Merged revision 1092108 from branch 1.0.xFilipe David Borba Manana
Replicator: retry connection to remote _changes on close This clause was missing. Two different ibrowse errors signal that the connection was closed: sel_conn_closed and connection_closed. The later is received for streaming connections (like those to _changes). git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1092109 13f79535-47bb-0310-9956-ffa450edef68
2011-04-13Backported revision 1091711 from trunkFilipe David Borba Manana
Add support for replication over IPv6 (part 2) On redirect, enclose the IPv6 address between square brackets (RFC 2732). Closes COUCHDB-665. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1091742 13f79535-47bb-0310-9956-ffa450edef68
2011-04-13Merged revision 1091709 from trunkFilipe David Borba Manana
Add support for replication over IPv6 (part 1) This change upgrades ibrowse to version 2.2.0. This version adds support for IPv6 (https://github.com/cmullaparthi/ibrowse/pull/34). This is part of COUCHDB-665. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1091741 13f79535-47bb-0310-9956-ffa450edef68
2011-04-04whitespaceJan Lehnardt
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1088544 13f79535-47bb-0310-9956-ffa450edef68
2011-04-01Fix OAuth signature computation in OTP R14B02Filipe David Borba Manana
In OTP versions prior to R14B02, the OAuth signature was correctly calculated due to a bug in the OTP stdlib. This was fixed in R14B02 (OTP-8989, check http://erlang.org/download/otp_src_R14B02.readme). Before R14B02: Erlang R14B01 (erts-5.8.2) [source] [smp:2:2] [rq:2] [async-threads:0] [hipe] [kernel-poll:false] Eshell V5.8.2 (abort with ^G) 1> lists:flatten(io_lib:format("%~2.1.0s", [erlang:integer_to_list($+, 16)])). "%2B" In R14B02: Erlang R14B02 (erts-5.8.3) [source] [smp:2:2] [rq:2] [async-threads:0] [hipe] [kernel-poll:false] Eshell V5.8.3 (abort with ^G) 1> lists:flatten(io_lib:format("%~2.1.0s", [erlang:integer_to_list($+, 16)])). "%02" This doesn't affect the erlang-oauth application in trunk, since it's a more recent version with a different implementation. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1087661 13f79535-47bb-0310-9956-ffa450edef68
2011-03-28Fix function signature mismatch. Allow purging of single revisions in a ↵Jan Lehnardt
conflicted document. Closes COUCHDB-1065 Patch by Randall Leeds, verified by Robert Dionne. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1086240 13f79535-47bb-0310-9956-ffa450edef68
2011-03-28Backport fix from revision 1086185Filipe David Borba Manana
Replicator: fix error when restarting replications in OTP R14B02 This is a workaround for a change introduced in OTP R14B02 to the supervisor module. There's an erlang-bugs thread about this issue: http://erlang.org/pipermail/erlang-bugs/2011-March/002273.html git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1086186 13f79535-47bb-0310-9956-ffa450edef68
2011-03-27Backport fix for COUCHDB-1093 (revision 1086007)Filipe David Borba Manana
Fix for crashes in continuous and filtered changes feeds Fixes COUCHDB-1093. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1086009 13f79535-47bb-0310-9956-ffa450edef68
2011-03-26Prefer local src paths for etap.Jan Lehnardt
Closes COUCHDB-1056 Patch by Randall Leeds. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1085801 13f79535-47bb-0310-9956-ffa450edef68
2011-03-19merge trunk. COUCHDB-1094Benoit Chesneau
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1083325 13f79535-47bb-0310-9956-ffa450edef68
2011-03-13Merged revision 1081106 from trunkFilipe David Borba Manana
Add replication ID version information to checkpoints Now that we have versioned replication IDs (introduced by COUCHDB-810), it's useful to know which version is being used in the replication checkpoints. This is mostly for debugging purposes. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1081107 13f79535-47bb-0310-9956-ffa450edef68
2011-03-13Merged revision 1081096 from trunkFilipe David Borba Manana
Replicator database: only validate user_ctx if doc is not being deleted git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1081104 13f79535-47bb-0310-9956-ffa450edef68
2011-03-12Merged revision 1080953 from trunkFilipe David Borba Manana
Replicator manager: do basic validation of replication documents Now the default design document of the replicator database validates each replication document added to the database so that necessary fields must be present and have the right type, and optional replication related fields have the correct type as well. Closes COUCHDB-1088. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1080954 13f79535-47bb-0310-9956-ffa450edef68
2011-03-09Merged revision 1079939 from trunkFilipe David Borba Manana
Parameter "include_docs" now honors parameter "conflicts" When querying a map view, /db/_all_docs/ or /db/_changes/ with "include_docs=true", if "conflicts=true" is given as well, the documents will contain the conflicts list (if there are conflicting revisions). Closes COUCHDB-549. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1079941 13f79535-47bb-0310-9956-ffa450edef68
2011-03-08Merged revision 1079475 from trunkFilipe David Borba Manana
Renamed module couch_rep_db_listener to couch_replication_manager This new name is more appropriate since it describes more precisely what the modules does. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1079478 13f79535-47bb-0310-9956-ffa450edef68
2011-03-05Merged revision 1076368 from trunkFilipe David Borba Manana
Catch all in couch_util:to_binary/1 list argument clause When a list_to_binary call fails, the error tag is 'error' and not 'throw'. This was noticed when this clause was being hit in an error clause of the replication http handler (couch_httpd_replicator.erl). git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1078317 13f79535-47bb-0310-9956-ffa450edef68
2011-03-03Merged revision 1076569 from trunkFilipe David Borba Manana
Added replicator database compaction test A test to confirm that ongoing replications are not stopped when/after the replicator database is compacted. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1076570 13f79535-47bb-0310-9956-ffa450edef68
2011-02-17Merged revision 1071790 from trunk:Filipe David Borba Manana
Replicator database: add document ID to log message git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1071791 13f79535-47bb-0310-9956-ffa450edef68
2011-02-16Make compatible with jQuery 1.5.xRobert Newson
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1071191 13f79535-47bb-0310-9956-ffa450edef68
2011-02-15Only accept application/json from jquery.couch.jsRobert Newson
Since Filipe's fix for parsing the accepted content types at r1041103, returns from $.ajax could return a 302 that redirects to an HTML page. Functions like activeTasks() expect JSON and barf when fed HTML. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1070885 13f79535-47bb-0310-9956-ffa450edef68
2011-02-15set cookie security flags correctly when using built-in SSLRobert Newson
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1070884 13f79535-47bb-0310-9956-ffa450edef68
2011-02-14Merged revision 1070625 from trunk:Filipe David Borba Manana
_all_docs rows must not deleted include documents After COUCHDB-1061, when POSTing to _all_docs?include_docs=true with the body "keys" option, deleted documents were part part of the output. The "doc" property of each _all_docs row should have the value 'null' for all deleted documents (when ?include_docs=true). A test was added to help prevent this from happening again. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1070631 13f79535-47bb-0310-9956-ffa450edef68
2011-02-10Merged revision 1069268 from trunkFilipe David Borba Manana
Added more tests to all_docs.js git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1069270 13f79535-47bb-0310-9956-ffa450edef68
2011-02-10Merged revision 1069262 from trunkFilipe David Borba Manana
More efficient _changes?include_docs=true and _all_docs?include_docs=true Closes COUCHDB-1061 git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1069264 13f79535-47bb-0310-9956-ffa450edef68
2011-02-07Merged revision 1067873 from trunkFilipe David Borba Manana
More efficient logging, closes COUCHDB-1054 git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1067877 13f79535-47bb-0310-9956-ffa450edef68
2011-02-02cleaner fix for COUCHDB-969Robert Newson
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1066596 13f79535-47bb-0310-9956-ffa450edef68
2011-02-02Make server listen on an unused port during unit testsAdam Kocoloski
This prevents the tests from failing when another instance of CouchDB is already running on the same machine. Also merging in the fixup of the _error resource from r1066590. COUCHDB-1049 git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1066591 13f79535-47bb-0310-9956-ffa450edef68
2011-02-02fix clause warning introduced with COUCHDB-969Robert Newson
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1066404 13f79535-47bb-0310-9956-ffa450edef68
2011-02-02Merged revision 1066340 from trunkFilipe David Borba Manana
Replicator DB: make number of replication retry attempts configurable Closes COUCHDB-1051 git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1066342 13f79535-47bb-0310-9956-ffa450edef68
2011-02-01Merged revision 1065923 from trunkFilipe David Borba Manana
Cleanup all test databases created by replicator_db.js git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1065924 13f79535-47bb-0310-9956-ffa450edef68
2011-02-01Backport COUCHDB-1008 from trunk (revision 1055592)Filipe David Borba Manana
The motivation for this backport is to prevent the "nodelay" option, under section "httpd", from reaching version 1.1. This patch introduces the "socket_options" configuration parameter which is more generic - it allows nodelay as well as other socket options to be specified. Not adding this patch to 1.1.x would imply still supporting the "nodelay" parameter in future releases to avoid breaking the configuration API. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1065922 13f79535-47bb-0310-9956-ffa450edef68
2011-01-31Merge revision 1065448 from trunkFilipe David Borba Manana
Added test swap_rep_db to test case replicator_db.js The purpose of this test is to verify that replications are stopped and restarted when the replicator database is dynamically changed. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1065449 13f79535-47bb-0310-9956-ffa450edef68
2011-01-28COUCHDB-969 - handle passwords with : in them.Robert Newson
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1064856 13f79535-47bb-0310-9956-ffa450edef68
2011-01-28COUCHDB-1047 - support inclusive_end with reduce callsRobert Newson
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1064801 13f79535-47bb-0310-9956-ffa450edef68
2011-01-28Validate doc ids that come from a PUT to a URL.Paul Joseph Davis
Backprot of 1064417 from trunk. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1064421 13f79535-47bb-0310-9956-ffa450edef68
2011-01-27Fix calculation of URL length in replicatorAdam Kocoloski
COUCHDB-644, COUCHDB-1044 git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1064147 13f79535-47bb-0310-9956-ffa450edef68
2011-01-24Merge revision 1062783 from trunkFilipe David Borba Manana
Replicator DB: on restart, make several attempts to restart the replications Now on restart, the replicator database listener will make up to 10 attempts to restart each replication. Before each attempt, it waits, using an exponential backoff strategy, before doing the next attempt. This is very useful because when one server restarts, other servers that are endpoints of its replications, may not be online yet. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1062784 13f79535-47bb-0310-9956-ffa450edef68
2011-01-24Merge revision 1062772 from trunkFilipe David Borba Manana
Refactoring of the replicator database listener Simpler implementation and more reliable behaviour when the replicator database is deleted or changed on the fly. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1062773 13f79535-47bb-0310-9956-ffa450edef68
2011-01-21Merged revision 1061809 from trunkFilipe David Borba Manana
Fix strange result when passing a filter and a limit of 1 to /db/_changes Fixes COUCHDB-1037 git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1061811 13f79535-47bb-0310-9956-ffa450edef68
2011-01-20Merge revision 1061340 from trunkFilipe David Borba Manana
Upgrade ibrowse to version 2.1.3 This version fixes several bugs and adds a few minor improvements. For a list and description of the changes relative to the previous version, see the README file at: https://github.com/cmullaparthi/ibrowse git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1061341 13f79535-47bb-0310-9956-ffa450edef68
2011-01-20COUCHDB-1034 - ignore runs of whitespace between content types in ↵Robert Newson
compressible_types list git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1061282 13f79535-47bb-0310-9956-ffa450edef68
2011-01-19Merged revision 1060860 from trunkFilipe David Borba Manana
Fix by-doc-IDs pull replication from a CouchDB server version < 1.1.0 Closes COUCHDB-1028 git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1060862 13f79535-47bb-0310-9956-ffa450edef68
2011-01-18Avoid bug in rev tree logic during attachment uploadsAdam Kocoloski
This is a workaround for a bug in couch_key_tree, described in COUCHDB-902, which would cause uploads to fail with spurious conflicts. A patch for the key tree itself will be landing on trunk. Thanks Bob Dionne, Klaus Trainer. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1060150 13f79535-47bb-0310-9956-ffa450edef68
2011-01-17Merged revision 1059893 from trunkFilipe David Borba Manana
More efficient implementation of the DB updater BTree functions Closes COUCHDB-1027 git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1059894 13f79535-47bb-0310-9956-ffa450edef68
2011-01-17Merged revision 1053731 from trunkFilipe David Borba Manana
Two cleanups in couch_db_updater It also seems to add a little performance gain: http://graphs.mikeal.couchone.com/#/graph/8bf31813eef7c0b7e37d1ea259020a0 Closes COUCHDB-1000 git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1059892 13f79535-47bb-0310-9956-ffa450edef68
2011-01-17Merged revision 1058674 from trunkFilipe David Borba Manana
Avoid unnecessary conversion to binary Mochiweb accepts IO lists. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1059889 13f79535-47bb-0310-9956-ffa450edef68
2011-01-17Merged revision 1059884 from trunkFilipe David Borba Manana
Removed unnecessary iolist_to_binary/1 calls These IOlist to binary conversions are not necessary since ibrowse accepts IOlists as outputs of streaming functions. Also, having the IOlists getting converted into binaries by the erts (instead of user Erlang code) is more git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1059885 13f79535-47bb-0310-9956-ffa450edef68