Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Date: 27 Feb 2003 04:01:21 -0000
Message-ID: <20030227040121.88153.qmail@icarus.apache.org>
From: nd@apache.org
To: httpd-2.0-cvs@apache.org
Subject: cvs commit: httpd-2.0/server config.c

nd          2003/02/26 20:01:21

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES
               server   Tag: APACHE_2_0_BRANCH config.c
  Log:
  fill out parms->err_directive while looking for open parents.
  Otherwise when trying to log the error
  (a) we segfault (if the directive was in another file)
  (b) we show a wrong occurrence line number (start line of the previous
      container or somewhat) or probably segfault, too
      (if no previous container/directive exists).
  
  PR: 17093
  Reviewed by: Jeff Trawick, Bill Stoddard
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.988.2.46 +3 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.45
  retrieving revision 1.988.2.46
  diff -u -r1.988.2.45 -r1.988.2.46
  --- CHANGES	26 Feb 2003 19:03:51 -0000	1.988.2.45
  +++ CHANGES	27 Feb 2003 04:01:19 -0000	1.988.2.46
  @@ -1,5 +1,8 @@
   Changes with Apache 2.0.45
   
  +  *) Fix segfault which occurred when a section in an included
  +     configuration file was not closed. PR 17093.  [Andr� Malo]
  +
     *) Enhance the behavior of mod_isapi's WriteClient() callback to
        provide better emulation for isapi modules that presume that the
        first WriteClient() call may send status and headers.  An example
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.156.2.5 +3 -1      httpd-2.0/server/config.c
  
  Index: config.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/config.c,v
  retrieving revision 1.156.2.4
  retrieving revision 1.156.2.5
  diff -u -r1.156.2.4 -r1.156.2.5
  --- config.c	3 Feb 2003 17:31:59 -0000	1.156.2.4
  +++ config.c	27 Feb 2003 04:01:20 -0000	1.156.2.5
  @@ -1170,7 +1170,9 @@
                                     curr_parent->filename,
                                     curr_parent->line_num,
                                     curr_parent->directive);
  -                                  curr_parent = curr_parent->parent;
  +
  +            parms->err_directive = curr_parent;
  +            curr_parent = curr_parent->parent;
           }
   
           return errmsg;