version 10.0

ArticleDownloader.cpp

@@ -226,11 +226,16 @@ void ArticleDownloader::Run()
 			iRemainedRetries--;
 		}
 
-		if (!bConnected || (Status == adFailed && iRemainedRetries > 0))
+		if (!bConnected || (Status == adFailed && iRemainedRetries > 1))
 		{
 			pWantServer = pLastServer;
 		}
 
+		if (Status == adNotFound || Status == adCrcError || (Status == adFailed && iRemainedRetries == 0))
+		{
+			failedServers.push_back(pLastServer);
+		}
+
 		if (pWantServer && !IsStopped() &&
 			!(g_pOptions->GetPauseDownload() || g_pOptions->GetPauseDownload2()))
 		{
@@ -255,8 +260,6 @@ void ArticleDownloader::Run()
 
 		if (!pWantServer)
 		{
-			failedServers.push_back(pLastServer);
-
 			// if all servers from current level were tried, increase level
 			// if all servers from all levels were tried, break the loop with failure status
 

ArticleDownloader.h

@@ -46,6 +46,7 @@ public:
 		adFinished,
 		adFailed,
 		adRetry,
+		adDecodeError,
 		adCrcError,
 		adDecoding,
 		adJoining,

ChangeLog

@@ -1,7 +1,3 @@
-nzbget-10.1:
-  - fixed: articles with decoding errors (incomplete or damaged posts)
-    caused infinite retry-loop in downloader.
-
 nzbget-10.0:
   - added built-in unpack:
         - rar and 7-zip formats are supported (via external Unrar and

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for nzbget 10.1.
+# Generated by GNU Autoconf 2.61 for nzbget 10.0.
 #
 # Report bugs to <hugbug@users.sourceforge.net>.
 #
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='nzbget'
 PACKAGE_TARNAME='nzbget'
-PACKAGE_VERSION='10.1'
-PACKAGE_STRING='nzbget 10.1'
+PACKAGE_VERSION='10.0'
+PACKAGE_STRING='nzbget 10.0'
 PACKAGE_BUGREPORT='hugbug@users.sourceforge.net'
 
 ac_unique_file="nzbget.cpp"
@@ -1235,7 +1235,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 nzbget 10.1 to adapt to many kinds of systems.
+\`configure' configures nzbget 10.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1306,7 +1306,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of nzbget 10.1:";;
+     short | recursive ) echo "Configuration of nzbget 10.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1452,7 +1452,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-nzbget configure 10.1
+nzbget configure 10.0
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1466,7 +1466,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 nzbget $as_me 10.1, which was
+It was created by nzbget $as_me 10.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2262,7 +2262,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=nzbget
- VERSION=10.1
+ VERSION=10.0
 
 
 cat >>confdefs.h <<_ACEOF
@@ -9283,7 +9283,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 nzbget $as_me 10.1, which was
+This file was extended by nzbget $as_me 10.0, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -9336,7 +9336,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-nzbget config.status 10.1
+nzbget config.status 10.0
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

configure.ac

@@ -2,9 +2,9 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(nzbget, 10.1, hugbug@users.sourceforge.net)
+AC_INIT(nzbget, 10.0, hugbug@users.sourceforge.net)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(nzbget, 10.1)
+AM_INIT_AUTOMAKE(nzbget, 10.0)
 AC_CONFIG_SRCDIR([nzbget.cpp])
 AC_CONFIG_HEADERS([config.h])
 

win32.h

@@ -74,7 +74,7 @@
 /* Define to 1 if spinlocks are supported */
 #define HAVE_SPINLOCK
 
-#define VERSION "10.1"
+#define VERSION "10.0"
 
 /* Suppress warnings */
 #define _CRT_SECURE_NO_DEPRECATE