aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets/src/http_server/mod_actions.erl
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2010-12-01 10:24:51 +0100
committerIngela Anderton Andin <[email protected]>2010-12-01 10:24:51 +0100
commit7369151bc24d9d3b0b1ebed19a1a7d0df9101a81 (patch)
treeb34ce11c1aa8ee57d363983d1f8d382ea3a7b64a /lib/inets/src/http_server/mod_actions.erl
parentd9a508b6ca18ce3bf76563c89bf452e74fa65d45 (diff)
parentf05d42599f3c8fa3632ca04c21a5f91100275feb (diff)
downloadotp-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_actions.erl')
-rw-r--r--lib/inets/src/http_server/mod_actions.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/inets/src/http_server/mod_actions.erl b/lib/inets/src/http_server/mod_actions.erl
index d50ed4b16c..c3946ff9b4 100644
--- a/lib/inets/src/http_server/mod_actions.erl
+++ b/lib/inets/src/http_server/mod_actions.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,load/2, store/2]).
-include("httpd.hrl").
+-include("httpd_internal.hrl").
%% do