From fbc7d1c771756e841c5277d61e44c4d97a620b75 Mon Sep 17 00:00:00 2001 From: Atzm WATANABE Date: Fri, 23 May 2025 00:11:46 +0900 Subject: [PATCH 1/2] metrics: avoid possible segfault after restart twice Accessing the metrics endpoint after restarting apachectl twice can result in a segfault due to internal state corruption, especially when using prefork mpm. Signed-off-by: Atzm WATANABE --- src/metrics.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/metrics.c b/src/metrics.c index 2620eb49..b227a1c7 100644 --- a/src/metrics.c +++ b/src/metrics.c @@ -879,6 +879,7 @@ apr_status_t oidc_metrics_cleanup(server_rec *s) { apr_thread_join(&rv, _oidc_metrics_thread); if (rv != APR_SUCCESS) oidc_serror(s, "apr_thread_join failed"); + _oidc_metrics_thread_exit = FALSE; _oidc_metrics_thread = NULL; /* delete the shared memory segment if we are in the parent process */ From bbdd3d0fca087222f420f3d810dac8db8ed8af37 Mon Sep 17 00:00:00 2001 From: Atzm WATANABE Date: Fri, 23 May 2025 00:56:54 +0900 Subject: [PATCH 2/2] update ChangeLog and AUTHORS Signed-off-by: Atzm WATANABE --- AUTHORS | 1 + ChangeLog | 3 +++ 2 files changed, 4 insertions(+) diff --git a/AUTHORS b/AUTHORS index a9ae4b0f..08661d40 100644 --- a/AUTHORS +++ b/AUTHORS @@ -95,3 +95,4 @@ reporting bugs, providing fixes, suggesting useful features or other: ryanwilliamnicholls Dmitrii Ermakov tarteens + Atzm WATANABE diff --git a/ChangeLog b/ChangeLog index b044b785..69f8ba4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +05/23/2025 +- metrics: avoid possible segfault after restart twice + 05/17/2025 - code: refactor util.c into util/ directory