View | Details | Raw Unified | Return to bug 52439
Collapse All | Expand All

(-)httpd-2.4.6/server/core.c (-1 / +8 lines)
Lines 1783-1789 Link Here
1783
        }
1783
        }
1784
1784
1785
        if ( (cmd->override_opts & opt) != opt ) {
1785
        if ( (cmd->override_opts & opt) != opt ) {
1786
            return apr_pstrcat(cmd->pool, "Option ", w, " not allowed here", NULL);
1786
	    if (cmd->override & NONFATAL_OVERRIDE) {
1787
	        ap_log_error(APLOG_MARK, APLOG_WARNING, 0, cmd->server, "Option %s not allowed in line %d of %s.",
1788
	                     w, cmd->directive->line_num, cmd->directive->filename);
1789
		first = 0;
1790
	        continue;
1791
	    } else {
1792
	        return apr_pstrcat(cmd->pool, "Option ", w, " not allowed here", NULL);
1793
	    }
1787
        }
1794
        }
1788
        else if (action == '-') {
1795
        else if (action == '-') {
1789
            /* we ensure the invariant (d->opts_add & d->opts_remove) == 0 */
1796
            /* we ensure the invariant (d->opts_add & d->opts_remove) == 0 */

Return to bug 52439