Permalink
Commits on Oct 10, 2011
  1. Merge remote-tracking branch 'apache/1.1.x'

    Robert Newson committed Oct 10, 2011
Commits on Oct 7, 2011
  1. @kocolosk

    Include twig explicitly in the release config

    This fixes "Unable to generate spec" errors when trying to build a
    release on Erlang/OTP R13.
    kocolosk committed Oct 7, 2011
Commits on Oct 6, 2011
  1. @rnewson

    Revert "Fix function evaluation by newer SpiderMonkey's."

    This reverts commit 61f10e7.
    rnewson committed Oct 6, 2011
  2. @rnewson

    Revert "Remove SpiderMonkey 1.8.5 compatibility"

    This reverts commit 5b558c8.
    rnewson committed Oct 6, 2011
  3. @rnewson

    fix shadowing warning.

    rnewson committed Oct 6, 2011
  4. @rnewson

    Remove SpiderMonkey 1.8.5 compatibility

    This commit reverts 1.8.5 compatibility including the corresponding couchjs
    paren hack as this leads to significant breakage in existing functions.
    rnewson committed Oct 6, 2011
Commits on Oct 5, 2011
  1. @fdmanana
  2. @rnewson
Commits on Oct 4, 2011
  1. @kocolosk
  2. @kocolosk
Commits on Oct 2, 2011
  1. @tilgovi
  2. @tilgovi
  3. @tilgovi

    improve argument parsing in couchjs

    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
    tilgovi committed Oct 2, 2011
Commits on Oct 1, 2011
  1. @tilgovi

    fix COUCHDB-648 - _update handler ignores "code"

    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
    tilgovi committed Oct 1, 2011
Commits on Sep 30, 2011
  1. @fdmanana

    Replicator: skip documents with empty ID

    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
    fdmanana committed Sep 30, 2011
Commits on Sep 29, 2011
  1. @fdmanana

    Remove usage of http module from etap tests

    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
    fdmanana committed Sep 29, 2011
Commits on Sep 28, 2011
  1. handle bigcouch sequences in futon.browse.js

    Robert Newson committed Sep 28, 2011
  2. Merge 1.1.x because Paul Davis kept his important bug fix super secre…

    …t while I was slaving away on this merge for two days.
    Robert Newson committed Sep 28, 2011
  3. remove bad new tests. evil tests, I keel you.

    Robert Newson committed Sep 28, 2011
  4. Merge 1.1.x changes

    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
    Robert Newson committed Sep 28, 2011
  5. @davisp

    Rest of the fix for COUCHDB-1265

    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
    davisp committed Sep 28, 2011
  6. @davisp

    Allow CommonJS modules to be an empty string.

    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
    davisp committed Sep 28, 2011
Commits on Sep 27, 2011
  1. @davisp

    Fix function evaluation by newer SpiderMonkey's.

    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
    davisp committed Sep 27, 2011
  2. @rnewson

    Fixes COUCHDB-1152 - Update ICU on Windows.

    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
    rnewson committed Sep 27, 2011
  3. Merge commit '34ba230324bb329ce5ed54d703dcb4d84a65ab86'

    Robert Newson committed Sep 27, 2011
  4. set cluster_ssl correctly, and tidy chttps section.

    Robert Newson committed Sep 13, 2011
Commits on Sep 26, 2011
  1. @benoitc

    add https support.

    benoitc committed with Robert Newson Sep 13, 2011
Commits on Sep 23, 2011
  1. @kocolosk

    Write header before handing over compacted group

    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
    kocolosk committed Sep 23, 2011
Commits on Sep 22, 2011
  1. @davisp

    Updated CouchJS to support SpiderMonkey 1.8.5

    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.
    davisp committed Sep 6, 2011
  2. @rnewson

    fix port conversion in vhost

    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
    rnewson committed Sep 22, 2011
Commits on Sep 15, 2011
  1. @fdmanana

    Make sure view compaction terminates

    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
    fdmanana committed Sep 15, 2011
  2. @janl

    remove trailing comma

    git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.1.x@1171170 13f79535-47bb-0310-9956-ffa450edef68
    janl committed Sep 15, 2011
Commits on Sep 13, 2011
  1. @janl

    Allow slashes in doc ids in URLs to _update handlers.

    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
    janl committed Sep 13, 2011