diff options
| author | Zandra <[email protected]> | 2016-01-29 17:44:07 +0100 |
|---|---|---|
| committer | Zandra <[email protected]> | 2016-01-29 17:44:07 +0100 |
| commit | e038cbe699acc19901e10b9569a3b783e900582d (patch) | |
| tree | b1167aedbaebb835e0a8a59be8528f43b4da3864 /lib/inets/src/http_server/mod_security.erl | |
| parent | 8a6abf9ac1ce0bae427e202b857d03b89086bb8d (diff) | |
| parent | 57a928b4bc1076b169ecc95e38ab23cf79e03280 (diff) | |
| download | otp-e038cbe699acc19901e10b9569a3b783e900582d.tar.gz otp-e038cbe699acc19901e10b9569a3b783e900582d.tar.bz2 otp-e038cbe699acc19901e10b9569a3b783e900582d.zip | |
Merge branch 'maint'
Conflicts:
OTP_VERSION
Diffstat (limited to 'lib/inets/src/http_server/mod_security.erl')
| -rw-r--r-- | lib/inets/src/http_server/mod_security.erl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/inets/src/http_server/mod_security.erl b/lib/inets/src/http_server/mod_security.erl index 20f87619c1..1f936d598a 100644 --- a/lib/inets/src/http_server/mod_security.erl +++ b/lib/inets/src/http_server/mod_security.erl @@ -273,12 +273,12 @@ secret_path(_Path, [], to_be_found) -> secret_path(_Path, [], Dir) -> {yes, Dir}; secret_path(Path, [[NewDir]|Rest], Dir) -> - case inets_regexp:match(Path, NewDir) of - {match, _, _} when Dir =:= to_be_found -> + case re:run(Path, NewDir, [{capture, first}]) of + {match, _} when Dir =:= to_be_found -> secret_path(Path, Rest, NewDir); - {match, _, Length} when Length > length(Dir) -> + {match, [{_, Length}]} when Length > length(Dir) -> secret_path(Path, Rest, NewDir); - {match, _, _} -> + {match, _} -> secret_path(Path, Rest, Dir); nomatch -> secret_path(Path, Rest, Dir) |