- $r->{content_type} . "; charset=" . $r->{document_encoding} );
- $r->{ar}->headers_out->set( "Content-Length" => length $r->{output} );
+ $r->{content_type} =~ m/^text/
+ ? $r->{content_type} . "; charset=" . $r->{document_encoding}
+ : $r->{content_type}
+ );
+ $r->{ar}->headers_out->set( "Content-Length" => do { use bytes; length $r->{output} } );