From 22be1754d1e97e802e01181570a34222767c1ed6 Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Tue, 7 Aug 2018 09:29:35 +0200 Subject: inets: Use status code 501 when no mod_* handles the request Conflicts: lib/inets/test/httpd_SUITE.erl --- lib/inets/src/http_server/httpd_response.erl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'lib/inets/src') diff --git a/lib/inets/src/http_server/httpd_response.erl b/lib/inets/src/http_server/httpd_response.erl index 3ee8665a54..bb946664f9 100644 --- a/lib/inets/src/http_server/httpd_response.erl +++ b/lib/inets/src/http_server/httpd_response.erl @@ -61,8 +61,12 @@ generate_and_send_response(#mod{config_db = ConfigDB} = ModData) -> {StatusCode, Response} -> %% Old way send_response_old(ModData, StatusCode, Response), ok; - undefined -> - send_status(ModData, 500, none), + undefined -> + %% Happens when no mod_* + %% handles the request + send_status(ModData, 501, {ModData#mod.method, + ModData#mod.request_uri, + ModData#mod.http_version}), ok end end -- cgit v1.2.3 From 0343c6bdeecd5d52b88f18eb82dee5c65fa3b3ad Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Wed, 15 Aug 2018 12:03:30 +0200 Subject: inets: Prepare for release --- lib/inets/src/inets_app/inets.appup.src | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/inets/src') diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index 0dcf66265e..b197590bfd 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -18,10 +18,12 @@ %% %CopyrightEnd% {"%VSN%", [ + {<<"7\\..*">>,[{restart_application, inets}]}, {<<"6\\..*">>,[{restart_application, inets}]}, {<<"5\\..*">>,[{restart_application, inets}]} ], [ + {<<"7\\..*">>,[{restart_application, inets}]}, {<<"6\\..*">>,[{restart_application, inets}]}, {<<"5\\..*">>,[{restart_application, inets}]} ] -- cgit v1.2.3