diff options
| author | Joseph Bisch <joseph.bisch@gmail.com> | 2017-10-02 15:11:42 -0400 |
|---|---|---|
| committer | TingPing <tingping@tingping.se> | 2017-10-02 15:11:42 -0400 |
| commit | 07f1fc60dac480d3e4ca8e98ec1c0e08c050676d (patch) | |
| tree | 073655aad78fe81d35fefb956b567a29ac2dbbda /src/common/server.c | |
| parent | 0c494a9c24c431f39b24abb5d90b6221d554a688 (diff) | |
Use g_utf8_make_valid if available for cleaner utf8 handling (#2065)
Diffstat (limited to 'src/common/server.c')
| -rw-r--r-- | src/common/server.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/common/server.c b/src/common/server.c index 1ed90d0b..c0fb36a6 100644 --- a/src/common/server.c +++ b/src/common/server.c @@ -258,7 +258,10 @@ static void server_inline (server *serv, char *line, gssize len) { gsize len_utf8; - line = text_convert_invalid (line, len, serv->read_converter, unicode_fallback_string, &len_utf8); + if (!strcmp (serv->encoding, "UTF-8")) + line = text_fixup_invalid_utf8 (line, len, &len_utf8); + else + line = text_convert_invalid (line, len, serv->read_converter, unicode_fallback_string, &len_utf8); fe_add_rawlog (serv, line, len_utf8, FALSE); |