summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-10-17remove scons cache in 'make clean'Robert Newson
2011-10-12Freeze dependencies, this is 0.4.0pre1Adam Kocoloski
2011-10-12Merge pull request #71 from cloudant/12726-custom-http-optionsAdam Kocoloski
2011-10-12Remove obsolete options, document N,QAdam Kocoloski
2011-10-11Document custom HTTP/socket options in default.iniPaul J. Davis
Part of the backport of COUCHDB-1008 to chttpd. This just updates the default.ini with some commented out options describing their availability to users.
2011-10-10Remove call to subprocess.check_outputPaul J. Davis
This function is new in Python 2.7 and we already have a function that returns command ouput. Just reuse runcmd to get the version.
2011-10-10Merge remote-tracking branch 'apache/1.1.x'Robert Newson
2011-10-07Include twig explicitly in the release configAdam Kocoloski
This fixes "Unable to generate spec" errors when trying to build a release on Erlang/OTP R13.
2011-10-06Revert "Fix function evaluation by newer SpiderMonkey's."Robert Newson
This reverts commit 61f10e7590bd352b367ad426a56587cbef3700b6.
2011-10-06Revert "Remove SpiderMonkey 1.8.5 compatibility"Robert Newson
This reverts commit 5b558c81ed9709fb286a6821e9ae6d6478012c2c.
2011-10-06fix shadowing warning.Robert Newson
2011-10-06Remove SpiderMonkey 1.8.5 compatibilityRobert Newson
This commit reverts 1.8.5 compatibility including the corresponding couchjs paren hack as this leads to significant breakage in existing functions.
2011-10-05Update CHANGES and NEWS for the 1.1.1 releaseFilipe David Manana
2011-10-05update CHANGES and NEWS to include a one line summary for every ticket ↵Robert Newson
resolved in 1.1.1
2011-10-04Merge pull request #67 from cloudant/12645-merge_latest_1.1.xAdam Kocoloski
2011-10-04Merge remote branch 'apache/1.1.x'Adam Kocoloski
2011-10-02fix couchjs help language and use short optionsRandall Leeds
2011-10-02distclean couchjs.1 help2man fileRandall Leeds
2011-10-02improve argument parsing in couchjsRandall Leeds
This change makes argument parsing in couchjs more robust: * Removes the need for couchjs script * Adds long options * Makes all the options to couchjs available (fix COUCHDB-893) Conflicts: bin/Makefile.am bin/couchjs.tpl.in configure.ac
2011-10-01fix COUCHDB-648 - _update handler ignores "code"Randall Leeds
Test by Christian Carter This is a backport of r1177890 git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1177892 13f79535-47bb-0310-9956-ffa450edef68
2011-09-30Replicator: skip documents with empty IDFilipe David Borba Manana
Due to a bug, older releases allowed the creation of documents with an empty ID, which are impossible to GET therefore making the replicator crash. This change simply skips such documents and logs an error message to inform users. This is a backport of revision 1177548 from trunk. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1177550 13f79535-47bb-0310-9956-ffa450edef68
2011-09-29Remove usage of http module from etap testsFilipe David Borba Manana
This module is deprecated in OTP R15, which is going to be released by the end of this year. The etap tests now use ibrowse instead. This is a backport of revision 1177459 from trunk. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1177463 13f79535-47bb-0310-9956-ffa450edef68
2011-09-29restore update_group for better update_after implementation.Robert Newson
2011-09-28permit . within database names to allow shard browsing on :5986Robert Newson
2011-09-28handle bigcouch sequences in futon.browse.jsRobert Newson
2011-09-28Merge 1.1.x because Paul Davis kept his important bug fix super secret while ↵Robert Newson
I was slaving away on this merge for two days.
2011-09-28remove bad new tests. evil tests, I keel you.Robert Newson
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-28Rest of the fix for COUCHDB-1265Paul Joseph Davis
As a follow up to COUCHDB-1265 I was missing the fact that after the insertion of a new update_seq into an internal node it is quite possible that a compaction runs before the doc is updated again. This is important because compaction removes information of the largest update seq from the tree itself. The fix is simple to include the update_seq from the #full_doc_info{} record when calculating #doc_info.high_seq. The way to think of this is that it's the maximum value from all known values for the update sequence which can be defined as all values known in the tree or in the full_doc_info record. Backport of r1176701 from trunk git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1176704 13f79535-47bb-0310-9956-ffa450edef68
2011-09-28Allow CommonJS modules to be an empty string.Paul Joseph Davis
We were making a typical JavaScript mistake testing a module for truthiness instead of checking that it was undefined. Fixes COUCHDB-1223 Backport of r1176677 from trunk git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1176679 13f79535-47bb-0310-9956-ffa450edef68
2011-09-27Fix function evaluation by newer SpiderMonkey's.Paul Joseph Davis
Found this error using the Debian package for SM 1.8.5 and have since had reports of users seeing it as well. The basic error is that some versions of SpiderMonkey appear to dislike this call to eval: eval("function(){}"); The fix is simply to wrap the function source in parenthesis so that SM is convinced that it knows how to evaluate a function. Backport of r1176666 from trunk. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1176667 13f79535-47bb-0310-9956-ffa450edef68
2011-09-27Fixes COUCHDB-1152 - Update ICU on Windows.Robert Newson
Thanks to Dave Cottlehuber for the patch. git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1176651 13f79535-47bb-0310-9956-ffa450edef68
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