Skip to content

Commit

Permalink
whitespaces
Browse files Browse the repository at this point in the history
  • Loading branch information
benoitc committed Mar 27, 2012
1 parent 6765f42 commit 67eea91
Showing 1 changed file with 19 additions and 19 deletions.
38 changes: 19 additions & 19 deletions src/ibrowse_http_client.erl
Expand Up @@ -46,7 +46,7 @@
reqs=queue:new(), cur_req, status=idle, http_status_code, reqs=queue:new(), cur_req, status=idle, http_status_code,
reply_buffer = <<>>, rep_buf_size=0, streamed_size = 0, reply_buffer = <<>>, rep_buf_size=0, streamed_size = 0,
recvd_headers=[], recvd_headers=[],
status_line, raw_headers, status_line, raw_headers,
is_closing, content_length, is_closing, content_length,
deleted_crlf = false, transfer_encoding, deleted_crlf = false, transfer_encoding,
chunk_size, chunk_size_buffer = <<>>, chunk_size, chunk_size_buffer = <<>>,
Expand All @@ -55,11 +55,11 @@
}). }).


-record(request, {url, method, options, from, -record(request, {url, method, options, from,
stream_to, caller_controls_socket = false, stream_to, caller_controls_socket = false,
caller_socket_options = [], caller_socket_options = [],
req_id, req_id,
stream_chunk_size, stream_chunk_size,
save_response_to_file = false, save_response_to_file = false,
tmp_file_name, tmp_file_fd, preserve_chunked_encoding, tmp_file_name, tmp_file_fd, preserve_chunked_encoding,
response_format, timer_ref}). response_format, timer_ref}).


Expand Down Expand Up @@ -204,7 +204,7 @@ handle_info({stream_close, _Req_id}, State) ->
do_error_reply(State, closing_on_request), do_error_reply(State, closing_on_request),
{stop, normal, State}; {stop, normal, State};


handle_info({tcp_closed, _Sock}, State) -> handle_info({tcp_closed, _Sock}, State) ->
do_trace("TCP connection closed by peer!~n", []), do_trace("TCP connection closed by peer!~n", []),
handle_sock_closed(State), handle_sock_closed(State),
{stop, normal, State}; {stop, normal, State};
Expand Down Expand Up @@ -402,7 +402,7 @@ accumulate_response(Data, #state{reply_buffer = RepBuf,
State#state{reply_buffer = RepBuf_1}; State#state{reply_buffer = RepBuf_1};
_ when Caller_controls_socket == true -> _ when Caller_controls_socket == true ->
do_interim_reply(StreamTo, Response_format, ReqId, RepBuf_1), do_interim_reply(StreamTo, Response_format, ReqId, RepBuf_1),
State#state{reply_buffer = <<>>, State#state{reply_buffer = <<>>,
interim_reply_sent = true, interim_reply_sent = true,
streamed_size = Streamed_size + size(RepBuf_1)}; streamed_size = Streamed_size + size(RepBuf_1)};
_ when New_data_size >= Stream_chunk_size -> _ when New_data_size >= Stream_chunk_size ->
Expand Down Expand Up @@ -710,7 +710,7 @@ send_req_1(From,
{stop, normal, State_1} {stop, normal, State_1}
end; end;


send_req_1(From, Url, Headers, Method, Body, Options, Timeout, send_req_1(From, Url, Headers, Method, Body, Options, Timeout,
#state{proxy_tunnel_setup = in_progress, #state{proxy_tunnel_setup = in_progress,
tunnel_setup_queue = Q} = State) -> tunnel_setup_queue = Q} = State) ->
do_trace("Queued SSL request awaiting tunnel setup: ~n" do_trace("Queued SSL request awaiting tunnel setup: ~n"
Expand All @@ -734,7 +734,7 @@ send_req_1(From,
{Caller, once} when is_pid(Caller) or {Caller, once} when is_pid(Caller) or
is_atom(Caller) -> is_atom(Caller) ->
Async_pid_rec = {{req_id_pid, ReqId}, self()}, Async_pid_rec = {{req_id_pid, ReqId}, self()},
true = ets:insert(ibrowse_stream, Async_pid_rec), true = ets:insert(ibrowse_stream, Async_pid_rec),
{Caller, true}; {Caller, true};
undefined -> undefined ->
{undefined, false}; {undefined, false};
Expand Down Expand Up @@ -923,7 +923,7 @@ is_chunked_encoding_specified(Options) ->
case get_value(transfer_encoding, Options, false) of case get_value(transfer_encoding, Options, false) of
false -> false ->
false; false;
{chunked, _} -> {chunked, _} ->
true; true;
chunked -> chunked ->
true true
Expand Down Expand Up @@ -1034,7 +1034,7 @@ parse_response(Data, #state{reply_buffer = Acc, reqs = Reqs,
put(conn_close, ConnClose), put(conn_close, ConnClose),
TransferEncoding = to_lower(get_value("transfer-encoding", LCHeaders, "false")), TransferEncoding = to_lower(get_value("transfer-encoding", LCHeaders, "false")),
case get_value("content-length", LCHeaders, undefined) of case get_value("content-length", LCHeaders, undefined) of
_ when Method == connect, _ when Method == connect,
hd(StatCode) == $2 -> hd(StatCode) == $2 ->
{_, Reqs_1} = queue:out(Reqs), {_, Reqs_1} = queue:out(Reqs),
cancel_timer(T_ref), cancel_timer(T_ref),
Expand Down Expand Up @@ -1132,7 +1132,7 @@ parse_response(Data, #state{reply_buffer = Acc, reqs = Reqs,
{error, max_headers_size_exceeded} {error, max_headers_size_exceeded}
end. end.


upgrade_to_ssl(#state{socket = Socket, upgrade_to_ssl(#state{socket = Socket,
connect_timeout = Conn_timeout, connect_timeout = Conn_timeout,
ssl_options = Ssl_options, ssl_options = Ssl_options,
tunnel_setup_queue = Q} = State) -> tunnel_setup_queue = Q} = State) ->
Expand Down Expand Up @@ -1172,7 +1172,7 @@ is_connection_closing(_, _) -> false.


%% This clause determines the chunk size when given data from the beginning of the chunk %% This clause determines the chunk size when given data from the beginning of the chunk
parse_11_response(DataRecvd, parse_11_response(DataRecvd,
#state{transfer_encoding = chunked, #state{transfer_encoding = chunked,
chunk_size = chunk_start, chunk_size = chunk_start,
chunk_size_buffer = Chunk_sz_buf chunk_size_buffer = Chunk_sz_buf
} = State) -> } = State) ->
Expand Down Expand Up @@ -1200,7 +1200,7 @@ parse_11_response(DataRecvd,
%% This clause is to remove the CRLF between two chunks %% This clause is to remove the CRLF between two chunks
%% %%
parse_11_response(DataRecvd, parse_11_response(DataRecvd,
#state{transfer_encoding = chunked, #state{transfer_encoding = chunked,
chunk_size = tbd, chunk_size = tbd,
chunk_size_buffer = Buf chunk_size_buffer = Buf
} = State) -> } = State) ->
Expand All @@ -1219,7 +1219,7 @@ parse_11_response(DataRecvd,
%% not support Trailers in the Chunked Transfer encoding. Any trailer %% not support Trailers in the Chunked Transfer encoding. Any trailer
%% received is silently discarded. %% received is silently discarded.
parse_11_response(DataRecvd, parse_11_response(DataRecvd,
#state{transfer_encoding = chunked, chunk_size = 0, #state{transfer_encoding = chunked, chunk_size = 0,
cur_req = CurReq, cur_req = CurReq,
deleted_crlf = DelCrlf, deleted_crlf = DelCrlf,
chunk_size_buffer = Trailer, chunk_size_buffer = Trailer,
Expand Down Expand Up @@ -1308,9 +1308,9 @@ handle_response(#request{from=From, stream_to=StreamTo, req_id=ReqId,
recvd_headers = RespHeaders}=State) when SaveResponseToFile /= false -> recvd_headers = RespHeaders}=State) when SaveResponseToFile /= false ->
Body = RepBuf, Body = RepBuf,
case Fd of case Fd of
undefined -> undefined ->
ok; ok;
_ -> _ ->
ok = file:close(Fd) ok = file:close(Fd)
end, end,
ResponseBody = case TmpFilename of ResponseBody = case TmpFilename of
Expand Down Expand Up @@ -1623,8 +1623,8 @@ is_whitespace(_) -> false.


send_async_headers(_ReqId, undefined, _, _State) -> send_async_headers(_ReqId, undefined, _, _State) ->
ok; ok;
send_async_headers(ReqId, StreamTo, Give_raw_headers, send_async_headers(ReqId, StreamTo, Give_raw_headers,
#state{status_line = Status_line, raw_headers = Raw_headers, #state{status_line = Status_line, raw_headers = Raw_headers,
recvd_headers = Headers, http_status_code = StatCode, recvd_headers = Headers, http_status_code = StatCode,
cur_req = #request{options = Opts} cur_req = #request{options = Opts}
}) -> }) ->
Expand Down Expand Up @@ -1845,7 +1845,7 @@ set_inac_timer(State, Timeout) when is_integer(Timeout) ->
set_inac_timer(State, _) -> set_inac_timer(State, _) ->
State. State.


get_inac_timeout(#state{cur_req = #request{options = Opts}}) -> get_inac_timeout(#state{cur_req = #request{options = Opts}}) ->
get_value(inactivity_timeout, Opts, infinity); get_value(inactivity_timeout, Opts, infinity);
get_inac_timeout(#state{cur_req = undefined}) -> get_inac_timeout(#state{cur_req = undefined}) ->
case ibrowse:get_config_value(inactivity_timeout, undefined) of case ibrowse:get_config_value(inactivity_timeout, undefined) of
Expand Down Expand Up @@ -1888,5 +1888,5 @@ trace_request_body(Body) ->
ok ok
end. end.


to_binary(X) when is_list(X) -> list_to_binary(X); to_binary(X) when is_list(X) -> list_to_binary(X);
to_binary(X) when is_binary(X) -> X. to_binary(X) when is_binary(X) -> X.

0 comments on commit 67eea91

Please sign in to comment.