From 2076f83e81ab7ca9d1aa1bcf50764abe50035bd7 Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Mon, 16 May 2016 15:36:56 +0200 Subject: inets: httpd_util:split does not return {error, Reason} Fix return value handling that was missed when code was refactored to use re-module. --- lib/inets/src/http_server/httpd_response.erl | 3 +-- 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 -> -- cgit v1.2.3