Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 57890 invoked from network); 25 Jun 2010 14:22:49 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 25 Jun 2010 14:22:49 -0000 Received: (qmail 77661 invoked by uid 500); 25 Jun 2010 14:22:49 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 77530 invoked by uid 500); 25 Jun 2010 14:22:49 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 77523 invoked by uid 99); 25 Jun 2010 14:22:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Jun 2010 14:22:48 +0000 X-ASF-Spam-Status: No, hits=-1817.4 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Jun 2010 14:22:48 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C88052388A67; Fri, 25 Jun 2010 14:21:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r957975 - /couchdb/branches/0.11.x/src/mochiweb/mochijson2.erl Date: Fri, 25 Jun 2010 14:21:56 -0000 To: commits@couchdb.apache.org From: jan@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100625142156.C88052388A67@eris.apache.org> Author: jan Date: Fri Jun 25 14:21:56 2010 New Revision: 957975 URL: http://svn.apache.org/viewvc?rev=957975&view=rev Log: Merge r957656 from trunk: patch mochijson2 to allow output of big integers not in float form (it stores them just fine) Modified: couchdb/branches/0.11.x/src/mochiweb/mochijson2.erl Modified: couchdb/branches/0.11.x/src/mochiweb/mochijson2.erl URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/src/mochiweb/mochijson2.erl?rev=957975&r1=957974&r2=957975&view=diff ============================================================================== --- couchdb/branches/0.11.x/src/mochiweb/mochijson2.erl (original) +++ couchdb/branches/0.11.x/src/mochiweb/mochijson2.erl Fri Jun 25 14:21:56 2010 @@ -98,11 +98,8 @@ json_encode(false, _State) -> <<"false">>; json_encode(null, _State) -> <<"null">>; -json_encode(I, _State) when is_integer(I) andalso I >= -2147483648 andalso I =< 2147483647 -> - %% Anything outside of 32-bit integers should be encoded as a float - integer_to_list(I); json_encode(I, _State) when is_integer(I) -> - mochinum:digits(float(I)); + integer_to_list(I); json_encode(F, _State) when is_float(F) -> mochinum:digits(F); json_encode(S, State) when is_binary(S); is_atom(S) ->