mod_auth_digest: avoid crash if shm init fails.

trunk patch: https://svn.apache.org/r1463047
Submitted by: sf
Reviewed by: humbedooh, covener

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1476676 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index e6fd7d963259689754871d9a2d81fa77ebd26541..8dd8a68e5e9f97778409f9a8ac5c22e7d4111c18 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.5
 
+  *) mod_auth_digest: Fix crashes if shm initialization failed. [Stefan
+     Fritsch]
+
   *) htpasswd, htdbm: Fix password generation. PR 54735. [Stefan Fritsch]
 
   *) core: Add workaround for gcc bug on sparc/64bit. PR 52900.

diff --git a/STATUS b/STATUS
index b88dda577b4f9debda601757cda93996ce2857ae..2ad0357963e50651e85f3a9e580f0706e3325c7d 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -90,10 +90,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-    * mod_auth_digest: avoid crash if shm init fails.
-      trunk patches: https://svn.apache.org/r1463047
-      2.4.x patch: trunk patches work
-      +1: sf, humbedooh, covener
 
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:

diff --git a/modules/aaa/mod_auth_digest.c b/modules/aaa/mod_auth_digest.c
index 70703b9c5ef41ad070df3a4dc6adbcd0740fbe81..987e5b5b0452af702e8cd4dfc6f37ff99a34e50d 100644 (file)
--- a/modules/aaa/mod_auth_digest.c
+++ b/modules/aaa/mod_auth_digest.c
@@ -223,6 +223,8 @@ static apr_status_t cleanup_tables(void *not_used)
         opaque_lock = NULL;
     }
 
+    client_list = NULL;
+
     return APR_SUCCESS;
 }