aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src
diff options
context:
space:
mode:
authorJohn Högberg <[email protected]>2018-07-24 08:51:26 +0200
committerJohn Högberg <[email protected]>2018-07-24 08:51:26 +0200
commita6f8c69c4ea731c50d146e6cea5b2cd8f96e45a0 (patch)
tree53699383cb0e25d246a44f21e76ba60c8332e213 /lib/inets/src
parentc814c388d5c45c8d70426389e702426424086eca (diff)
parent958ad184c843ce32497eef319f10db7a3a3759c2 (diff)
downloadotp-a6f8c69c4ea731c50d146e6cea5b2cd8f96e45a0.tar.gz
otp-a6f8c69c4ea731c50d146e6cea5b2cd8f96e45a0.tar.bz2
otp-a6f8c69c4ea731c50d146e6cea5b2cd8f96e45a0.zip
Merge branch 'maint'
* maint: Fix typo in xmerl_scan:string/1 Updated OTP version Prepare release ssl: Engine key trumps certfile option inets: Prepare for release inets: Improve error handling
Diffstat (limited to 'lib/inets/src')
-rw-r--r--lib/inets/src/http_server/httpd_file.erl3
1 files changed, 3 insertions, 0 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) ->