README

@@ -24,6 +24,9 @@ aria2 is in very early development stage. Currently it has following features:
 * Selective download in multi-file torrent
 * Metalink version 3.0 support(HTTP/FTP/BitTorrent).
 * Limiting download/upload speed.
+* Chunk checksum validation in Metalink.
+* netrc support.
+* Configuration file support.
 
 3. How to build
 ---------------
@@ -100,3 +103,26 @@ The supported user preferences are version, language 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
 a command-line option.
+
+7. netrc
+--------
+netrc support is enabled by default in ftp.
+To disable netrc support, specify -n command-line option.
+Your .netrc file should have correct permissions(600).
+
+8. Configuration file
+---------------------
+Configuration file must be placed under ~/.aria2 and must be named as
+aria2.conf. Options in a file are one option per line.
+The syntax is name=value, where name is the long option name without '--'
+prefix.
+The line beginning '#' are treated as comments.
+
+Examples:
+
+# sample configuration file for aria2c
+file-allocation=prealloc
+listen-port=60000
+seed-ratio=1.0
+max-upload-limit=40K
+ftp-pasv=true

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for aria2c 0.10.1.
+# Generated by GNU Autoconf 2.61 for aria2c 0.10.2.
 #
 # Report bugs to <t-tujikawa@users.sourceforge.net>.
 #
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='aria2c'
 PACKAGE_TARNAME='aria2c'
-PACKAGE_VERSION='0.10.1'
-PACKAGE_STRING='aria2c 0.10.1'
+PACKAGE_VERSION='0.10.2'
+PACKAGE_STRING='aria2c 0.10.2'
 PACKAGE_BUGREPORT='t-tujikawa@users.sourceforge.net'
 
 ac_unique_file="src/Socket.h"
@@ -1275,7 +1275,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures aria2c 0.10.1 to adapt to many kinds of systems.
+\`configure' configures aria2c 0.10.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1345,7 +1345,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of aria2c 0.10.1:";;
+     short | recursive ) echo "Configuration of aria2c 0.10.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1466,7 +1466,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-aria2c configure 0.10.1
+aria2c configure 0.10.2
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1480,7 +1480,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by aria2c $as_me 0.10.1, which was
+It was created by aria2c $as_me 0.10.2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2150,7 +2150,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='aria2c'
- VERSION='0.10.1'
+ VERSION='0.10.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12941,7 +12941,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by aria2c $as_me 0.10.1, which was
+This file was extended by aria2c $as_me 0.10.2, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -12994,7 +12994,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-aria2c config.status 0.10.1
+aria2c config.status 0.10.2
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 #
 AC_PREREQ(2.59)
-AC_INIT(aria2c, 0.10.1, t-tujikawa@users.sourceforge.net)
+AC_INIT(aria2c, 0.10.2, t-tujikawa@users.sourceforge.net)
 AM_INIT_AUTOMAKE()
 AM_PATH_CPPUNIT(1.10.2)
 AC_CONFIG_SRCDIR([src/Socket.h])

test/Makefile.in

@@ -57,7 +57,10 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 am__EXEEXT_1 = aria2c$(EXEEXT)
-am_aria2c_OBJECTS = AllTest.$(OBJEXT) RequestFactoryTest.$(OBJEXT)
+am_aria2c_OBJECTS = AllTest.$(OBJEXT) RequestFactoryTest.$(OBJEXT) \
+	NetrcAuthResolverTest.$(OBJEXT) \
+	DefaultAuthResolverTest.$(OBJEXT) RequestTest.$(OBJEXT) \
+	HttpRequestTest.$(OBJEXT)
 aria2c_OBJECTS = $(am_aria2c_OBJECTS)
 am__DEPENDENCIES_1 =
 aria2c_DEPENDENCIES = ../src/libaria2c.a $(am__DEPENDENCIES_1)
@@ -218,77 +221,12 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 TESTS = aria2c
 aria2c_SOURCES = AllTest.cc\
-	RequestFactoryTest.cc
-
-# 	NetrcAuthResolverTest.cc\
-# 	DefaultAuthResolverTest.cc\
-# 	RequestTest.cc\
-# 	HttpRequestTest.cc
-# 	UtilTest.cc\
-# 	OptionHandlerTest.cc\
-# 	SegmentManTest.cc\
-# 	BitfieldManTest.cc\
-# 	GlowFileAllocatorTest.cc\
-# 	NetrcTest.cc\
-# 	SingletonHolderTest.cc\
-# 	HttpHeaderTest.cc\
-# 	HttpResponseTest.cc\
-# 	SharedHandleTest.cc\
-# 	ChunkedEncodingTest.cc\
-# 	FileTest.cc\
-# 	OptionTest.cc\
-# 	Base64Test.cc\
-# 	CookieBoxTest.cc\
-# 	DataTest.cc\
-# 	DictionaryTest.cc\
-# 	ListTest.cc\
-# 	MetaFileUtilTest.cc\
-# 	ShaVisitorTest.cc\
-# 	PeerMessageUtilTest.cc\
-# 	DefaultDiskWriterTest.cc\
-# 	MultiDiskAdaptorTest.cc\
-# 	Xml2MetalinkProcessorTest.cc\
-# 	MetalinkerTest.cc\
-# 	MetalinkEntryTest.cc\
-# 	FeatureConfigTest.cc\
-# 	ShareRatioSeedCriteriaTest.cc\
-# 	TimeSeedCriteriaTest.cc\
-# 	SpeedCalcTest.cc\
-# 	DefaultPeerListProcessorTest.cc\
-# 	AnnounceListTest.cc\
-# 	TrackerWatcherCommandTest.cc\
-# 	DefaultBtContextTest.cc\
-# 	DefaultPieceStorageTest.cc\
-# 	DefaultPeerStorageTest.cc\
-# 	DefaultBtAnnounceTest.cc\
-# 	BtRegistryTest.cc\
-# 	DefaultBtMessageDispatcherTest.cc\
-# 	MockPeerStorage.h\
-# 	DefaultBtRequestFactoryTest.cc\
-# 	PeerTest.cc\
-# 	BtAllowedFastMessageTest.cc\
-# 	BtBitfieldMessageTest.cc\
-# 	BtCancelMessageTest.cc\
-# 	BtChokeMessageTest.cc\
-# 	BtHaveAllMessageTest.cc\
-# 	BtHaveMessageTest.cc\
-# 	BtHaveNoneMessageTest.cc\
-# 	BtInterestedMessageTest.cc\
-# 	BtKeepAliveMessageTest.cc\
-# 	BtNotInterestedMessageTest.cc\
-# 	BtPieceMessageTest.cc\
-# 	BtPortMessageTest.cc\
-# 	BtRejectMessageTest.cc\
-# 	BtRequestMessageTest.cc\
-# 	BtSuggestPieceMessageTest.cc\
-# 	BtUnchokeMessageTest.cc\
-# 	BtHandshakeMessageTest.cc\
-# 	MockBtMessageDispatcher.h\
-# 	FixedNumberRandomizer.h\
-# 	MockBtMessageFactory.h\
-# 	MockBtMessage.h\
-# 	ConsoleFileAllocationMonitorTest.cc\
-# 	ChunkChecksumValidatorTest.cc
+	RequestFactoryTest.cc\
+	NetrcAuthResolverTest.cc\
+	DefaultAuthResolverTest.cc\
+	RequestTest.cc\
+	HttpRequestTest.cc
+
 #aria2c_CXXFLAGS = ${CPPUNIT_CFLAGS} -I../src -I../lib -Wall -D_FILE_OFFSET_BITS=64
 #aria2c_LDFLAGS = ${CPPUNIT_LIBS}
 aria2c_LDADD = ../src/libaria2c.a\
@@ -351,7 +289,11 @@ distclean-compile:
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/AllTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/DefaultAuthResolverTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/HttpRequestTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetrcAuthResolverTest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RequestFactoryTest.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RequestTest.Po@am__quote@
 
 .cc.o:
 @am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -606,6 +548,71 @@ uninstall-am: uninstall-info-am
 	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
 	uninstall-am uninstall-info-am
 
+	UtilTest.cc\
+	OptionHandlerTest.cc\
+	SegmentManTest.cc\
+	BitfieldManTest.cc\
+	GlowFileAllocatorTest.cc\
+	NetrcTest.cc\
+	SingletonHolderTest.cc\
+	HttpHeaderTest.cc\
+	HttpResponseTest.cc\
+	SharedHandleTest.cc\
+	ChunkedEncodingTest.cc\
+	FileTest.cc\
+	OptionTest.cc\
+	Base64Test.cc\
+	CookieBoxTest.cc\
+	DataTest.cc\
+	DictionaryTest.cc\
+	ListTest.cc\
+	MetaFileUtilTest.cc\
+	ShaVisitorTest.cc\
+	PeerMessageUtilTest.cc\
+	DefaultDiskWriterTest.cc\
+	MultiDiskAdaptorTest.cc\
+	Xml2MetalinkProcessorTest.cc\
+	MetalinkerTest.cc\
+	MetalinkEntryTest.cc\
+	FeatureConfigTest.cc\
+	ShareRatioSeedCriteriaTest.cc\
+	TimeSeedCriteriaTest.cc\
+	SpeedCalcTest.cc\
+	DefaultPeerListProcessorTest.cc\
+	AnnounceListTest.cc\
+	TrackerWatcherCommandTest.cc\
+	DefaultBtContextTest.cc\
+	DefaultPieceStorageTest.cc\
+	DefaultPeerStorageTest.cc\
+	DefaultBtAnnounceTest.cc\
+	BtRegistryTest.cc\
+	DefaultBtMessageDispatcherTest.cc\
+	MockPeerStorage.h\
+	DefaultBtRequestFactoryTest.cc\
+	PeerTest.cc\
+	BtAllowedFastMessageTest.cc\
+	BtBitfieldMessageTest.cc\
+	BtCancelMessageTest.cc\
+	BtChokeMessageTest.cc\
+	BtHaveAllMessageTest.cc\
+	BtHaveMessageTest.cc\
+	BtHaveNoneMessageTest.cc\
+	BtInterestedMessageTest.cc\
+	BtKeepAliveMessageTest.cc\
+	BtNotInterestedMessageTest.cc\
+	BtPieceMessageTest.cc\
+	BtPortMessageTest.cc\
+	BtRejectMessageTest.cc\
+	BtRequestMessageTest.cc\
+	BtSuggestPieceMessageTest.cc\
+	BtUnchokeMessageTest.cc\
+	BtHandshakeMessageTest.cc\
+	MockBtMessageDispatcher.h\
+	FixedNumberRandomizer.h\
+	MockBtMessageFactory.h\
+	MockBtMessage.h\
+	ConsoleFileAllocationMonitorTest.cc\
+	ChunkChecksumValidatorTest.cc
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: