From: Junio C Hamano <gitster@pobox.com>
To: Julien Moutinho <julm+git@sourcephile.fr>
Cc: git@vger.kernel.org
Subject: Re: [PATCH] gitweb: fix UTF-8 encoding when using CGI::Fast
Date: Sun, 29 Mar 2020 09:06:24 -0700 [thread overview]
Message-ID: <xmqqr1xbb0xr.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20200329002028.26080-1-julm+git@sourcephile.fr> (Julien Moutinho's message of "Sun, 29 Mar 2020 01:20:28 +0100")
Julien Moutinho <julm+git@sourcephile.fr> writes:
> require CGI::Fast;
> our $CGI = 'CGI::Fast';
> + # FCGI is not Unicode aware hence the UTF-8 encoding must be done manually.
> + # However no encoding must be done within git_blob_plain() and git_snapshot()
> + # which must still output in raw binary mode.
I guess this comment would be sufficient to help future developers
when they find that newer version of CGI::Fast has become Unicode
aware later can make this part conditional to the version of the
module, perhaps?
Would "use CGI::Fast (-utf8)" instead of the whole thing help, by
the way?
> + no warnings 'redefine';
> + my $enc = Encode::find_encoding('UTF-8');
> + *FCGI::Stream::PRINT = sub {
> + my @OUTPUT = @_;
> + for (my $i = 1; $i < @_; $i++) {
> + $OUTPUT[$i] = $enc->encode($_[$i], Encode::FB_CROAK|Encode::LEAVE_SRC);
> + }
> + @_ = @OUTPUT;
> + goto $FCGI_Stream_PRINT_raw;
> + };
> my $request_number = 0;
> # let each child service 100 requests
> @@ -7079,6 +7093,7 @@ sub git_blob_plain {
> ($sandbox ? 'attachment' : 'inline')
> . '; filename="' . $save_as . '"');
> local $/ = undef;
> + local *FCGI::Stream::PRINT = $FCGI_Stream_PRINT_raw;
> binmode STDOUT, ':raw';
> print <$fd>;
> binmode STDOUT, ':utf8'; # as set at the beginning of gitweb.cgi
> @@ -7417,6 +7432,7 @@ sub git_snapshot {
>
> open my $fd, "-|", $cmd
> or die_error(500, "Execute git-archive failed");
> + local *FCGI::Stream::PRINT = $FCGI_Stream_PRINT_raw;
> binmode STDOUT, ':raw';
> print <$fd>;
> binmode STDOUT, ':utf8'; # as set at the beginning of gitweb.cgi
next prev parent reply other threads:[~2020-03-29 16:06 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-29 0:20 [PATCH] gitweb: fix UTF-8 encoding when using CGI::Fast Julien Moutinho
2020-03-29 16:06 ` Junio C Hamano [this message]
2020-03-29 19:14 ` Julien Moutinho
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqr1xbb0xr.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=julm+git@sourcephile.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).