Commit 330f45c5 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  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 <striker@apache.org>
Additional Analysis:  Doug MacEachern


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91098 13f79535-47bb-0310-9956-ffa450edef68
parent 1a6f4eea

server/config.c

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ AP_CORE_DECLARE(ap_conf_vector_t*) ap_merge_per_dir_configs(apr_pool_t *p, 
	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]);

	else

	    conf_vector[i] = new_vector[i] ? new_vector[i] : base_vector[i];