Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3E7831017B for ; Wed, 12 Feb 2014 06:24:38 +0000 (UTC) Received: (qmail 3776 invoked by uid 500); 12 Feb 2014 06:21:12 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 3423 invoked by uid 500); 12 Feb 2014 06:21:02 -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 3141 invoked by uid 99); 12 Feb 2014 06:20:53 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 12 Feb 2014 06:20:53 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4507255465; Wed, 12 Feb 2014 06:20:52 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davisp@apache.org To: commits@couchdb.apache.org Date: Wed, 12 Feb 2014 06:21:04 -0000 Message-Id: <278ccc6d433f4ec1acc406bcf4aff0ca@git.apache.org> In-Reply-To: <9e360a991c2f4811996c0b3e7448668a@git.apache.org> References: <9e360a991c2f4811996c0b3e7448668a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [15/33] ibrowse commit: updated refs/heads/import-master to 1167b0e Backport warning fix from a future version of ibrowse. The current release makes our test suite fail and I don't want to pester the 1.0.0 release cycle with this; yet I'd like 1.0.0 (and 0.11.1) to be future proof for Erlang R14B. git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@959988 13f79535-47bb-0310-9956-ffa450edef68 Project: http://git-wip-us.apache.org/repos/asf/couchdb-ibrowse/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-ibrowse/commit/c166256d Tree: http://git-wip-us.apache.org/repos/asf/couchdb-ibrowse/tree/c166256d Diff: http://git-wip-us.apache.org/repos/asf/couchdb-ibrowse/diff/c166256d Branch: refs/heads/import-master Commit: c166256d5d1826d946987d01a148be4136aebd54 Parents: f2a473e Author: Jan Lehnardt Authored: Fri Jul 2 14:01:56 2010 +0000 Committer: Jan Lehnardt Committed: Fri Jul 2 14:01:56 2010 +0000 ---------------------------------------------------------------------- ibrowse_http_client.erl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-ibrowse/blob/c166256d/ibrowse_http_client.erl ---------------------------------------------------------------------- diff --git a/ibrowse_http_client.erl b/ibrowse_http_client.erl index 5f62f70..a767b84 100644 --- a/ibrowse_http_client.erl +++ b/ibrowse_http_client.erl @@ -352,7 +352,7 @@ accumulate_response(Data, #state{reply_buffer = RepBuf, stream_chunk_size = Stream_chunk_size, response_format = Response_format, caller_controls_socket = Caller_controls_socket} = CurReq, - RepBuf_1 = concat_binary([RepBuf, Data]), + RepBuf_1 = list_to_binary([RepBuf, Data]), New_data_size = RepBufSize - Streamed_size, case StreamTo of undefined -> @@ -1201,9 +1201,9 @@ scan_crlf_1(Bin1_head_size, Bin1, Bin2) -> case get_crlf_pos(Bin3) of {yes, Pos} -> {Prefix, <<_, _, Suffix/binary>>} = split_binary(Bin3, Pos), - {yes, concat_binary([Bin1_head, Prefix]), Suffix}; + {yes, list_to_binary([Bin1_head, Prefix]), Suffix}; no -> - {no, concat_binary([Bin1, Bin2])} + {no, list_to_binary([Bin1, Bin2])} end. get_crlf_pos(Bin) ->