diff options
| author | Erlang/OTP <[email protected]> | 2018-07-20 14:09:37 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2018-07-20 14:09:37 +0200 |
| commit | beac5e5e0795e7814f317e55dd3746082e3e5202 (patch) | |
| tree | 0b87af9073884aefe129e37d94ce0345a3095c55 | |
| parent | ad2205cd987bd701207b584bc6a425ffee247a1c (diff) | |
| parent | e3e6085d1896b27a4a416f1afa0bb8f090edcc49 (diff) | |
| download | otp-beac5e5e0795e7814f317e55dd3746082e3e5202.tar.gz otp-beac5e5e0795e7814f317e55dd3746082e3e5202.tar.bz2 otp-beac5e5e0795e7814f317e55dd3746082e3e5202.zip | |
Merge branch 'ingela/inets/error-handling-eisdir-mod-get/ERIERL-207/OTP-15192' into maint-20
* ingela/inets/error-handling-eisdir-mod-get/ERIERL-207/OTP-15192:
inets: Prepare for release
inets: Improve error handling
| -rw-r--r-- | lib/inets/src/http_server/httpd_file.erl | 3 | ||||
| -rw-r--r-- | lib/inets/test/httpd_SUITE.erl | 15 | ||||
| -rw-r--r-- | lib/inets/vsn.mk | 2 |
3 files changed, 17 insertions, 3 deletions
diff --git a/lib/inets/src/http_server/httpd_file.erl b/lib/inets/src/http_server/httpd_file.erl index 4d419172d0..fb71834e95 100644 --- a/lib/inets/src/http_server/httpd_file.erl +++ b/lib/inets/src/http_server/httpd_file.erl @@ -33,6 +33,9 @@ handle_error(enoent, Op, ModData, Path) -> handle_error(enotdir, Op, ModData, Path) -> handle_error(404, Op, ModData, Path, ": A component of the file name is not a directory"); +handle_error(eisdir, Op, ModData, Path) -> + handle_error(403, Op, ModData, Path, + ":Ilegal operation expected a file not a directory"); handle_error(emfile, Op, _ModData, Path) -> handle_error(500, Op, none, Path, ": Too many open files"); handle_error({enfile,_}, Op, _ModData, Path) -> diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl index 9a85c51d24..6981dc901a 100644 --- a/lib/inets/test/httpd_SUITE.erl +++ b/lib/inets/test/httpd_SUITE.erl @@ -441,8 +441,19 @@ get(Config) when is_list(Config) -> {header, "Content-Type", "text/html"}, {header, "Date"}, {header, "Server"}, + {version, Version}]), + + ok = httpd_test_lib:verify_request(proplists:get_value(type, Config), Host, + proplists:get_value(port, Config), + transport_opts(Type, Config), + proplists:get_value(node, Config), + http_request("GET /open/ ", Version, Host), + [{statuscode, 403}, + {header, "Content-Type", "text/html"}, + {header, "Date"}, + {header, "Server"}, {version, Version}]). - + basic_auth_1_1(Config) when is_list(Config) -> basic_auth([{http_version, "HTTP/1.1"} | Config]). @@ -1930,7 +1941,7 @@ head_status(_) -> basic_conf() -> [{modules, [mod_alias, mod_range, mod_responsecontrol, - mod_trace, mod_esi, mod_cgi, mod_dir, mod_get, mod_head]}]. + mod_trace, mod_esi, mod_cgi, mod_get, mod_head]}]. auth_access_conf() -> [{modules, [mod_alias, mod_htaccess, mod_dir, mod_get, mod_head]}, diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk index 1b21956a62..cf4a27147d 100644 --- a/lib/inets/vsn.mk +++ b/lib/inets/vsn.mk @@ -19,6 +19,6 @@ # %CopyrightEnd% APPLICATION = inets -INETS_VSN = 6.5.2.1 +INETS_VSN = 6.5.2.2 PRE_VSN = APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)" |