Skip to content

Commit 278ba02

Browse files
authored
Merge pull request #1323 from atzm/metrics-fix-segv
metrics: avoid possible segfault after restart twice
2 parents 0611aab + bbdd3d0 commit 278ba02

File tree

3 files changed

+5
-0
lines changed

3 files changed

+5
-0
lines changed

AUTHORS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,3 +95,4 @@ reporting bugs, providing fixes, suggesting useful features or other:
9595
ryanwilliamnicholls <https://github.com/ryanwilliamnicholls>
9696
Dmitrii Ermakov <https://github.com/ErmakovDmitriy>
9797
tarteens <https://github.com/tarteens>
98+
Atzm WATANABE <https://github.com/atzm>

ChangeLog

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
05/23/2025
2+
- metrics: avoid possible segfault after restart twice
3+
14
05/17/2025
25
- code: refactor util.c into util/ directory
36

src/metrics.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -879,6 +879,7 @@ apr_status_t oidc_metrics_cleanup(server_rec *s) {
879879
apr_thread_join(&rv, _oidc_metrics_thread);
880880
if (rv != APR_SUCCESS)
881881
oidc_serror(s, "apr_thread_join failed");
882+
_oidc_metrics_thread_exit = FALSE;
882883
_oidc_metrics_thread = NULL;
883884

884885
/* delete the shared memory segment if we are in the parent process */

0 commit comments

Comments
 (0)