httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
Subject cvs commit: httpd-2.0/server config.c
Date Fri, 21 Sep 2001 06:23:29 GMT
wrowe       01/09/20 23:23:29

  Modified:    server   config.c
    AFAICT, we have never created server configs of _all_ modules for _all_
    contexts, only when they come up (e.g., a directive of that particular
    module is provided) with the except that vhost containers complete the
    initialization of all modules.  I haven't stepped this, but it appears
    to be correct.
    This patch assures we can merge two incomplete directory sections
    together.  They will (obviously) need to be merged with a LHS default,
    e.g. a vhost's or main server's default dir config.  That's fine, this
    just allows either the LHS or RHS value to be null, and for merging to
    still succeed.
  Reported by:  Sander Striker <>
  Additional Analysis:  Doug MacEachern
  Revision  Changes    Path
  1.135     +1 -1      httpd-2.0/server/config.c
  Index: config.c
  RCS file: /home/cvs/httpd-2.0/server/config.c,v
  retrieving revision 1.134
  retrieving revision 1.135
  diff -u -r1.134 -r1.135
  --- config.c	2001/08/23 19:13:53	1.134
  +++ config.c	2001/09/21 06:23:29	1.135
  @@ -258,7 +258,7 @@
   	merger_func df = modp->merge_dir_config;
   	int i = modp->module_index;
  -	if (df && new_vector[i])
  +	if (df && new_vector[i] && base_vector[i])
   	    conf_vector[i] = (*df) (p, base_vector[i], new_vector[i]);
   	    conf_vector[i] = new_vector[i] ? new_vector[i] : base_vector[i];

View raw message