From e587df4eebae9fd09e965f2074bd3ef1276d6de8 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org"
 <mkanat%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 4 Sep 2009 21:29:58 +0000
Subject: [PATCH] Bug 486306: Truncated XML-RPC response (incorrect
 content-length header) Patch by Max Kanat-Alexander <mkanat@bugzilla.org>
 r=LpSolit, a=LpSolit

git-svn-id: svn://10.0.0.236/trunk@258323 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../webtools/bugzilla/Bugzilla/Install/Requirements.pm |  6 +++---
 .../bugzilla/Bugzilla/WebService/Server/XMLRPC.pm      | 10 ----------
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/mozilla/webtools/bugzilla/Bugzilla/Install/Requirements.pm b/mozilla/webtools/bugzilla/Bugzilla/Install/Requirements.pm
index f3e6a654b40..a957ceb10f3 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Install/Requirements.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Install/Requirements.pm
@@ -219,9 +219,9 @@ sub OPTIONAL_MODULES {
     {
         package => 'SOAP-Lite',
         module  => 'SOAP::Lite',
-        version => 0,
-        # These versions (0.70 -> 0.710.05) are affected by bug 468009
-        blacklist => ['^0\.70', '^0\.710?\.0[1-5]$'],
+        # 0.710.04 is required for correct UTF-8 handling, but .04 and .05 are
+        # affected by bug 468009.
+        version => '0.710.06',
         feature => ['xmlrpc'],
     },
     {
diff --git a/mozilla/webtools/bugzilla/Bugzilla/WebService/Server/XMLRPC.pm b/mozilla/webtools/bugzilla/Bugzilla/WebService/Server/XMLRPC.pm
index e85fab95c27..c85614f7ad3 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/WebService/Server/XMLRPC.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/WebService/Server/XMLRPC.pm
@@ -149,16 +149,6 @@ sub new {
     return $self;
 }
 
-sub as_string {
-    my $self = shift;
-    my ($value) = @_;
-    # Something weird happens with XML::Parser when we have upper-ASCII 
-    # characters encoded as UTF-8, and this fixes it.
-    utf8::encode($value) if utf8::is_utf8($value) 
-                            && $value =~ /^[\x00-\xff]+$/;
-    return $self->SUPER::as_string($value);
-}
-
 # Here the XMLRPC::Serializer is extended to use the XMLRPC nil extension.
 sub encode_object {
     my $self = shift;