diff options
author | Ingela Anderton Andin <[email protected]> | 2010-12-01 10:24:51 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2010-12-01 10:24:51 +0100 |
commit | 7369151bc24d9d3b0b1ebed19a1a7d0df9101a81 (patch) | |
tree | b34ce11c1aa8ee57d363983d1f8d382ea3a7b64a /lib/inets/src/http_server/mod_dir.erl | |
parent | d9a508b6ca18ce3bf76563c89bf452e74fa65d45 (diff) | |
parent | f05d42599f3c8fa3632ca04c21a5f91100275feb (diff) | |
download | otp-7369151bc24d9d3b0b1ebed19a1a7d0df9101a81.tar.gz otp-7369151bc24d9d3b0b1ebed19a1a7d0df9101a81.tar.bz2 otp-7369151bc24d9d3b0b1ebed19a1a7d0df9101a81.zip |
Merge branch 'ia/inets/url-encoding/OTP-8940' into dev
* ia/inets/url-encoding/OTP-8940:
Changed file error handling to be consistent
URL-encoding - add support in client and more usage in server. Also added missing include directory.
Diffstat (limited to 'lib/inets/src/http_server/mod_dir.erl')
-rw-r--r-- | lib/inets/src/http_server/mod_dir.erl | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/inets/src/http_server/mod_dir.erl b/lib/inets/src/http_server/mod_dir.erl index cdc7cc01e4..d791ee28e9 100644 --- a/lib/inets/src/http_server/mod_dir.erl +++ b/lib/inets/src/http_server/mod_dir.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1997-2009. All Rights Reserved. +%% Copyright Ericsson AB 1997-2010. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -18,9 +18,11 @@ %% %% -module(mod_dir). --export([do/1]). -include("httpd.hrl"). +-include("httpd_internal.hrl"). + +-export([do/1]). %% do @@ -57,7 +59,7 @@ do_dir(Info) -> case file:read_file_info(DefaultPath) of {ok,FileInfo} when FileInfo#file_info.type == directory -> DecodedRequestURI = - httpd_util:decode_hex(Info#mod.request_uri), + http_uri:decode(Info#mod.request_uri), ?DEBUG("do_dir -> ~n" " Path: ~p~n" " DefaultPath: ~p~n" |