diff options
| author | Erlang/OTP <[email protected]> | 2016-01-29 15:13:38 +0100 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2016-01-29 15:13:38 +0100 |
| commit | 80e2ab864725f62ba0e4e8e6d1d14ac4272c9ab2 (patch) | |
| tree | 60f2d2fa5efdb3a837a3102388c5462ab32f0ef0 /lib/inets/src/tftp/tftp_lib.erl | |
| parent | 7cf9a621c5280a3e97967c4c63ab6ca1adde69c3 (diff) | |
| parent | a6a766143bd5332ff0173a9a3c05e3b36d20297c (diff) | |
| download | otp-80e2ab864725f62ba0e4e8e6d1d14ac4272c9ab2.tar.gz otp-80e2ab864725f62ba0e4e8e6d1d14ac4272c9ab2.tar.bz2 otp-80e2ab864725f62ba0e4e8e6d1d14ac4272c9ab2.zip | |
Merge branch 'ia/maint/inets/mod_alias/OTP-13248' into maint-18
* ia/maint/inets/mod_alias/OTP-13248:
inets: Prepare for release
inets: Traverse all aliases looking for the longest match
inets: Use re instead of inets_regexp
# Conflicts:
# lib/inets/vsn.mk
Diffstat (limited to 'lib/inets/src/tftp/tftp_lib.erl')
| -rw-r--r-- | lib/inets/src/tftp/tftp_lib.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/inets/src/tftp/tftp_lib.erl b/lib/inets/src/tftp/tftp_lib.erl index 71327f8023..01dea97d07 100644 --- a/lib/inets/src/tftp/tftp_lib.erl +++ b/lib/inets/src/tftp/tftp_lib.erl @@ -184,7 +184,7 @@ do_parse_config([{Key, Val} | Tail], Config) when is_record(Config, config) -> callback -> case Val of {RegExp, Mod, State} when is_list(RegExp), is_atom(Mod) -> - case inets_regexp:parse(RegExp) of + case re:compile(RegExp) of {ok, Internal} -> Callback = #callback{regexp = RegExp, internal = Internal, @@ -253,7 +253,7 @@ do_parse_config(Options, Config) when is_record(Config, config) -> add_default_callbacks(Callbacks) -> RegExp = "", - {ok, Internal} = inets_regexp:parse(RegExp), + {ok, Internal} = re:compile(RegExp), File = #callback{regexp = RegExp, internal = Internal, module = tftp_file, |