Bug 3797, second part of the patch, extending output_html_with_http_headers to take...