httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerenkra...@apache.org
Subject cvs commit: httpd-2.0/modules/ssl ssl_util_table.c
Date Wed, 21 May 2003 04:38:56 GMT
jerenkrantz    2003/05/20 21:38:56

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES
               modules/ssl Tag: APACHE_2_0_BRANCH ssl_util_table.c
  Log:
  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
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.988.2.106 +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.105
  retrieving revision 1.988.2.106
  diff -u -u -r1.988.2.105 -r1.988.2.106
  --- CHANGES	20 May 2003 23:38:48 -0000	1.988.2.105
  +++ CHANGES	21 May 2003 04:38:55 -0000	1.988.2.106
  @@ -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]
   
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.7.2.2   +1 -5      httpd-2.0/modules/ssl/ssl_util_table.c
  
  Index: ssl_util_table.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/ssl/ssl_util_table.c,v
  retrieving revision 1.7.2.1
  retrieving revision 1.7.2.2
  diff -u -u -r1.7.2.1 -r1.7.2.2
  --- ssl_util_table.c	3 Feb 2003 17:31:54 -0000	1.7.2.1
  +++ ssl_util_table.c	21 May 2003 04:38:56 -0000	1.7.2.2
  @@ -989,9 +989,7 @@
    */
   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 @@
           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;
       }
  
  
  

Mime
View raw message