2007-12-14 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>

	Fixed possible memory leak when an exception is thrown.
	* src/XML2SAXMetalinkProcessor.cc

	Added Expat support. If both libxml2 and Expat are installed, 
then
	libxml2 is used by default.
	MetalinkProcessorFactory chooses from XML2SAXMetalinkProcessor 
and
	ExpatMetalinkProcessor according to the configuration.
	* src/ExpatMetalinkProcessor.{h, cc}
	* src/main.cc: Removed libxml2 specific header and init/free 
function.
	* src/MetalinkProcessorFactory.{h, cc}
	* src/MetalinkHelper.cc
	* src/Metalinker.h: Removed unnecessary libxml2 header.
	* src/MetalinkProcessor.h
	* test/XML2SAXMetalinkProcessorTest.cc: Removed because
	MetalinkProcessorTest is used instead.
	* test/MetalinkProcessorTest.cc: Added. It is actually the same 
with
	XML2SAXMetalinkProcessor, replaced XML2SAXMetalinkProcessor with
	MetalinkProcessorFactory::newInstance().
	* m4/libexpat.m4
	* configure.ac: Added configuration options for libexpat.
	

1 files changed, 18 insertions, 8 deletions

diff --git a/README b/README
index febe9f9b..c63b55e7 100644
--- a/README
+++ b/README
@@ -36,11 +36,17 @@ aria2 is in very early development stage. Currently it has following features:
 -------------
 In order to enable HTTPS support, you need GNU TLS or OpenSSL.
 In order to enable BitTorrent support, you need GNU TLS+libgcrypt or OpenSSL.
-In order to enable Metalink support, you need libxml2. Optionally GNU TLS+
-libgcrypt or OpenSSL are required for checksum checking support(MD5, SHA1).
+In order to enable Metalink support, you need libxml2 or Expat. Optionally
+GNU TLS+libgcrypt or OpenSSL are required for checksum checking support(MD5,
+SHA1, SHA256).
 
-GNU TLS has precedence over OpenSSL if both libraries are installed.
-If you prefer OpenSSL, run configure with "--without-gnutls".
+Note;;
+  GNU TLS has precedence over OpenSSL if both libraries are installed.
+  If you prefer OpenSSL, run configure with "--without-gnutls".
+
+Note;;
+  libxml2 has precedence over Expat if both libraries are installed.
+  If you prefer Expat, run configure with "--without-libxml2".
 
 You can disable BitTorrent, Metalink support by providing --disable-bittorrent,
 --disable-metalink respectively to configure script.
@@ -63,6 +69,9 @@ packages(package name may vary depending on the distribution you use):
 You can use libssl-dev instead of libgnutls-dev,libgpg-error-dev,libgcrypt-dev:
 * libssl-dev       (Required for HTTPS, BitTorrent support)
 
+You can use libexpat1-dev instead of libxml2-dev:
+* libexpat1-dev    (Required for Metalink support)
+
 The build process is fairly standard way for *nix programs:
 
 $ ./configure
@@ -111,11 +120,12 @@ rate is low.
 The current implementation supports HTTP/FTP/BitTorrent.
 The other P2P protocols are ignored.
 
-For checksum checking, both MD5 and SHA1 are supported. If both values are
-provided, then aria2 uses SHA1. If checksum checking is failed, aria2 doesn't
-retry the download and just exits with non-zero return code.
+For checksum checking, MD5, SHA1, SHA256 are supported. If multiple hash
+algorithms are provided, aria2 uses SHA1. If checksum checking is failed, aria2
+doesn't retry the download and just exits with non-zero return code.
 
-The supported user preferences are version, language and os.
+The supported user preferences are version, language, location, protocol and
+os.
 
 If chunk checksums are provided in Metalink file, aria2 automatically validate
 a chunk of file while downloading it. This behavior can be turned off by