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/tftp/tftp_lib.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/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, |