httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From do...@locus.apache.org
Subject cvs commit: apache-2.0/src/main http_config.c
Date Sun, 25 Jun 2000 22:50:10 GMT
dougm       00/06/25 15:50:10

  Modified:    src/main http_config.c
  Log:
  parms needs err_directive incase execute_now() returns non-NULL (e.g. if LoadModule fails)
  
  Revision  Changes    Path
  1.68      +7 -6      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.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- http_config.c	2000/06/24 02:01:28	1.67
  +++ http_config.c	2000/06/25 22:50:10	1.68
  @@ -863,11 +863,18 @@
   	return NULL;
       }
   
  +    newdir = ap_pcalloc(p, sizeof(ap_directive_t));
  +    newdir->filename = parms->config_file->name;
  +    newdir->line_num = parms->config_file->line_number;
  +    newdir->directive = cmd_name;
  +    newdir->args = ap_pstrdup(p, args);
  +
       if ((cmd = ap_find_command_in_modules(cmd_name, &mod)) != NULL) {
           if (cmd->req_override & EXEC_ON_READ) {
               const char *retval;
               ap_directive_t *sub_tree = NULL;
   
  +            parms->err_directive = newdir;
               retval = execute_now(cmd_name, args, parms, p, temp_pool, 
                                    &sub_tree, *curr_parent);
               if (*current) {
  @@ -891,12 +898,6 @@
               return retval;
           }
       }
  -
  -    newdir = ap_pcalloc(p, sizeof(ap_directive_t));
  -    newdir->filename = parms->config_file->name;
  -    newdir->line_num = parms->config_file->line_number;
  -    newdir->directive = cmd_name;
  -    newdir->args = ap_pstrdup(p, args);
   
       if (cmd_name[0] == '<') {
           if (cmd_name[1] != '/') {
  
  
  

Mime
View raw message