httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/main http_config.c
Date Tue, 16 May 2000 22:16:52 GMT
rbb         00/05/16 15:16:52

  Modified:    src/main http_config.c
  Log:
  Fix a bug in the EXEC_ON_READ logic.  When we build a sub_tree while
  reading that is the first item in a container, we have to return that tree
  and set the parent pointers correctly.
  Submitted by:	Jeff Trawick
  Reviewed by:	Ryan Bloom
  
  Revision  Changes    Path
  1.47      +13 -3     apache-2.0/src/main/http_config.c
  
  Index: http_config.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_config.c,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- http_config.c	2000/05/15 19:21:38	1.46
  +++ http_config.c	2000/05/16 22:16:51	1.47
  @@ -869,9 +869,19 @@
   
               retval = execute_now(cmd_name, args, parms, p, temp_pool, 
                                    &sub_tree, *curr_parent);
  -            (*current)->next = sub_tree;
  -            while ((*current)->next != NULL) {
  -                (*current) = (*current)->next;
  +            if (*current) {
  +                (*current)->next = sub_tree;
  +            }
  +            else {
  +                (*current) = sub_tree;
  +                (*curr_parent)->first_child = (*current);
  +                (*current)->parent = (*curr_parent);
  +            }
  +            if (*current) {
  +                while ((*current)->next != NULL) {
  +                    (*current) = (*current)->next;
  +                    (*current)->parent = (*curr_parent);
  +                }
               }
               return retval;
           }
  
  
  

Mime
View raw message