aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2015-10-05 11:00:48 +0200
committerErlang/OTP <[email protected]>2015-10-05 11:00:48 +0200
commit387eed25bdf60098dd7972c674fb2a982686c220 (patch)
tree2b962aef03892276bef9590e30a1c11d2846618a
parentcf1351a19b7c3edd613d1c8cde139f917f7583cb (diff)
parent0bc3430528ff489ba9ae1cc93a3d6e729f0c0c7a (diff)
downloadotp-387eed25bdf60098dd7972c674fb2a982686c220.tar.gz
otp-387eed25bdf60098dd7972c674fb2a982686c220.tar.bz2
otp-387eed25bdf60098dd7972c674fb2a982686c220.zip
Merge branch 'ia/inets/string-not-atom/OTP-13022' into maint-18
* ia/inets/string-not-atom/OTP-13022: inets: Use ?MODULE_STRING instead of ?MODULE as argument should be a string
-rw-r--r--lib/inets/src/http_server/mod_auth_server.erl2
-rw-r--r--lib/inets/src/http_server/mod_security_server.erl4
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/inets/src/http_server/mod_auth_server.erl b/lib/inets/src/http_server/mod_auth_server.erl
index 3685c2e617..7d1e1a3431 100644
--- a/lib/inets/src/http_server/mod_auth_server.erl
+++ b/lib/inets/src/http_server/mod_auth_server.erl
@@ -316,7 +316,7 @@ lookup(Db, Key) ->
make_name(Addr, Port, Profile) ->
- httpd_util:make_name(?MODULE, Addr, Port, Profile).
+ httpd_util:make_name(?MODULE_STRING, Addr, Port, Profile).
call(Name, Req) ->
diff --git a/lib/inets/src/http_server/mod_security_server.erl b/lib/inets/src/http_server/mod_security_server.erl
index 81561493a0..f9281b0fdc 100644
--- a/lib/inets/src/http_server/mod_security_server.erl
+++ b/lib/inets/src/http_server/mod_security_server.erl
@@ -523,10 +523,10 @@ unblock_user(Info, User, Dir, Addr, Port, Profile, ETS, DETS, CBModule) ->
ets:match_delete(ETS, {blocked_user, {User, Addr, Port, Profile, Dir, '_'}}).
make_name(Addr,Port, Profile) ->
- httpd_util:make_name(?MODULE,Addr,Port, Profile).
+ httpd_util:make_name(?MODULE_STRING, Addr, Port, Profile).
make_name(Addr,Port, Profile, Num) ->
- httpd_util:make_name(?MODULE,Addr,Port,
+ httpd_util:make_name(?MODULE_STRING, Addr,Port,
atom_to_list(Profile) ++ "__" ++ integer_to_list(Num)).
auth_fail_event(Mod,Addr,Port,Dir,User,Passwd) ->