cvs commit: apache/src http_core.c

[Alexei Kosut]

akosut      96/07/29 11:09:15

  Modified:    src       http_core.c
  Log:
  Fix a seg fault. (oops)
  
  Revision  Changes    Path
  1.27      +4 -3      apache/src/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /export/home/cvs/apache/src/http_core.c,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -C3 -r1.26 -r1.27
  *** http_core.c       1996/07/28 19:35:49     1.26
  --- http_core.c       1996/07/29 18:09:13     1.27
  ***************
  *** 572,587 ****
        }
    
        errmsg = srm_command_loop (cmd, new_dir_conf);
  !     add_per_dir_conf (cmd->server, new_dir_conf);
    
        conf = (core_dir_config *)get_module_config(new_dir_conf, &core_module);
        conf->r = r;
     
        cmd->path = old_path;
        cmd->override = old_overrides;
    
  !     if (errmsg == end_dir_magic) return NULL;
  !     return errmsg;
    }
    
    static char *end_url_magic = "</Location> outside of any <Location> 
section";
  --- 572,588 ----
        }
    
        errmsg = srm_command_loop (cmd, new_dir_conf);
  !     if (errmsg != end_dir_magic) return errmsg;
    
        conf = (core_dir_config *)get_module_config(new_dir_conf, &core_module);
        conf->r = r;
  + 
  +     add_per_dir_conf (cmd->server, new_dir_conf);
     
        cmd->path = old_path;
        cmd->override = old_overrides;
    
  !     return NULL;
    }
    
    static char *end_url_magic = "</Location> outside of any <Location> 
section";