From 6f8537cf7f1340d4c98c801c0aaa10c8b3814cc5 Mon Sep 17 00:00:00 2001
From: jeg2 <jeg2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 24 Oct 2007 19:48:06 +0000
Subject: [PATCH] * lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): Improving the
 error   message for Content-Type check failures. [ruby-core:12163]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13768 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog            | 5 +++++
 lib/xmlrpc/client.rb | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index be8433481c..15a1c6be1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct 25 04:46:53 2007  James Edward Gray II  <jeg2@ruby-lang.org>
+
+	* lib/xmlrpc/client.rb (XMLRPC::Client#do_rpc): Improving the error
+	  message for Content-Type check failures. [ruby-core:12163]
+
 Wed Oct 25 03:45:08 2007  James Edward Gray II  <jeg2@ruby-lang.org>
 
 	* lib/xmlrpc/utils.rb (XMLRPC::ParseContentType#parse_content_type):
diff --git a/lib/xmlrpc/client.rb b/lib/xmlrpc/client.rb
index 10f547b632..fca0725ed0 100644
--- a/lib/xmlrpc/client.rb
+++ b/lib/xmlrpc/client.rb
@@ -549,9 +549,9 @@ module XMLRPC
       ct = parse_content_type(resp["Content-Type"]).first
       if ct != "text/xml"
         if ct == "text/html"
-          raise "Wrong content-type: \n#{data}"
+          raise "Wrong content-type (received '#{ct}' but expected 'text/xml'): \n#{data}"
         else
-          raise "Wrong content-type"
+          raise "Wrong content-type (received '#{ct}' but expected 'text/xml')"
         end
       end