* 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.

diff --git a/IkiWiki/Plugin/external.pm b/IkiWiki/Plugin/external.pm
index 8d1baa5874c4d79c2aac1e874a8fa0b4a5a495f8..a5afdc4bef4b28b849b8b25ed414d1f4757f17b8 100644 (file)
--- 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 => ""};
 
        $plugins{$plugin}={in => $plugin_read, out => $plugin_write, pid => $pid,
                accum => ""};

+       $RPC::XML::ENCODING="utf-8";

 
        rpc_call($plugins{$plugin}, "import");
 } #}}}
 
        rpc_call($plugins{$plugin}, "import");
 } #}}}

diff --git a/debian/changelog b/debian/changelog
index fa3e0cc4e998946434c73ed20f9857e79e076383..b597cc0ae85aa3eb5d3810cbd60afe52b175d96a 100644 (file)
--- 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
 
   [ 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
 
 
  -- 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 9890559bba946f152311bf0f57af8a49384c9c5a..5121f037926d0bcd31395a7c2569126a9724268a 100644 (file)
--- 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.
 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]]