memcache: correct dead server check; see #1230; thanks @rpluem-vf

on APR_NOTFOUND Signed-off-by: Hans Zandbelt <[email protected]>
OpenIDC · Jun 18, 2024 · 30d9a55 · 30d9a55
1 parent 28557c1
commit 30d9a55
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+06/18/2024
+- memcache: correct dead server check on APR_NOTFOUND; see #1230; thanks @rpluem-vf
+
 06/08/2024
 - support DPoP nonces to the userinfo endpoint
 

diff --git a/src/cache/memcache.c b/src/cache/memcache.c
@@ -223,11 +223,12 @@ static char *oidc_cache_memcache_get_key(apr_pool_t *pool, const char *section,
  * check dead/alive status for all servers
  */
 static apr_byte_t oidc_cache_memcache_status(request_rec *r, oidc_cache_cfg_memcache_t *context) {
-	int rc = TRUE;
-	int i;
-	for (i = 0; rc && i < context->cache_memcache->ntotal; i++)
-		rc = rc && (context->cache_memcache->live_servers[0]->status != APR_MC_SERVER_DEAD);
-	return rc;
+	int i = 0;
+	for (i = 0; i < context->cache_memcache->ntotal; i++) {
+		if (context->cache_memcache->live_servers[i]->status != APR_MC_SERVER_DEAD)
+			return TRUE;
+	}
+	return FALSE;
 }
 
 /*