diff options
| author | Ingela Anderton Andin <[email protected]> | 2016-05-16 15:36:56 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2016-05-16 15:36:56 +0200 |
| commit | 2076f83e81ab7ca9d1aa1bcf50764abe50035bd7 (patch) | |
| tree | 3e46c80e4ee855021baf2114d4835d9977533e31 | |
| parent | f4c71989ae8dc3c290e9236f38543bee0a6a8e77 (diff) | |
| download | otp-2076f83e81ab7ca9d1aa1bcf50764abe50035bd7.tar.gz otp-2076f83e81ab7ca9d1aa1bcf50764abe50035bd7.tar.bz2 otp-2076f83e81ab7ca9d1aa1bcf50764abe50035bd7.zip | |
inets: httpd_util:split does not return {error, Reason}
Fix return value handling that was missed when code was refactored to
use re-module.
| -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 -> |