From commits-return-5421-apmail-couchdb-commits-archive=couchdb.apache.org@couchdb.apache.org Fri Nov 12 14:29:52 2010 Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 90979 invoked from network); 12 Nov 2010 14:29:52 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 12 Nov 2010 14:29:52 -0000 Received: (qmail 31946 invoked by uid 500); 12 Nov 2010 14:30:24 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 31812 invoked by uid 500); 12 Nov 2010 14:30:22 -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 31785 invoked by uid 99); 12 Nov 2010 14:30:21 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Nov 2010 14:30:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED 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, 12 Nov 2010 14:30:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C5D4323889E2; Fri, 12 Nov 2010 14:29:00 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1034404 - in /couchdb/trunk/src/ibrowse: ibrowse_http_client.erl ibrowse_lib.erl Date: Fri, 12 Nov 2010 14:29:00 -0000 To: commits@couchdb.apache.org From: fdmanana@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101112142900.C5D4323889E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fdmanana Date: Fri Nov 12 14:29:00 2010 New Revision: 1034404 URL: http://svn.apache.org/viewvc?rev=1034404&view=rev Log: Yet another ibrowse fix. Patch submitted upstream: https://github.com/cmullaparthi/ibrowse/issues/issue/20 Modified: couchdb/trunk/src/ibrowse/ibrowse_http_client.erl couchdb/trunk/src/ibrowse/ibrowse_lib.erl Modified: couchdb/trunk/src/ibrowse/ibrowse_http_client.erl URL: http://svn.apache.org/viewvc/couchdb/trunk/src/ibrowse/ibrowse_http_client.erl?rev=1034404&r1=1034403&r2=1034404&view=diff ============================================================================== --- couchdb/trunk/src/ibrowse/ibrowse_http_client.erl (original) +++ couchdb/trunk/src/ibrowse/ibrowse_http_client.erl Fri Nov 12 14:29:00 2010 @@ -544,7 +544,7 @@ do_send_body1(Source, Resp, State, TE) - maybe_chunked_encode(Data, false) -> Data; maybe_chunked_encode(Data, true) -> - [ibrowse_lib:dec2hex(4, size(to_binary(Data))), "\r\n", Data, "\r\n"]. + [ibrowse_lib:dec2hex(byte_size(to_binary(Data))), "\r\n", Data, "\r\n"]. do_close(#state{socket = undefined}) -> ok; do_close(#state{socket = Sock, @@ -927,23 +927,23 @@ chunk_request_body(Body, _ChunkSize, Acc chunk_request_body(Body, ChunkSize, Acc) when is_binary(Body), size(Body) >= ChunkSize -> <> = Body, - Chunk = [ibrowse_lib:dec2hex(4, ChunkSize),"\r\n", + Chunk = [ibrowse_lib:dec2hex(ChunkSize),"\r\n", ChunkBody, "\r\n"], chunk_request_body(Rest, ChunkSize, [Chunk | Acc]); chunk_request_body(Body, _ChunkSize, Acc) when is_binary(Body) -> BodySize = size(Body), - Chunk = [ibrowse_lib:dec2hex(4, BodySize),"\r\n", + Chunk = [ibrowse_lib:dec2hex(BodySize),"\r\n", Body, "\r\n"], LastChunk = "0\r\n", lists:reverse(["\r\n", LastChunk, Chunk | Acc]); chunk_request_body(Body, ChunkSize, Acc) when length(Body) >= ChunkSize -> {ChunkBody, Rest} = split_list_at(Body, ChunkSize), - Chunk = [ibrowse_lib:dec2hex(4, ChunkSize),"\r\n", + Chunk = [ibrowse_lib:dec2hex(ChunkSize),"\r\n", ChunkBody, "\r\n"], chunk_request_body(Rest, ChunkSize, [Chunk | Acc]); chunk_request_body(Body, _ChunkSize, Acc) when is_list(Body) -> BodySize = length(Body), - Chunk = [ibrowse_lib:dec2hex(4, BodySize),"\r\n", + Chunk = [ibrowse_lib:dec2hex(BodySize),"\r\n", Body, "\r\n"], LastChunk = "0\r\n", lists:reverse(["\r\n", LastChunk, Chunk | Acc]). Modified: couchdb/trunk/src/ibrowse/ibrowse_lib.erl URL: http://svn.apache.org/viewvc/couchdb/trunk/src/ibrowse/ibrowse_lib.erl?rev=1034404&r1=1034403&r2=1034404&view=diff ============================================================================== --- couchdb/trunk/src/ibrowse/ibrowse_lib.erl (original) +++ couchdb/trunk/src/ibrowse/ibrowse_lib.erl Fri Nov 12 14:29:00 2010 @@ -19,7 +19,7 @@ url_encode/1, decode_rfc822_date/1, status_code/1, - dec2hex/2, + dec2hex/1, drv_ue/1, drv_ue/2, encode_base64/1, @@ -163,14 +163,10 @@ status_code(507) -> insufficient_storage status_code(X) when is_list(X) -> status_code(list_to_integer(X)); status_code(_) -> unknown_status_code. -%% @doc dec2hex taken from gtk.erl in std dist -%% M = integer() -- number of hex digits required +%% @doc Returns a string with the hexadecimal representation of a given decimal. %% N = integer() -- the number to represent as hex -%% @spec dec2hex(M::integer(), N::integer()) -> string() -dec2hex(M,N) -> dec2hex(M,N,[]). - -dec2hex(0,_N,Ack) -> Ack; -dec2hex(M,N,Ack) -> dec2hex(M-1,N bsr 4,[d2h(N band 15)|Ack]). +%% @spec dec2hex(N::integer()) -> string() +dec2hex(N) -> lists:flatten(io_lib:format("~.16B", [N])). %% @doc Implements the base64 encoding algorithm. The output data type matches in the input data type. %% @spec encode_base64(In) -> Out