diff options
| author | Ingela Anderton Andin <[email protected]> | 2010-11-26 11:02:15 +0100 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2010-11-29 10:45:42 +0100 |
| commit | d678ee003cd02d3cdffabfd13cc96f8d493dbf0d (patch) | |
| tree | ccca7fe2e385565a5fbcb70f1e60c600d4868542 /lib/inets/src/http_server/mod_include.erl | |
| parent | 839dcbfe1285b292c4208c696ceae4b22c46aff7 (diff) | |
| download | otp-d678ee003cd02d3cdffabfd13cc96f8d493dbf0d.tar.gz otp-d678ee003cd02d3cdffabfd13cc96f8d493dbf0d.tar.bz2 otp-d678ee003cd02d3cdffabfd13cc96f8d493dbf0d.zip | |
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. |