From: Benjamin Close <Benjamin.Close@clearchain.com>
To: git@vger.kernel.org
Subject: Fix UTF Encoding issue
Date: Mon, 03 Dec 2007 20:32:01 +1030 [thread overview]
Message-ID: <4753D419.80503@clearchain.com> (raw)
>From 83042abf3967b455953cddeab43e33c1d59c6f03 Mon Sep 17 00:00:00 2001
From: Benjamin Close <Benjamin.Close@clearchain.com>
Date: Sun, 2 Dec 2007 15:09:00 -0800
Subject: [PATCH] Gitweb: Fix encoding to always translate rather than
sometimes fail
When performing the utf translation don't test if $res is defined.
It appears that it is defined even when the conversion fails. This causes
failures on the writing of the output stream which is expecting UTF.
Instead, immediately return if conversion is successful else force
the translation to the fallback encoding
---
gitweb/gitweb.perl | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 491a3f4..00bbcdf 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -696,12 +696,8 @@ sub validate_refname {
sub to_utf8 {
my $str = shift;
my $res;
- eval { $res = decode_utf8($str, Encode::FB_CROAK); };
- if (defined $res) {
- return $res;
- } else {
- return decode($fallback_encoding, $str, Encode::FB_DEFAULT);
- }
+ eval { return ($res = decode_utf8($str, Encode::FB_CROAK)); };
+ return decode($fallback_encoding, $str, Encode::FB_DEFAULT);
}
# quote unsafe chars, but keep the slash, even when it's not
--
1.5.3.6
next reply other threads:[~2007-12-03 10:07 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-03 10:02 Benjamin Close [this message]
2007-12-03 10:14 ` Fix UTF Encoding issue Junio C Hamano
2007-12-03 11:32 ` Ismail Dönmez
2007-12-03 12:06 ` Jakub Narebski
2007-12-03 16:38 ` Martin Koegler
2007-12-03 17:02 ` Jakub Narebski
2007-12-03 21:46 ` Benjamin Close
2007-12-03 22:20 ` Ismail Dönmez
2007-12-03 23:04 ` Benjamin Close
2007-12-03 23:37 ` Jakub Narebski
2007-12-04 4:12 ` Ismail Dönmez
2007-12-04 8:04 ` Martin Koegler
2007-12-04 8:12 ` Ismail Dönmez
2007-12-04 8:20 ` Martin Koegler
2007-12-04 7:50 ` Martin Koegler
2007-12-04 7:55 ` Ismail Dönmez
2007-12-04 8:16 ` Martin Koegler
2007-12-04 8:28 ` Ismail Dönmez
2007-12-04 8:33 ` Ismail Dönmez
2007-12-04 8:44 ` Martin Koegler
2007-12-04 8:47 ` Ismail Dönmez
2007-12-04 8:55 ` Ismail Dönmez
2007-12-04 9:07 ` Jakub Narebski
2007-12-04 10:11 ` Wincent Colaiuta
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4753D419.80503@clearchain.com \
--to=benjamin.close@clearchain.com \
--cc=git@vger.kernel.org \
/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.
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 NNTP newsgroup(s).