diff options
author | Raimo Niskanen <raimo@erlang.org> | 2016-04-15 12:20:16 +0200 |
---|---|---|
committer | Raimo Niskanen <raimo@erlang.org> | 2016-04-15 12:20:16 +0200 |
commit | f3c2071cc0bbe776f1d301d4fc346c1d261c1533 (patch) | |
tree | c839e51cbf0aacbaada69cc9c4d35df7b0978e96 /lib/kernel | |
parent | 43da27568b55d664ef8abc9b125e54ec8674603e (diff) | |
parent | e8f83e476ffc47d63696ce8a11e71ab6213809c2 (diff) | |
download | otp-f3c2071cc0bbe776f1d301d4fc346c1d261c1533.tar.gz otp-f3c2071cc0bbe776f1d301d4fc346c1d261c1533.tar.bz2 otp-f3c2071cc0bbe776f1d301d4fc346c1d261c1533.zip |
Merge branch 'paulgray/inet_db_fix/PR-949/OTP-13470'
* paulgray/inet_db_fix/PR-949/OTP-13470:
Fix start timestamp instead of time check
Allow to refresh resolver settings on startup
Diffstat (limited to 'lib/kernel')
-rw-r--r-- | lib/kernel/src/inet_db.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/kernel/src/inet_db.erl b/lib/kernel/src/inet_db.erl index d5c5205dbc..465cec1b45 100644 --- a/lib/kernel/src/inet_db.erl +++ b/lib/kernel/src/inet_db.erl @@ -1206,7 +1206,8 @@ handle_set_file(Option, Fname, TagTm, TagInfo, ParseFun, From, File = filename:flatten(Fname), ets:insert(Db, {res_optname(Option), File}), ets:insert(Db, {TagInfo, undefined}), - ets:insert(Db, {TagTm, 0}), + TimeZero = - (?RES_FILE_UPDATE_TM + 1), % Early enough + ets:insert(Db, {TagTm, TimeZero}), {reply,ok,State}; true -> File = filename:flatten(Fname), |