On Fri, Jan 30, 2015 at 6:17 PM, <[email protected]> wrote: > Author: covener > Date: Fri Jan 30 17:17:12 2015 > New Revision: 1656063 > > URL: http://svn.apache.org/r1656063 > Log: > Block Define/Undefine from per-directory context, because they will > fire while the block is read not when it evaluates for a given > request. > [...] > Modified: httpd/httpd/trunk/server/core.c > URL: > http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?rev=1656063&r1=1656062&r2=1656063&view=diff > ============================================================================== > --- httpd/httpd/trunk/server/core.c (original) > +++ httpd/httpd/trunk/server/core.c Fri Jan 30 17:17:12 2015 [...] > @@ -1358,9 +1359,10 @@ static const char *unset_define(cmd_parm > { > int i; > char **defines; > - const char *err = ap_check_cmd_context(cmd, NOT_IN_HTACCESS); > - if (err) > - return err; > + if (cmd->parent && strcasecmp(cmd->parent->directive, "<VirtualHost")) { > + return apr_pstrcat(cmd->pool, "Define is not valid in ", > cmd->parent->directive, " context", NULL);
Typo: s/Define/Undefine/ or maybe s/"Define/cmd->cmd->name, "/ in both set_define() and unset_define(). > + } > + Regards, Yann.
