aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-03-13 13:47:30 +0100
committerFredrik Gustafsson <[email protected]>2013-03-13 13:47:30 +0100
commit09fa1ba9b2f4becf68912bcfc4692d226344d920 (patch)
tree138126046b1aa797ac50b0cee4d54e15881a6100
parent03bc63bed74af4c392d160005b77aca43d4cd4aa (diff)
parent218eee148e1edbe9ea69743525ed31b9272b06af (diff)
downloadotp-09fa1ba9b2f4becf68912bcfc4692d226344d920.tar.gz
otp-09fa1ba9b2f4becf68912bcfc4692d226344d920.tar.bz2
otp-09fa1ba9b2f4becf68912bcfc4692d226344d920.zip
Merge branch 'fredrik/inets/header-error' into maint
* fredrik/inets/header-error: Added guard for invalid field and values in headers
-rw-r--r--lib/inets/src/http_client/httpc.erl16
-rw-r--r--lib/inets/test/httpc_SUITE.erl7
2 files changed, 19 insertions, 4 deletions
diff --git a/lib/inets/src/http_client/httpc.erl b/lib/inets/src/http_client/httpc.erl
index ede649a5a9..64a60b82aa 100644
--- a/lib/inets/src/http_client/httpc.erl
+++ b/lib/inets/src/http_client/httpc.erl
@@ -163,8 +163,13 @@ request(Method,
{error, Reason} ->
{error, Reason};
{ok, ParsedUrl} ->
- handle_request(Method, Url, ParsedUrl, Headers, [], [],
- HTTPOptions, Options, Profile)
+ case header_parse(Headers) of
+ {error, Reason} ->
+ {error, Reason};
+ _ ->
+ handle_request(Method, Url, ParsedUrl, Headers, [], [],
+ HTTPOptions, Options, Profile)
+ end
end;
request(Method,
@@ -1247,7 +1252,12 @@ uri_parse(URI, Opts) ->
%%--------------------------------------------------------------------------
-
+header_parse([]) ->
+ ok;
+header_parse([{Field, Value}|T]) when is_list(Field), is_list(Value) ->
+ header_parse(T);
+header_parse(_) ->
+ {error, {headers_error, not_strings}}.
child_name2info(undefined) ->
{error, no_such_service};
child_name2info(httpc_manager) ->
diff --git a/lib/inets/test/httpc_SUITE.erl b/lib/inets/test/httpc_SUITE.erl
index 8df5964193..c20ec63448 100644
--- a/lib/inets/test/httpc_SUITE.erl
+++ b/lib/inets/test/httpc_SUITE.erl
@@ -83,7 +83,8 @@ real_requests()->
stream_through_fun,
stream_through_mfa,
streaming_error,
- inet_opts
+ inet_opts,
+ invalid_headers
].
only_simulated() ->
@@ -795,6 +796,10 @@ headers_dummy(Config) when is_list(Config) ->
%%-------------------------------------------------------------------------
+invalid_headers(Config) ->
+ Request = {url(group_name(Config), "/dummy.html", Config), [{"cookie", undefined}]},
+ {error, _} = httpc:request(get, Request, [], []).
+
remote_socket_close(Config) when is_list(Config) ->
URL = url(group_name(Config), "/just_close.html", Config),
{error, socket_closed_remotely} = httpc:request(URL).