mirror of
https://git.zx2c4.com/cgit
synced 2024-11-22 16:38:42 +00:00
Merge branch 'stable'
This commit is contained in:
commit
568d8d3fd3
@ -287,8 +287,9 @@ scan-path::
|
|||||||
the result will be cached as a cgitrc include-file in the cache
|
the result will be cached as a cgitrc include-file in the cache
|
||||||
directory. If project-list has been defined prior to scan-path,
|
directory. If project-list has been defined prior to scan-path,
|
||||||
scan-path loads only the directories listed in the file pointed to by
|
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. Be advised that only the global settings taken
|
||||||
project-list.
|
before the scan-path directive will be applied to each repository.
|
||||||
|
Default value: none. See also: cache-scanrc-ttl, project-list.
|
||||||
|
|
||||||
section::
|
section::
|
||||||
The name of the current repository section - all repositories defined
|
The name of the current repository section - all repositories defined
|
||||||
|
24
parsing.c
24
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)
|
if (!txt || !*txt || !src_enc || !dst_enc)
|
||||||
return *txt;
|
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) {
|
if (tmp) {
|
||||||
free(*txt);
|
free(*txt);
|
||||||
*txt = tmp;
|
*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
|
// skip unknown header fields
|
||||||
while (p && *p && (*p != '\n')) {
|
while (p && *p && (*p != '\n')) {
|
||||||
p = strchr(p, '\n');
|
p = strchr(p, '\n');
|
||||||
@ -189,14 +197,12 @@ struct commitinfo *cgit_parse_commit(struct commit *commit)
|
|||||||
} else
|
} else
|
||||||
ret->subject = xstrdup(p);
|
ret->subject = xstrdup(p);
|
||||||
|
|
||||||
if (ret->msg_encoding) {
|
reencode(&ret->author, ret->msg_encoding, PAGE_ENCODING);
|
||||||
reencode(&ret->author, PAGE_ENCODING, ret->msg_encoding);
|
reencode(&ret->author_email, ret->msg_encoding, PAGE_ENCODING);
|
||||||
reencode(&ret->author_email, PAGE_ENCODING, ret->msg_encoding);
|
reencode(&ret->committer, ret->msg_encoding, PAGE_ENCODING);
|
||||||
reencode(&ret->committer, PAGE_ENCODING, ret->msg_encoding);
|
reencode(&ret->committer_email, ret->msg_encoding, PAGE_ENCODING);
|
||||||
reencode(&ret->committer_email, PAGE_ENCODING, ret->msg_encoding);
|
reencode(&ret->subject, ret->msg_encoding, PAGE_ENCODING);
|
||||||
reencode(&ret->subject, PAGE_ENCODING, ret->msg_encoding);
|
reencode(&ret->msg, ret->msg_encoding, PAGE_ENCODING);
|
||||||
reencode(&ret->msg, PAGE_ENCODING, ret->msg_encoding);
|
|
||||||
}
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user