Attachment #14909 for bug #25114




}

void xslt_set_headers(apr_table_t *resheaders, apr_pool_t *pool, xsltStylesheetPtr stylesheet) {
	if (stylesheet->encoding){
		apr_table_set(resheaders, "Content-Encoding", (const char*)stylesheet->encoding);
	} else {
		apr_table_set(resheaders, "Content-Encoding", "UTF-8");
	}

	if (stylesheet->mediaType){
		apr_table_set(resheaders, "Content-Type", apr_psprintf(pool,"%s; charset=%s",(const char*)stylesheet->mediaType,apr_table_get(resheaders,"Content-Encoding")));
	} else {

Return to bug 25114

Lines 112-123 Link Here

(-)mod-xslt-1.0.5a/src/mod-xslt.c (-6 lines)
112	}	112	}
113		113
114	void xslt_set_headers(apr_table_t resheaders, apr_pool_t pool, xsltStylesheetPtr stylesheet) {	114	void xslt_set_headers(apr_table_t resheaders, apr_pool_t pool, xsltStylesheetPtr stylesheet) {
115	if (stylesheet->encoding){
116	apr_table_set(resheaders, "Content-Encoding", (const char*)stylesheet->encoding);
117	} else {
118	apr_table_set(resheaders, "Content-Encoding", "UTF-8");
119	}
120
121	if (stylesheet->mediaType){	115	if (stylesheet->mediaType){
122	apr_table_set(resheaders, "Content-Type", apr_psprintf(pool,"%s; charset=%s",(const char*)stylesheet->mediaType,apr_table_get(resheaders,"Content-Encoding")));	116	apr_table_set(resheaders, "Content-Type", apr_psprintf(pool,"%s; charset=%s",(const char*)stylesheet->mediaType,apr_table_get(resheaders,"Content-Encoding")));
123	} else {	117	} else {