diff options
author | Zandra <[email protected]> | 2016-01-29 17:43:37 +0100 |
---|---|---|
committer | Zandra <[email protected]> | 2016-01-29 17:43:37 +0100 |
commit | 57a928b4bc1076b169ecc95e38ab23cf79e03280 (patch) | |
tree | b6edbc2d2238d742772239f7dd64556067071b2f /lib/inets/src/http_server/mod_security.erl | |
parent | 3eb54b2053f76d3d47eed8774153be0f7a5016c3 (diff) | |
parent | d96471b3f404f7341279d8598dd74d92fb1a923c (diff) | |
download | otp-57a928b4bc1076b169ecc95e38ab23cf79e03280.tar.gz otp-57a928b4bc1076b169ecc95e38ab23cf79e03280.tar.bz2 otp-57a928b4bc1076b169ecc95e38ab23cf79e03280.zip |
Merge branch 'maint-18' into maint
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) |