Author: jan
Date: Fri Jul 2 14:05:30 2010
New Revision: 959989
URL: http://svn.apache.org/viewvc?rev=959989&view=rev
Log:
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.
Modified:
couchdb/branches/0.11.x/src/ibrowse/ibrowse_http_client.erl
Modified: couchdb/branches/0.11.x/src/ibrowse/ibrowse_http_client.erl
URL:
http://svn.apache.org/viewvc/couchdb/branches/0.11.x/src/ibrowse/ibrowse_http_client.erl?rev=959989&r1=959988&r2=959989&view=diff
==============================================================================
--- couchdb/branches/0.11.x/src/ibrowse/ibrowse_http_client.erl (original)
+++ couchdb/branches/0.11.x/src/ibrowse/ibrowse_http_client.erl Fri Jul 2
14:05:30 2010
@@ -352,7 +352,7 @@ accumulate_response(Data, #state{reply_b
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) ->
