← Back to branch summary

~ubuntu-branches/ubuntu/maverick/couchdb/maverick

« back to all changes in this revision

Viewing changes to src/couchdb/couch_doc.erl

  • Committer: Bazaar Package Importer
  • Author(s): Elliot Murphy
  • Date: 2010-08-16 19:45:48 UTC
  • mfrom: (1.2.10 upstream)
  • Revision ID: james.westby@ubuntu.com-20100816194548-cdm0mjqnbxjt5wa4
Tags: 1.0.1-0ubuntu1
https://launchpad.net/bugs/615224
* Upstream microrelease to address data loss (LP: #615224)
  - Fix data corruption bug COUCHDB-844. Please see
    http://couchdb.apache.org/notice/1.0.1.html for details.
  - Added support for replication via an HTTP/HTTP proxy.
  - Fixed various replicator bugs for interop with older
    CouchDB versions.
  - Show fields saved along with _deleted=true.
    Allows for auditing of deletes.
  - Enable basic-auth popup when required to access the server,
    to prevent people from getting locked out.
  - User interface element for querying stale (cached) views.
* debian/patches/auth_patch.patch dropped, included upstream.
* debian/patches/remove_users.patch dropped, included upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/couchdb/couch_doc.erl
27
27
to_json_rev(Start, [FirstRevId|_]) ->
28
28
    [{<<"_rev">>, ?l2b([integer_to_list(Start),"-",revid_to_str(FirstRevId)])}].
29
29
 
30
 
to_json_body(true, _Body) ->
31
 
    [{<<"_deleted">>, true}];
 
30
to_json_body(true, {Body}) ->
 
31
    Body ++ [{<<"_deleted">>, true}];
32
32
to_json_body(false, {Body}) ->
33
33
    Body.
34
34
 
267
267
        {identity, DiskLen};
268
268
    Enc ->
269
269
        EncodedLen = couch_util:get_value(<<"encoded_length">>, BinProps, DiskLen),
270
 
        {list_to_atom(?b2l(Enc)), EncodedLen}
 
270
        {list_to_existing_atom(?b2l(Enc)), EncodedLen}
271
271
    end.
272
272
 
273
273
to_doc_info(FullDocInfo) ->
437
437
    true ->
438
438
        fun att_foldl/3
439
439
    end,
440
 
    AttFun(Att, fun(Data, ok) -> WriteFun(Data) end, ok),
 
440
    AttFun(Att, fun(Data, _) -> WriteFun(Data) end, ok),
441
441
    WriteFun(<<"\r\n--", Boundary/binary>>),
442
442
    atts_to_mp(RestAtts, Boundary, WriteFun, SendEncodedAtts).
443
443