external: Disable RPC::XML's "smart" encoding, which sent ints for strings that conta...

(cherry picked from commit 0ff945ddf19010b890458face057505f7b48b572)

Conflicts:

	debian/changelog

diff --git a/IkiWiki/Plugin/external.pm b/IkiWiki/Plugin/external.pm
index ec91c79db2149a1b58a63f34aedc4b83b7a76a4a..a4cc1dd3ce32bade13d9477efcba68fdc4a50e1a 100644 (file)
--- a/IkiWiki/Plugin/external.pm
+++ b/IkiWiki/Plugin/external.pm
@@ -28,7 +28,9 @@ sub import {
 
        $plugins{$plugin}={in => $plugin_read, out => $plugin_write, pid => $pid,
                accum => ""};
+
        $RPC::XML::ENCODING="utf-8";
+       $RPC::XML::FORCE_STRING_ENCODING="true";
 
        rpc_call($plugins{$plugin}, "import");
 }

diff --git a/debian/changelog b/debian/changelog
index 8e3160257522e769f584efc86628a75f9454406c..425b4a1bb41033adad1e242347d47874292e6f1b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ ikiwiki (3.20100815.2) UNRELEASED; urgency=low
     (and MSIE 8 in compat mode). Thanks to Iain McLaren for reporting
     the bug and providing access to debug it.
   * blogspam: Fix crash when content contained utf-8.
+  * external: Disable RPC::XML's "smart" encoding, which sent ints
+    for strings that contained only a number, fixing a longstanding crash
+    of the rst plugin.
 
  -- Joey Hess <joeyh@debian.org>  Sun, 15 Aug 2010 11:42:55 -0400
 

diff --git a/doc/bugs/rst_fails_on_file_containing_only_a_number.mdwn b/doc/bugs/rst_fails_on_file_containing_only_a_number.mdwn
index dab3b7e5bf58059947e433fcb5e5594ed5a3e3e1..99e46aac9c4018f67366152ec1c135ca51f84776 100644 (file)
--- a/doc/bugs/rst_fails_on_file_containing_only_a_number.mdwn
+++ b/doc/bugs/rst_fails_on_file_containing_only_a_number.mdwn
@@ -24,3 +24,6 @@ throwing code..):
 > No, still the same failure. I think it's failing parsing the input data,
 > (which perl probably transmitted as an int due to perl internals)
 > not writing out its response. --[[Joey]]
+
+> On second thought, this was a bug in ikiwiki, it should be transmitting
+> that as a string. Fixed in external.pm --[[Joey]]