diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-05-17 12:03:34 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-05-17 12:03:34 +0200 |
| commit | dca8194f0b17a34306451416f0d94cf3422c1f5d (patch) | |
| tree | 6d283086e345251eff8f617ee3a672e8aa2b29be /lib | |
| parent | 8f950e84bf6118211d0ead2fc8988d551b7ec174 (diff) | |
| parent | 2076f83e81ab7ca9d1aa1bcf50764abe50035bd7 (diff) | |
| download | otp-dca8194f0b17a34306451416f0d94cf3422c1f5d.tar.gz otp-dca8194f0b17a34306451416f0d94cf3422c1f5d.tar.bz2 otp-dca8194f0b17a34306451416f0d94cf3422c1f5d.zip | |
Merge branch 'ingela/inets/dialyzer'
* ingela/inets/dialyzer:
inets: httpd_util:split does not return {error, Reason}
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/inets/src/http_server/httpd_response.erl | 3 | ||||
| -rw-r--r-- | lib/inets/src/http_server/mod_htaccess.erl | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/inets/src/http_server/httpd_response.erl b/lib/inets/src/http_server/httpd_response.erl index c0b5f09faf..1374b7e85e 100644 --- a/lib/inets/src/http_server/httpd_response.erl +++ b/lib/inets/src/http_server/httpd_response.erl @@ -390,8 +390,7 @@ send_response_old(#mod{socket_type = Type, send_header(ModData, StatusCode, [{content_length, content_length(NewResponse)}]), httpd_socket:deliver(Type, Sock, NewResponse); - - {error, _Reason} -> + _ -> send_status(ModData, 500, "Internal Server Error") end. diff --git a/lib/inets/src/http_server/mod_htaccess.erl b/lib/inets/src/http_server/mod_htaccess.erl index 2bc0d79218..7b742bba24 100644 --- a/lib/inets/src/http_server/mod_htaccess.erl +++ b/lib/inets/src/http_server/mod_htaccess.erl @@ -412,8 +412,8 @@ getAuthenticatingDataFromHeader(Info)-> case httpd_util:split(UnCodedString,":",2) of {ok,[User,PassWord]}-> {user,User,PassWord}; - {error,Error}-> - {error,Error} + Other -> + {error, Other} end end; BadCredentials -> |