Fix PR 17864, and also fixes a SEGV problem when SHMHT was used.

The porting of the code from mod_ssl 1.3.x was still incomplete, and depended
upon a complete implentation of apr_shm (hence pieces of code was #if 0'ed out).

PR: 17864
Submitted by:	Andreas Leimbacher <andreasl67@yahoo.de>
Reviewed by:	madhum, jerenkrantz, striker, jim

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

diff --git a/CHANGES b/CHANGES
index 858cdef9daddfef05242ad5e34619b3bd632b2cf..db1a9c2c1c729a1c8258e1584d064242423a575d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0.46
 
+  *) ssl session caching(shmht) : Fix a SEGV problem with SHMHT session
+     caching. PR 17864.
+     [Andreas Leimbacher <andreasl67@yahoo.de>, Madhusudan Mathihalli]
+
   *) Add a delete flag to htpasswd.
      [Thom May]
 

diff --git a/modules/ssl/ssl_util_table.c b/modules/ssl/ssl_util_table.c
index 6c328b85102d6788d195862d6fe411ea7f0e3f74..6e6f1d5c756f9b18c1ff6ee992ea369407bd9a02 100644 (file)
--- a/modules/ssl/ssl_util_table.c
+++ b/modules/ssl/ssl_util_table.c
@@ -989,9 +989,7 @@ int table_set_data_alignment(table_t * table_p, const int alignment)
  */
 int table_clear(table_t * table_p)
 {
-#if 0
     table_entry_t *entry_p, *next_p;
-#endif
     table_entry_t **bucket_p, **bounds_p;
 
     if (table_p == NULL)
@@ -1000,14 +998,12 @@ int table_clear(table_t * table_p)
         return TABLE_ERROR_PNT;
     /* free the table allocation and table structure */
     bounds_p = table_p->ta_buckets + table_p->ta_bucket_n;
-    for (bucket_p = table_p->ta_buckets; bucket_p <= bounds_p; bucket_p++) {
-#if 0
+    for (bucket_p = table_p->ta_buckets; bucket_p < bounds_p; bucket_p++) {
         for (entry_p = *bucket_p; entry_p != NULL; entry_p = next_p) {
             /* record the next pointer before we free */
             next_p = entry_p->te_next_p;
             table_p->ta_free(table_p->opt_param, entry_p);
         }
-#endif
         /* clear the bucket entry after we free its entries */
         *bucket_p = NULL;
     }