On 30.03.2010 00:09, minf...@apache.org wrote: > Author: minfrin > Date: Mon Mar 29 22:09:35 2010 > New Revision: 928916 > > URL: http://svn.apache.org/viewvc?rev=928916&view=rev > Log: > core: Introduce the IncludeStrict directive, which explicitly fails > server startup if no files or directories match a wildcard path. > > Modified: > httpd/httpd/trunk/CHANGES > httpd/httpd/trunk/docs/manual/mod/core.xml > httpd/httpd/trunk/server/config.c > httpd/httpd/trunk/server/core.c > > Modified: httpd/httpd/trunk/CHANGES
> Modified: httpd/httpd/trunk/server/config.c > URL: > http://svn.apache.org/viewvc/httpd/httpd/trunk/server/config.c?rev=928916&r1=928915&r2=928916&view=diff > ============================================================================== > --- httpd/httpd/trunk/server/config.c (original) > +++ httpd/httpd/trunk/server/config.c Mon Mar 29 22:09:35 2010 > @@ -1738,27 +1740,32 @@ static const char *process_resource_conf > if (!rest) { > error = process_resource_config_nofnmatch(s, fnew->fname, > conftree, p, > - ptemp, 0); > + ptemp, 0, strict); > } > else { > error = process_resource_config_fnmatch(s, fnew->fname, rest, > conftree, p, > - ptemp, 0); > + ptemp, 0, strict); > } > if (error) { > return error; > } > } > } > + else if (strict) { > + return apr_psprintf(p, "No matches for the wildcard '%s' in %s", > + fname, path); > + } > > return NULL; > } > > -AP_DECLARE(const char *) ap_process_resource_config(server_rec *s, > - const char *fname, > - ap_directive_t > **conftree, > - apr_pool_t *p, > - apr_pool_t *ptemp) > +AP_DECLARE(const char *) ap_process_resource_config_ex(server_rec *s, > + const char *fname, > + ap_directive_t > **conftree, > + apr_pool_t *p, > + apr_pool_t *ptemp, > + int strict) A prototype for this function is missing. This causes a warning. Regards Rüdiger
