From cvs-return-4349-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org Sat Nov 23 04:29:58 2002
Return-Path: <cvs-return-4349-apmail-apr-cvs-archive=apr.apache.org@apr.apache.org>
Delivered-To: apmail-apr-cvs-archive@apr.apache.org
Received: (qmail 61958 invoked by uid 500); 23 Nov 2002 04:29:57 -0000
Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm
Precedence: bulk
List-Post: <mailto:cvs@apr.apache.org>
List-Help: <mailto:cvs-help@apr.apache.org>
List-Unsubscribe: <mailto:cvs-unsubscribe@apr.apache.org>
List-Subscribe: <mailto:cvs-subscribe@apr.apache.org>
Reply-To: dev@apr.apache.org
Delivered-To: mailing list cvs@apr.apache.org
Received: (qmail 61939 invoked from network); 23 Nov 2002 04:29:56 -0000
Date: 23 Nov 2002 04:29:55 -0000
Message-ID: <20021123042955.69298.qmail@icarus.apache.org>
From: trawick@apache.org
To: apr-cvs@apache.org
Subject: cvs commit: apr/tables apr_hash.c
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

trawick     2002/11/22 20:29:55

  Modified:    .        CHANGES
               tables   apr_hash.c
  Log:
  Fix a bug in apr_hash_merge() which caused the last entry in the
  overlay has to be lost.
  
  PR:                 10522
  
  Revision  Changes    Path
  1.359     +4 -0      apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.358
  retrieving revision 1.359
  diff -u -r1.358 -r1.359
  --- CHANGES	20 Nov 2002 03:52:27 -0000	1.358
  +++ CHANGES	23 Nov 2002 04:29:55 -0000	1.359
  @@ -1,4 +1,8 @@
   Changes with APR 0.9.2
  +
  +  *) Fix a bug in apr_hash_merge() which caused the last entry in the
  +     overlay has to be lost.  PR 10522  [Jeff Trawick]
  +
     *) Add DougM's apr_rename.pl script into helpers, and update for the new 
        batch of updates [Thom May]
   
  
  
  
  1.31      +1 -1      apr/tables/apr_hash.c
  
  Index: apr_hash.c
  ===================================================================
  RCS file: /home/cvs/apr/tables/apr_hash.c,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- apr_hash.c	19 Jul 2002 11:36:19 -0000	1.30
  +++ apr_hash.c	23 Nov 2002 04:29:55 -0000	1.31
  @@ -442,7 +442,7 @@
           }
       }
   
  -    for (k = 0; k < overlay->max; k++) {
  +    for (k = 0; k <= overlay->max; k++) {
           for (iter = overlay->array[k]; iter; iter = iter->next) {
               i = iter->hash & res->max;
               for (ent = res->array[i]; ent; ent = ent->next) {