diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-07-11 20:18:11 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-07-11 20:18:11 +0000 |
| commit | f389b08a0c8952494ff95f70c26783d3c3584cf9 (patch) | |
| tree | fa0e1d5ceb4717770571b4076d90b503698728f3 | |
| parent | 50c21744cac9842b75bfafd776b3dc4c38370b03 (diff) | |
| download | ikiwiki-f389b08a0c8952494ff95f70c26783d3c3584cf9.tar ikiwiki-f389b08a0c8952494ff95f70c26783d3c3584cf9.tar.gz | |
* Fix from Faidon for a XML parser issue that breaks utf-8 for
RecentChanges. Avoid using XML::SAX::PurePerl, which is buggy in this
area, and also way slow.
| -rw-r--r-- | IkiWiki/Rcs/svn.pm | 7 | ||||
| -rw-r--r-- | debian/changelog | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm index 71517f215..560eb38a3 100644 --- a/IkiWiki/Rcs/svn.pm +++ b/IkiWiki/Rcs/svn.pm @@ -104,8 +104,15 @@ sub rcs_recentchanges ($) { #{{{ eval q{use CGI 'escapeHTML'}; eval q{use Date::Parse}; eval q{use Time::Duration}; + eval q{use XML::SAX}; eval q{use XML::Simple}; + # avoid using XML::SAX::PurePerl, it's buggy with UTF-8 data + my @parsers = map { ${$_}{Name} } @{XML::SAX->parsers()}; + do { + $XML::Simple::PREFERRED_PARSER = pop @parsers; + } until $XML::Simple::PREFERRED_PARSER ne 'XML::SAX::PurePerl'; + # --limit is only supported on Subversion 1.2.0+ my $svn_version=`svn --version -q`; my $svn_limit=''; diff --git a/debian/changelog b/debian/changelog index b2f037e2f..5c77798bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,8 +9,11 @@ ikiwiki (1.9) UNRELEASED; urgency=low * Support a w3mmode, which lets w3m run ikiwiki using its local CGI support, to edit pages etc without a web server. * Display CGI processing errors if present. + * Fix from Faidon for a XML parser issue that breaks utf-8 for + RecentChanges. Avoid using XML::SAX::PurePerl, which is buggy in this + area, and also way slow. - -- Joey Hess <joeyh@debian.org> Mon, 10 Jul 2006 17:12:57 -0400 + -- Joey Hess <joeyh@debian.org> Tue, 11 Jul 2006 14:37:30 -0400 ikiwiki (1.8) unstable; urgency=low |