nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 07:03:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tor-github/pr/1422' into maint-0.4.2

Browse Source
This commit is contained in:
teor 2019-10-21 13:07:39 +10:00
commit 04e9e74f1d
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/ticket32058 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (mainloop, periodic events):
- Periodic events enabled flag was not unset properly when shutting down tor
cleanly. This had the side effect to not re-enable periodic events when
tor_api.h is used to relaunch tor after a shutdown. Fixes bug 32058;
bugfix on 0.3.3.1-alpha.

5
src/core/mainloop/periodic.c
View File

@ -153,6 +153,11 @@ periodic_event_disconnect(periodic_event_item_t *event)
{ {
if (!event) if (!event)
return; return;
/* First disable the event so we first cancel the event and set its enabled
* flag properly. */
periodic_event_disable(event);
mainloop_event_free(event->ev); mainloop_event_free(event->ev);
event->last_action_time = 0; event->last_action_time = 0;
} }