Merged revision 1070625 from trunk:

_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.0.x@1070626 13f79535-47bb-0310-9956-ffa450edef68
Make compatible with jQuery 1.5.x

git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.0.x@1071190 13f79535-47bb-0310-9956-ffa450edef68
Merged revision 1076368 from trunk

    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.0.x@1078318 13f79535-47bb-0310-9956-ffa450edef68
Merged revision 1079939 from trunk

   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.0.x@1079943 13f79535-47bb-0310-9956-ffa450edef68
Backport fix for COUCHDB-1093 (revision 1086007)

    Fix for crashes in continuous and filtered changes feeds

    Fixes COUCHDB-1093.



git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.0.x@1086008 13f79535-47bb-0310-9956-ffa450edef68
Backport fix from revision 1086185

    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.0.x@1086188 13f79535-47bb-0310-9956-ffa450edef68
Fix function signature mismatch. Allow purging of single revisions in a 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.0.x@1086242 13f79535-47bb-0310-9956-ffa450edef68
Fix OAuth signature computation in OTP R14B02

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.0.x@1087662 13f79535-47bb-0310-9956-ffa450edef68
whitespace

git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.0.x@1088545 13f79535-47bb-0310-9956-ffa450edef68
Merged revision 1091709 from trunk

   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.0.x@1091745 13f79535-47bb-0310-9956-ffa450edef68
Backported revision 1091711 from trunk

   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.0.x@1091747 13f79535-47bb-0310-9956-ffa450edef68
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.0.x@1092108 13f79535-47bb-0310-9956-ffa450edef68
Merged revision 1092247 from trunk

    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.0.x@1092252 13f79535-47bb-0310-9956-ffa450edef68
Don't expect a 202 repsponse code when cancelling a replication.

Closes COUCHDB-1016

Patch by Felix Hummel.

git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.0.x@1094026 13f79535-47bb-0310-9956-ffa450edef68
Don't call mochiweb_util:parse_qs/1 with an undefined argument.

Found this while debugging COUCHDB-1116.

Closes COUCHDB-1116

git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.0.x@1094032 13f79535-47bb-0310-9956-ffa450edef68
enable greedy replacements

git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.0.x@1094043 13f79535-47bb-0310-9956-ffa450edef68
Fix display issue with documents that have single or double quotes
in their id.

Closes COUCHDB-1111

git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.0.x@1094051 13f79535-47bb-0310-9956-ffa450edef68
update NEWS and CHANGES

git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.0.x@1094204 13f79535-47bb-0310-9956-ffa450edef68
Replicator: fix proxy feature after upgrading ibrowse to version 2.2.0


git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.0.x@1094419 13f79535-47bb-0310-9956-ffa450edef68
ibrowse version in 1.0.x is 2.2.0 and no longer 2.1.3


git-svn-id: https://svn.apache.org/repos/asf/couchdb/branches/1.0.x@1094487 13f79535-47bb-0310-9956-ffa450edef68