couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject [15/33] ibrowse commit: updated refs/heads/import-master to 1167b0e
Date Wed, 12 Feb 2014 06:21:04 GMT
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 <jan@apache.org>
Authored: Fri Jul 2 14:01:56 2010 +0000
Committer: Jan Lehnardt <jan@apache.org>
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) ->


Mime
View raw message