From 7cce6c46a8b8c48608765d62893650539dd97edd Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Sun, 20 Sep 2009 09:31:42 +0000
Subject: [PATCH] 2009-09-20  Tatsuhiro Tsujikawa 
 <t-tujikawa@users.sourceforge.net>

	Added XML-RPC in -v Configuration output.
	* src/FeatureConfig.cc
	* src/FeatureConfig.h
	* test/FeatureConfigTest.cc
---
 ChangeLog                 |  7 +++++++
 src/FeatureConfig.cc      |  8 ++++++++
 src/FeatureConfig.h       |  5 ++++-
 test/FeatureConfigTest.cc | 11 +++++++++--
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 70c0da17..74fcf86c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-20  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
+
+	Added XML-RPC in -v Configuration output.
+	* src/FeatureConfig.cc
+	* src/FeatureConfig.h
+	* test/FeatureConfigTest.cc
+
 2009-09-20  Tatsuhiro Tsujikawa  <t-tujikawa@users.sourceforge.net>
 
 	Updated Bulgarian, Russian, Slovak and Japanese
diff --git a/src/FeatureConfig.cc b/src/FeatureConfig.cc
index a1f847b2..e41ce5cd 100644
--- a/src/FeatureConfig.cc
+++ b/src/FeatureConfig.cc
@@ -49,6 +49,7 @@ const std::string FeatureConfig::FEATURE_BITTORRENT("BitTorrent");
 const std::string FeatureConfig::FEATURE_METALINK("Metalink");
 const std::string FeatureConfig::FEATURE_MESSAGE_DIGEST("Message Digest");
 const std::string FeatureConfig::FEATURE_ASYNC_DNS("Async DNS");
+const std::string FeatureConfig::FEATURE_XML_RPC("XML-RPC");
 const std::string FeatureConfig::FEATURE_GZIP("GZip");
 const std::string FeatureConfig::FEATURE_FIREFOX3_COOKIE("Firefox3 Cookie");
 
@@ -82,6 +83,12 @@ const std::string FeatureConfig::FEATURE_FIREFOX3_COOKIE("Firefox3 Cookie");
 # define ASYNC_DNS_ENABLED false
 #endif // !ENABLE_ASYNC_DNS
 
+#ifdef ENABLE_XML_RPC
+# define XML_RPC_ENABLED true
+#else // !ENABLE_XML_RPC
+# define XML_RPC_ENABLED false
+#endif // !ENABLE_XML_RPC
+
 #ifdef HAVE_LIBZ
 # define GZIP_ENABLED true
 #else // !HAVE_LIBZ
@@ -105,6 +112,7 @@ FeatureConfig::FeatureConfig() {
     FeatureMap::value_type(FEATURE_METALINK, METALINK_ENABLED),
     FeatureMap::value_type(FEATURE_MESSAGE_DIGEST, MESSAGE_DIGEST_ENABLED),
     FeatureMap::value_type(FEATURE_ASYNC_DNS, ASYNC_DNS_ENABLED),
+    FeatureMap::value_type(FEATURE_XML_RPC, XML_RPC_ENABLED),
     FeatureMap::value_type(FEATURE_GZIP, GZIP_ENABLED),
     FeatureMap::value_type(FEATURE_FIREFOX3_COOKIE, FIREFOX3_COOKIE_ENABLED),
   };
diff --git a/src/FeatureConfig.h b/src/FeatureConfig.h
index 97ee1a15..89b08fcb 100644
--- a/src/FeatureConfig.h
+++ b/src/FeatureConfig.h
@@ -36,10 +36,12 @@
 #define _D_FEATURE_CONFIG_H_
 
 #include "common.h"
-#include "SharedHandle.h"
+
 #include <map>
 #include <string>
 
+#include "SharedHandle.h"
+
 namespace aria2 {
 
 typedef std::map<std::string, uint16_t> PortMap;
@@ -72,6 +74,7 @@ public:
   static const std::string FEATURE_METALINK;
   static const std::string FEATURE_MESSAGE_DIGEST;
   static const std::string FEATURE_ASYNC_DNS;
+  static const std::string FEATURE_XML_RPC;
   static const std::string FEATURE_GZIP;
   static const std::string FEATURE_FIREFOX3_COOKIE;
 };
diff --git a/test/FeatureConfigTest.cc b/test/FeatureConfigTest.cc
index db135c0b..b848735b 100644
--- a/test/FeatureConfigTest.cc
+++ b/test/FeatureConfigTest.cc
@@ -1,9 +1,12 @@
 #include "FeatureConfig.h"
+
+#include <algorithm>
+
+#include <cppunit/extensions/HelperMacros.h>
+
 #include "a2functional.h"
 #include "array_fun.h"
 #include "Util.h"
-#include <algorithm>
-#include <cppunit/extensions/HelperMacros.h>
 
 namespace aria2 {
 
@@ -78,6 +81,10 @@ void FeatureConfigTest::testFeatureSummary() {
     "Metalink",
 #endif // ENABLE_METALINK
 
+#ifdef ENABLE_XML_RPC
+    "XML-RPC",
+#endif // ENABLE_XML_RPC
+
   };
 
   std::string featuresString;