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_include.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_include.erl')
-rw-r--r-- | lib/inets/src/http_server/mod_include.erl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/inets/src/http_server/mod_include.erl b/lib/inets/src/http_server/mod_include.erl index 534eba8a36..35f45bdd33 100644 --- a/lib/inets/src/http_server/mod_include.erl +++ b/lib/inets/src/http_server/mod_include.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 @@ -21,6 +21,7 @@ -export([do/1,parse/2,config/6,include/6,echo/6,fsize/6,flastmod/6,exec/6]). -include("httpd.hrl"). +-include("httpd_internal.hrl"). -define(VMODULE,"INCLUDE"). @@ -186,9 +187,9 @@ document_uri(ConfigDB, RequestURI) -> FileName = string:substr(Path,Start,Length), case inets_regexp:match(VirtualPath, FileName++"\$") of {match, _, _} -> - httpd_util:decode_hex(VirtualPath)++AfterPath; + http_uri:decode(VirtualPath)++AfterPath; nomatch -> - string:strip(httpd_util:decode_hex(VirtualPath),right,$/)++ + string:strip(http_uri:decode(VirtualPath),right,$/)++ "/"++FileName++AfterPath end. |