Merge branch 'stable'

diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index be8483c63a7d4366b8578dd6fd35dbf7ed6e0015..65b210f3cfb49aae3825fc563c2176c88c160e22 100644 (file)
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -287,8 +287,9 @@ scan-path::
        the result will be cached as a cgitrc include-file in the cache
        directory. If project-list has been defined prior to scan-path,
        scan-path loads only the directories listed in the file pointed to by
-       project-list. Default value: none. See also: cache-scanrc-ttl,
-       project-list.
+       project-list. Be advised that only the global settings taken
+       before the scan-path directive will be applied to each repository.
+       Default value: none. See also: cache-scanrc-ttl, project-list.
 
 section::
        The name of the current repository section - all repositories defined

diff --git a/parsing.c b/parsing.c
index f37c49d261765636cfef652faec3be8baf6d2894..c9e43509242d1d3a4e6faf85da7ce46375659ab3 100644 (file)
--- a/parsing.c
+++ b/parsing.c
@@ -106,7 +106,11 @@ const char *reencode(char **txt, const char *src_enc, const char *dst_enc)
        if (!txt || !*txt || !src_enc || !dst_enc)
                return *txt;
 
-       tmp = reencode_string(*txt, src_enc, dst_enc);
+       /* no encoding needed if src_enc equals dst_enc */
+       if(!strcasecmp(src_enc, dst_enc))
+               return *txt;
+
+       tmp = reencode_string(*txt, dst_enc, src_enc);
        if (tmp) {
                free(*txt);
                *txt = tmp;
@@ -160,6 +164,10 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
                }
        }
 
+       /* if no special encoding is found, assume UTF-8 */
+       if(!ret->msg_encoding)
+               ret->msg_encoding = xstrdup("UTF-8");
+
        // skip unknown header fields
        while (p && *p && (*p != '\n')) {
                p = strchr(p, '\n');
@@ -189,14 +197,12 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
        } else
                ret->subject = xstrdup(p);
 
-       if (ret->msg_encoding) {
-               reencode(&ret->author, PAGE_ENCODING, ret->msg_encoding);
-               reencode(&ret->author_email, PAGE_ENCODING, ret->msg_encoding);
-               reencode(&ret->committer, PAGE_ENCODING, ret->msg_encoding);
-               reencode(&ret->committer_email, PAGE_ENCODING, ret->msg_encoding);
-               reencode(&ret->subject, PAGE_ENCODING, ret->msg_encoding);
-               reencode(&ret->msg, PAGE_ENCODING, ret->msg_encoding);
-       }
+       reencode(&ret->author, ret->msg_encoding, PAGE_ENCODING);
+       reencode(&ret->author_email, ret->msg_encoding, PAGE_ENCODING);
+       reencode(&ret->committer, ret->msg_encoding, PAGE_ENCODING);
+       reencode(&ret->committer_email, ret->msg_encoding, PAGE_ENCODING);
+       reencode(&ret->subject, ret->msg_encoding, PAGE_ENCODING);
+       reencode(&ret->msg, ret->msg_encoding, PAGE_ENCODING);
 
        return ret;
 }