diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2018-07-17 20:50:58 +0200 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2018-07-17 20:50:58 +0200 |
| commit | 68c9328a9c9c74df79e66d008a1d25ff64cfd33f (patch) | |
| tree | ad78006dfd881ff0b09a54a5132239c0fce01e66 /src/ejabberd_captcha.erl | |
| parent | mod_http_upload: Add "Allow" to OPTIONS response (diff) | |
Move cancel_timer/1 function into 'misc' module
Diffstat (limited to 'src/ejabberd_captcha.erl')
| -rw-r--r-- | src/ejabberd_captcha.erl | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/ejabberd_captcha.erl b/src/ejabberd_captcha.erl index a0c731c9a..f366b4175 100644 --- a/src/ejabberd_captcha.erl +++ b/src/ejabberd_captcha.erl @@ -517,11 +517,7 @@ recv_data(Port, TRef, Buf) -> end. return(Port, TRef, Result) -> - case erlang:cancel_timer(TRef) of - false -> - receive {timeout, TRef, _} -> ok after 0 -> ok end; - _ -> ok - end, + misc:cancel_timer(TRef), catch port_close(Port), Result. @@ -561,7 +557,7 @@ check_captcha(Id, ProvidedKey) -> case ets:lookup(captcha, Id) of [#captcha{pid = Pid, args = Args, key = ValidKey, tref = Tref}] -> ets:delete(captcha, Id), - erlang:cancel_timer(Tref), + misc:cancel_timer(Tref), if ValidKey == ProvidedKey -> callback(captcha_succeed, Pid, Args), captcha_valid; |