Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
David Goulet
Tor
Commits
400cee26
Unverified
Commit
400cee26
authored
Nov 25, 2019
by
teor
Browse files
Merge remote-tracking branch 'tor-github/pr/1422' into maint-0.3.5
parents
54c01119
4a8d4913
Changes
2
Hide whitespace changes
Inline
Side-by-side
changes/ticket32058
0 → 100644
View file @
400cee26
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.
src/core/mainloop/periodic.c
View file @
400cee26
...
@@ -137,6 +137,11 @@ periodic_event_destroy(periodic_event_item_t *event)
...
@@ -137,6 +137,11 @@ periodic_event_destroy(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
;
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment