summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki/Plugin/external.pm1
-rw-r--r--debian/changelog4
-rw-r--r--doc/bugs/rst_plugin_hangs_on_utf-8.mdwn3
3 files changed, 8 insertions, 0 deletions
diff --git a/IkiWiki/Plugin/external.pm b/IkiWiki/Plugin/external.pm
index 8d1baa587..a5afdc4be 100644
--- a/IkiWiki/Plugin/external.pm
+++ b/IkiWiki/Plugin/external.pm
@@ -29,6 +29,7 @@ sub import { #{{{
$plugins{$plugin}={in => $plugin_read, out => $plugin_write, pid => $pid,
accum => ""};
+ $RPC::XML::ENCODING="utf-8";
rpc_call($plugins{$plugin}, "import");
} #}}}
diff --git a/debian/changelog b/debian/changelog
index fa3e0cc4e..b597cc0ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ ikiwiki (2.40) UNRELEASED; urgency=low
[ Joey Hess ]
* Danish translation update from Jonas Smedegaard. Closes: #465152
+ * Generate XML RPC messages with the encoding set to utf-8 instead
+ of XML::RPC's default of us-ascii. Allows interoperation with
+ python's xmlrpc library, which threw invalid encoding exceptions and
+ caused the rst plugin to hang.
-- Josh Triplett <josh@freedesktop.org> Sun, 10 Feb 2008 13:18:58 -0800
diff --git a/doc/bugs/rst_plugin_hangs_on_utf-8.mdwn b/doc/bugs/rst_plugin_hangs_on_utf-8.mdwn
index 9890559bb..5121f0379 100644
--- a/doc/bugs/rst_plugin_hangs_on_utf-8.mdwn
+++ b/doc/bugs/rst_plugin_hangs_on_utf-8.mdwn
@@ -15,3 +15,6 @@ Killing with Control-C gives the following traceback:
rst2html on the same file has no problem rendering the file as expected. The
markdown plugin also has no problems rendering the same file, so I'm guessing
it's a problem with the XML-RPC interface.
+
+Sorry for the delay, this is now fixed! --[[Joey]]
+[[tag done]]