summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-09-28Merge 1.1.x changesRobert Newson
Conflicts: apps/couch/include/couch_db.hrl apps/couch/src/couch_db.erl apps/couch/src/couch_os_process.erl apps/couch/src/couch_query_servers.erl apps/couch/src/couch_rep.erl apps/couch/src/couch_replication_manager.erl apps/couch/src/couch_view_compactor.erl apps/couch/src/couch_view_group.erl apps/couch/src/couch_view_updater.erl configure.ac couchjs/c_src/http.c couchjs/c_src/main.c couchjs/c_src/utf8.c etc/windows/couchdb.iss.tpl src/couchdb/priv/Makefile.am src/couchdb/priv/couch_js/main.c test/etap/160-vhosts.t test/etap/200-view-group-no-db-leaks.t test/etap/Makefile.am BugzID: 12645
2011-09-27Merge commit '34ba230324bb329ce5ed54d703dcb4d84a65ab86'Robert Newson
2011-09-27set cluster_ssl correctly, and tidy chttps section.Robert Newson
2011-09-26add https support.benoitc
2011-09-23Write header before handing over compacted groupAdam Kocoloski
Writing the header first ensures that the index will not be reset if the server crashes in between the handoff and the next delayed_commit. See COUCHDB-994 git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1174979 13f79535-47bb-0310-9956-ffa450edef68
2011-09-22Updated CouchJS to support SpiderMonkey 1.8.5Paul J. Davis
This is tested against the 1.7.0, 1.8.0rc1, and 1.8.5 tarballs from Mozilla's FTP directory. It's mostly the same code from trunk minus a few tweaks to get it past a couple type errors using c++ instead of cc.
2011-09-22fix port conversion in vhostRobert Newson
fix port conversion, don't forget to use substr function. spotted by @rnewson on irc, again. thanks. patch by benoitc. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1174358 13f79535-47bb-0310-9956-ffa450edef68
2011-09-15Make sure view compaction terminatesFilipe David Borba Manana
If a view group is compacting and the corresponding database is shutdown by the LRU system, then the view compaction is aborted because its couch view group process shutdowns. This could lead to situations where the number of active databases is much higher than max_dbs_open and making it impossible to compact view groups. Issue reported and patch tested by Mike Leddy. Thanks. COUCHDB-1283 This is a backport of revision 1171328 from branch 1.2.x git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1171329 13f79535-47bb-0310-9956-ffa450edef68
2011-09-15remove trailing commaJan Lehnardt
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1171170 13f79535-47bb-0310-9956-ffa450edef68
2011-09-13Allow slashes in doc ids in URLs to _update handlers.Jan Lehnardt
This mirrors the behaviour of the _show API. Patch by Christopher Bonhage. Closes COUCHDB-1229 git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1170299 13f79535-47bb-0310-9956-ffa450edef68
2011-09-12Merge pull request #62 from benoitc/masterAdam Kocoloski
2011-09-12Add missing database 'created' event.benoitc
The `created` event is emitted on apache couchdb when a database is created. This patch re-add it to bigcouch.
2011-09-12Insane libtool hackery for windows (COUCHDB-1197)Randall Leeds
Patch by Dave Cottlehuber Backport of r1169920 git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1169921 13f79535-47bb-0310-9956-ffa450edef68
2011-09-08COUCHDB-1274 - Use text/javascript content-type for jsonp responses.Robert Newson
Backported from trunk @1166618 git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1166627 13f79535-47bb-0310-9956-ffa450edef68
2011-09-08Fix list-style send() API in show functions when using provides()Jan Lehnardt
Also fix ignoring the return value when the send() API isnused. Patch by Alexander Shorin. Closes COUCHDB-1272 git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1166625 13f79535-47bb-0310-9956-ffa450edef68
2011-09-08And the rest of the commit/Paul Joseph Davis
SVN != Git. Forgot to check svn status before committing. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1166526 13f79535-47bb-0310-9956-ffa450edef68
2011-09-08Fix CouchJS compatibility with older SpiderMonkey.Paul Joseph Davis
This is a backport of the work to make CouchJS build against all of the major versions of SpiderMonkey. Thanks to Randall Leeds and Chris Coulson for the original patches. Backport based on r1137464 and r1164346 Fixes COUCHDB-1078 Fixes COUCHDB-1260 git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1166525 13f79535-47bb-0310-9956-ffa450edef68
2011-09-07additional libtool lubrication for windows buildRandall Leeds
This is related to COUCHDB-1197 Thanks Dave Cottlehuber for the patch Backport of r1166438 git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1166439 13f79535-47bb-0310-9956-ffa450edef68
2011-09-02Fixes COUCHDB-1265Paul Joseph Davis
Backport of 1164350 from trunk. Slightly modified for an export declaration conflict and removing a clause that only applies to trunk. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1164351 13f79535-47bb-0310-9956-ffa450edef68
2011-08-31Fix order of parameters in log messageFilipe David Borba Manana
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1163747 13f79535-47bb-0310-9956-ffa450edef68
2011-08-27Remove unnecessary call after revision 1162306Filipe David Borba Manana
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1162307 13f79535-47bb-0310-9956-ffa450edef68
2011-08-27Fix replication crash on database compactionFilipe David Borba Manana
There were race conditions that made replications crash when a local endpoint database is compacted. Patch tested by Joan Touzet. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1162306 13f79535-47bb-0310-9956-ffa450edef68
2011-08-25Remove Style where we have no need for itAdam Kocoloski
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1161703 13f79535-47bb-0310-9956-ffa450edef68
2011-08-25Do not suppress old revisions from _changesAdam Kocoloski
Requests to '_changes?style=all_docs' with a 'since' parameter would suppress revisions of a document generated before the start of the feed. The assumption may have been that those revisions were seen by the client in a previous request to _changes, but this is not necessarily true if the client is resuming the feed after a partial download. The safe thing to do is to include all leaf revisions for each document in the feed. Thanks Bob Dionne for the test code. Closes COUCHDB-1256 git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1161702 13f79535-47bb-0310-9956-ffa450edef68
2011-08-23bring windows in line with r1001283 (COUCHDB-1197)Randall Leeds
Thanks to Dave Cottlehuber for the patch. This is a backport of r1160857 from trunk git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1160859 13f79535-47bb-0310-9956-ffa450edef68
2011-08-19Updated changes feed connect timeout to 30 secondsFilipe David Borba Manana
This is the timeout used everywhere else. Some users are constantly unable to replicate since under some scenarios (namely via SSL) a timeout of 10 seconds is too short. This is related to a thread in the users mailing list: http://mail-archives.apache.org/mod_mbox/couchdb-user/201106.mbox/%3CBANLkTik3y-nN1uWMyNgzA_0ZSjxXdcMqQw@mail.gmail.com%3E git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1159501 13f79535-47bb-0310-9956-ffa450edef68
2011-08-18Add missing assertions to test/etap/210-os-proc-pool.tFilipe David Borba Manana
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1159059 13f79535-47bb-0310-9956-ffa450edef68
2011-08-18Added executable bit to test/etap/210-os-proc-pool.tFilipe David Borba Manana
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1159050 13f79535-47bb-0310-9956-ffa450edef68
2011-08-18Merge revision 1159045 from trunkFilipe David Borba Manana
Fix dead lock case in the os process pool Part of this patch was done by Paul Davis. The patch also introduces a test case to validate that the os process pool (couch_query_servers) operates as it should. Closes COUCHDB-1246. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1159049 13f79535-47bb-0310-9956-ffa450edef68
2011-08-17add httpd/aborted_requests description.Robert Newson
2011-08-15Merge branch '11554-merge-couchdb-1.1'Adam Kocoloski
2011-08-15Fix empty range check for raw collation.Paul Joseph Davis
The check for empty ranges was not taking into account the view option for raw collation. This fixes that by passing the couch_btree:less/2 function into the check. Patch by: Jason Smith Back port of: 1156506, 1156507, 1156509, 1156509, 1156610 git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1157706 13f79535-47bb-0310-9956-ffa450edef68
2011-08-13Merge revision 1157428 from trunkFilipe David Borba Manana
Doc validation functions from deleted ddocs must be ignored If a design document is deleted by updating it with a "_deleted" field set to the boolean value true, its validate_doc_update function should be ignored for subsequent document insertions/updates. This closes COUCHDB-1227. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1157429 13f79535-47bb-0310-9956-ffa450edef68
2011-08-12Reset tracking branches to masterAdam Kocoloski
2011-08-12assert that calls to file functions actually succeed.Robert Newson
1) couch_file:sync could leave open fd's if close failed. Now we'll get a trace. 2) couch_file:append_term failing would be bad, so let's test that too. backported from trunk r1150915 git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1150918 13f79535-47bb-0310-9956-ffa450edef68
2011-08-12include new share/www files missed in the 1.1 merge.Robert Newson
2011-08-12allow replication callback module to be chosen at runtime.Robert Newson
2011-08-12move couch_js_functions.hrl to include dirRobert Newson
2011-08-12Allow asynchronous view group updates.Robert Newson
2011-08-10Revert couch_server changes added in revision 1156361Filipe David Borba Manana
Leaving the tests however since it doesn't hurt. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1156385 13f79535-47bb-0310-9956-ffa450edef68
2011-08-10COUCHDB-1245 - enforce maximum chunk size for _log call to better manage memory.Robert Newson
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1156369 13f79535-47bb-0310-9956-ffa450edef68
2011-08-10Merged revision 1156360 from trunkFilipe David Borba Manana
Prevent data loss on db creation request 1) Create and populate a database 2) Restart the server 3) Send a PUT request to create the database - the server will override the existing file, making all previous documents no longer accessible nor recoverable git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1156361 13f79535-47bb-0310-9956-ffa450edef68
2011-08-10COUCHDB-1244 - close file descriptor in couch_log:read/2Robert Newson
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1156351 13f79535-47bb-0310-9956-ffa450edef68
2011-08-03add note that R14B01 or higher is needed to build a release.Robert Newson
2011-07-30Backport of r1152399 from trunkRandall Leeds
add an etap test for btree traversal callbacks git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1152407 13f79535-47bb-0310-9956-ffa450edef68
2011-07-30Backport of r1152398 from trunkRandall Leeds
Fix COUCHDB-1076 - views skip empty btree branches git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1152406 13f79535-47bb-0310-9956-ffa450edef68
2011-07-30Backport of r1152397 from trunkRandall Leeds
Call traversal handlers in btree folds Previously the fold function was only invoked for leafs. With this change it's possible to define a fold function which is called for inner nodes and can return a tuple {skip, Acc} in order to skip exploration of the branch. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1152405 13f79535-47bb-0310-9956-ffa450edef68
2011-07-28revert redundant pattern match.Robert Newson
git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1151976 13f79535-47bb-0310-9956-ffa450edef68
2011-07-25assert that calls to file functions actually succeed.Robert Newson
1) couch_file:sync could leave open fd's if close failed. Now we'll get a trace. 2) couch_file:append_term failing would be bad, so let's test that too. backported from trunk r1150915 git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1150918 13f79535-47bb-0310-9956-ffa450edef68
2011-07-06Merge revision 1143375 from trunkFilipe David Borba Manana
Redefine logging macros With these macro definitions we don't evaluate the arguments if the corresponding log level is not enabled. This behaviour was accidently removed by the patch from COUCHDB-1054. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1143376 13f79535-47bb-0310-9956-ffa450edef68