summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-06-21Backport revision 1137928 from trunkFilipe David Borba Manana
Fix server crash associated with the replicator database If there's an exception when calculating the replication ID for a replication document, it crashes the replication manager gen_server 10 times. 10 is the maximum number of restarts per hour specified for the couch_server_sup supervisor. An easy way to trigger such exception is to specify a non existent filter in a replication document. This closes COUCHDB-1199. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1137929 13f79535-47bb-0310-9956-ffa450edef68
2011-06-20Fix spurious declarations of new merge conflictsRobert Newson
This patch also adds extra tests of the key tree merging logic as well as edoc-formatted documentation for the module and a few of the merge functions. Closes COUCHDB-902. Thanks Paul Davis, Bob Dionne, Klaus Trainer. backported from trunk@1065471 Conflicts: src/couchdb/couch_key_tree.erl git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1137789 13f79535-47bb-0310-9956-ffa450edef68
2011-06-16Merge revision 1136639 from trunkFilipe David Borba Manana
Human readable message on view compaction error When a view has duplicated document IDs in the main btree, the view compactor exists. Unfortunatelly its exit reason is not human readable because it's an IOList. This patch improves the error message and logs it with an 'error' level. Issue reported by Mike Leddy in ticket COUCHDB-999. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1136640 13f79535-47bb-0310-9956-ffa450edef68
2011-06-12Backport revision 1129897 from trunkFilipe David Borba Manana
Fixes to the doc PUT multipart API Don't hold the connection forever if the document is rejected by a validate_doc_update function. The solution is to discard all the attachments' data if the document was rejected. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1134942 13f79535-47bb-0310-9956-ffa450edef68
2011-06-12Fix erlang-oauth Makefile.am (wrong file extension)Filipe David Borba Manana
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1134941 13f79535-47bb-0310-9956-ffa450edef68
2011-06-11Backport r113686 from trunkRandall Leeds
add 072-cleanup.t to etap Makefile.am git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1134729 13f79535-47bb-0310-9956-ffa450edef68
2011-06-08backport r1133312 from trunkRandall Leeds
_view_cleanup with no _design docs - COUCHDB-1136 git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1133510 13f79535-47bb-0310-9956-ffa450edef68
2011-06-08bump minimum erlang to R13B02 (COUCHDB-1191)Randall Leeds
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1133272 13f79535-47bb-0310-9956-ffa450edef68
2011-06-03import version 1.0.2 info to NEWS/CHANGES.Robert Newson
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1131049 13f79535-47bb-0310-9956-ffa450edef68
2011-06-03unfreeze 1.1.x - prep for 1.1.1Robert Newson
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1130997 13f79535-47bb-0310-9956-ffa450edef68
2011-06-03set HttpOnly on auth cookies on SSL.Robert Newson
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1130996 13f79535-47bb-0310-9956-ffa450edef68
2011-05-30fix replication.js, continuous:true wasn't passed and so the wrong RepId was ↵Robert Newson
calculated. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1129108 13f79535-47bb-0310-9956-ffa450edef68
2011-05-30supervisor:delete_child returns ok after a successful terminated_child in R14B03Robert Newson
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1129107 13f79535-47bb-0310-9956-ffa450edef68
2011-05-28delete regression.jsRobert Newson
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1128712 13f79535-47bb-0310-9956-ffa450edef68
2011-05-28move COUCHDB-1178 test to conflicts.jsRobert Newson
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1128708 13f79535-47bb-0310-9956-ffa450edef68
2011-05-28COUCHDB-1171 Multiple requests to _changes feed causes {error, system_limit} ↵Robert Newson
"Too many processes" git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1128704 13f79535-47bb-0310-9956-ffa450edef68
2011-05-28COUCHDB-1173 - pass md5 in stub so replication verifies the transfer.Robert Newson
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1128698 13f79535-47bb-0310-9956-ffa450edef68
2011-05-27update CHANGESRobert Newson
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1128191 13f79535-47bb-0310-9956-ffa450edef68
2011-05-27COUCHDB-1074 - fix variable substitution in rewriterRobert Newson
- key= ":key", startkey=[":a", ":b"] - variable substitution via query arguments - variable substituin via reversed path matching variables The variable substition is now a lot easier than the old one. Variables are decoded from the query if they are json, and we recode them only at the end. (Patch by Benoît Chesneau) git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1128189 13f79535-47bb-0310-9956-ffa450edef68
2011-05-26COUCHDB-1177 - don't read more of an attachment than Content-Length states.Robert Newson
(original patch by Paul Davis, awesomeness enhanced by Robert Newson). git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1128040 13f79535-47bb-0310-9956-ffa450edef68
2011-05-26COUCHDB-1178 - fix make_first_doc_on_disk function_clause errorRobert Newson
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1128039 13f79535-47bb-0310-9956-ffa450edef68
2011-05-26COUCHDB-1173 - return Content-MD5 when fetching attachments where possible.Robert Newson
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1128038 13f79535-47bb-0310-9956-ffa450edef68
2011-05-26COUCHDB-1163 - fix internal state of documents affected by COUCHDB-885 ↵Robert Newson
(patch by Paul Davis) git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1128037 13f79535-47bb-0310-9956-ffa450edef68
2011-05-25Backported revision 1127632 from trunkFilipe David Borba Manana
Force non admins to supply a user_ctx in replication documents This is to prevent users deleting replication documents added by other users and to make it clear who triggers which replications. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1127634 13f79535-47bb-0310-9956-ffa450edef68
2011-05-23Fix authentication. Jquery append "*.*" to accept byRobert Newson
default so if we test text/html first it will alway be true. Then test first if application/json was given and then test if text/html then others. Backported from trunk (related to COUCHDB-1175). git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1126759 13f79535-47bb-0310-9956-ffa450edef68
2011-05-23Merged revision 1126426 from trunkFilipe David Borba Manana
Fix timing issues in the doc PUT multipart/related API Two issues were present: 1) the handler replied to the request before the multipart parser consumed all the request's data, causing a subsequent request in the same connection to consume the remaining data from the multipart/related request; 2) the data function passed to the multipart parser could consume, and discard, all or part of the data from a subsequent request in the same connection. This closes COUCHDB-1174. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1126428 13f79535-47bb-0310-9956-ffa450edef68
2011-05-23COUCHDB-1156 - send Accept header so Futon doesn't display HTML where it ↵Robert Newson
expects JSON (Thanks Dale Harvey for patch) git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1126411 13f79535-47bb-0310-9956-ffa450edef68
2011-05-21Merged revision 1125828 from trunkFilipe David Borba Manana
Add missing option to multipart/related GETs This is necessary as the client needs to be able to know if attachments are encoded or not. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1125830 13f79535-47bb-0310-9956-ffa450edef68
2011-05-21Merged revision 1125680 from trunkFilipe David Borba Manana
Use RFC3339 timestamps in replication documents As recently proposed by Max Odgen, RFC3339 timestamps are now used instead of Unix timestamps. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1125682 13f79535-47bb-0310-9956-ffa450edef68
2011-05-20Replication manager: allow edition of replication documentsFilipe David Borba Manana
Replication documents that are not in the triggered state can now be edited by users. This is to make it simpler for Futon users to restart replications - they can just edit the document, remove its state field, and save it, instead of recreating it or adding a similar document but with a different _id. This is a backport of revision 1125319 (trunk). git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1125321 13f79535-47bb-0310-9956-ffa450edef68
2011-05-20Replication manager: don't update doc if new state == current stateFilipe David Borba Manana
This is to avoid unncessary updates. This is a backport of revision 1125317 (trunk). git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1125320 13f79535-47bb-0310-9956-ffa450edef68
2011-05-18Avoid assertion failure in replication.js due to timing issuesFilipe David Borba Manana
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1124185 13f79535-47bb-0310-9956-ffa450edef68
2011-05-17Backported os daemon tests from trunk.Paul Joseph Davis
This reduces the chance that these tests fail due to timing differences by avoding booting of an Erlang VM as an os daemon. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1104622 13f79535-47bb-0310-9956-ffa450edef68
2011-05-17backport oauth fix - COUCHDB-1144Robert Newson
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1104530 13f79535-47bb-0310-9956-ffa450edef68
2011-05-17Add missing doc open option to the test for COUCHDB-885Filipe David Borba Manana
These were forgotten when backporting the attachment related assertions from 1.0.x. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1104481 13f79535-47bb-0310-9956-ffa450edef68
2011-05-17Added extra assertions to the test for COUCHDB-885Filipe David Borba Manana
This is to verify the attachments really exist in the target and have the right data and metadata. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1104478 13f79535-47bb-0310-9956-ffa450edef68
2011-05-17port Filipe's fix and test for COUCHDB-885 to 1.1.xRobert Newson
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1104475 13f79535-47bb-0310-9956-ffa450edef68
2011-05-17adding mochiweb.app.src to EXTRA_DIST, removing annoying blank line.Robert Newson
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1104239 13f79535-47bb-0310-9956-ffa450edef68
2011-05-17added note about breaking changes, and standardised notice across past releasesNoah Slater
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1104199 13f79535-47bb-0310-9956-ffa450edef68
2011-05-17Include _change_password.html in share/Makefile.amRobert Newson
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1104162 13f79535-47bb-0310-9956-ffa450edef68
2011-05-17remove alpha tag.Robert Newson
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1104148 13f79535-47bb-0310-9956-ffa450edef68
2011-05-17Switch to my signing key.Robert Newson
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1104146 13f79535-47bb-0310-9956-ffa450edef68
2011-05-17Remove "not released yet" notices.Robert Newson
Remember to replace after release has been released. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1104137 13f79535-47bb-0310-9956-ffa450edef68
2011-05-13Merged revision 1102137 from trunkFilipe David Borba Manana
Make sure view group shutdowns when database is deleted or dies Added more assertions to test 200-view-group-no-db-leaks.t to ensure this doesn't happen anymore. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1102678 13f79535-47bb-0310-9956-ffa450edef68
2011-05-11Fix circular imports in CommonJS modules.Paul Joseph Davis
Backport of 1102006 from trunk. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1102017 13f79535-47bb-0310-9956-ffa450edef68
2011-05-11Merged revision 1101896 from trunkFilipe David Borba Manana
Fix logger crash when messages have unicode characters This closes COUCHDB-1158. Thanks Dale Harvey. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1101924 13f79535-47bb-0310-9956-ffa450edef68
2011-05-06COUCHDB-760 - allow utf-8 in attachment names (patch by davisp/benoitc)Robert Newson
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1100254 13f79535-47bb-0310-9956-ffa450edef68
2011-05-04Improve Windows build docs.Paul Joseph Davis
Backport of 1099479 from trunk. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1099480 13f79535-47bb-0310-9956-ffa450edef68
2011-05-04Improve Windows installer definition.Paul Joseph Davis
Backport of 1083714 from trunk. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1099306 13f79535-47bb-0310-9956-ffa450edef68
2011-04-28Make test count for test/etap/200-*.t deterministic.Paul Joseph Davis
This is a backport of 1097300 from trunk. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1097301 13f79535-47bb-0310-9956-ffa450edef68