summaryrefslogtreecommitdiff
path: root/src/ibrowse
diff options
context:
space:
mode:
authorJan Lehnardt <jan@apache.org>2010-07-02 14:01:56 +0000
committerJan Lehnardt <jan@apache.org>2010-07-02 14:01:56 +0000
commit761c3cf2dbbf72313c25790550d340eb1f9dfa06 (patch)
tree221f3c898935c1375f1f67ae6f983d0065104da7 /src/ibrowse
parenta31af00799e3ec34dc69df43a4f687ad80e71a89 (diff)
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
Diffstat (limited to 'src/ibrowse')
-rw-r--r--src/ibrowse/ibrowse_http_client.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ibrowse/ibrowse_http_client.erl b/src/ibrowse/ibrowse_http_client.erl
index 5f62f705..a767b84e 100644
--- a/src/ibrowse/ibrowse_http_client.erl
+++ b/src/ibrowse/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) ->