https://issues.apache.org/bugzilla/show_bug.cgi?id=53539
--- Comment #8 from Ruediger Pluem <[email protected]> --- (In reply to comment #6) > (In reply to comment #5) > > Some more information: > > > > 1) Reproduction > > =============== > > > > I can easily reproduce with 2.4.x head using > > > > Have you checked with or without r1361153? Ok forget this. Should have read more carefully through your analysis. How about: Index: http_protocol.c =================================================================== --- http_protocol.c (revision 1373239) +++ http_protocol.c (working copy) @@ -1221,18 +1221,21 @@ r->content_encoding = NULL; r->clength = 0; - if (apr_table_get(r->subprocess_env, - "suppress-error-charset") != NULL) { - core_request_config *request_conf = - ap_get_core_module_config(r->request_config); - request_conf->suppress_charset = 1; /* avoid adding default - * charset later - */ - ap_set_content_type(r, "text/html"); + /* Only set content type if none is already set, e.g. by mod_cache */ + if (!r->content_type) { + if (apr_table_get(r->subprocess_env, + "suppress-error-charset") != NULL) { + core_request_config *request_conf = + ap_get_core_module_config(r->request_config); + request_conf->suppress_charset = 1; /* avoid adding default + * charset later + */ + ap_set_content_type(r, "text/html"); + } + else { + ap_set_content_type(r, "text/html; charset=iso-8859-1"); + } } - else { - ap_set_content_type(r, "text/html; charset=iso-8859-1"); - } if ((status == HTTP_METHOD_NOT_ALLOWED) || (status == HTTP_NOT_IMPLEMENTED)) { Another option would be to let mod_cache set someting into r->note and do not set the content type if found. -- You are receiving this mail because: You are the assignee for the bug. --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
