Attachment #13547 for bug #32346

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

Lines 310-315 Link Here

(-)docs/manual/mod/mod_include.xml (+2 lines)
310	parsed file has <a href="core.html#options">Options</a>	310	parsed file has <a href="core.html#options">Options</a>
311	<code>IncludesNOEXEC</code> set, then only documents with	311	<code>IncludesNOEXEC</code> set, then only documents with
312	a text MIME type (<code>text/plain</code>, <code>text/html</code>	312	a text MIME type (<code>text/plain</code>, <code>text/html</code>
		313	etc.) or an application/foo+xml MIME type
		314	(<code>application/xhtml+xml</code>, <code>application/rdf+xml</code>
313	etc.) will be included. Otherwise CGI scripts are invoked as normal	315	etc.) will be included. Otherwise CGI scripts are invoked as normal
314	using the complete URL given in the command, including any query	316	using the complete URL given in the command, including any query
315	string.</p>	317	string.</p>

Lines 1674-1683 Link Here

(-)modules/filters/mod_include.c (-3 / +18 lines)
1674	}	1674	}
1675		1675
1676	if (!error_fmt && (ctx->flags & SSI_FLAG_NO_EXEC) &&	1676	if (!error_fmt && (ctx->flags & SSI_FLAG_NO_EXEC) &&
1677	rr->content_type && strncmp(rr->content_type, "text/", 5)) {	1677	rr->content_type) {
		1678	int decline = 1;
		1679	if (!strncmp(rr->content_type, "text/", 5)) {
		1680	decline = 0;
		1681	} else if (!strncmp(rr->content_type, "application/", 12)) {
		1682	const char * pos = ap_strchr_c(rr->content_type, ';');
		1683	if (!pos) {
		1684	pos = rr->content_type + strlen(rr->content_type);
		1685	}
		1686	pos -= 4;
		1687	if (!strncmp(pos, "+xml", 4)) {
		1688	decline = 0;
		1689	}
		1690	}
1678		1691
1679	error_fmt = "unable to include potential exec \"%s\" in parsed "	1692	if (decline) {
1680	"file %s";	1693	error_fmt = "unable to include potential exec \"%s\" in parsed "
		1694	"file %s";
		1695	}
1681	}	1696	}
1682		1697
1683	/* See the Kludge in includes_filter for why.	1698	/* See the Kludge in includes_filter for why.

Return to bug 32346