Compare commits

...

4 Commits
v9.1 ... v10.1

Author SHA1 Message Date
Andrey Prygunkov
aa78a360fe version 10.1 2013-03-31 20:12:14 +00:00
Andrey Prygunkov
d014407ba4 updated ChangeLog 2013-03-31 14:37:57 +00:00
Andrey Prygunkov
2e8bfa16f9 fixed: articles with decoding errors (incomplete or damaged posts) caused infinite retry-loop in downloader 2013-03-31 14:36:15 +00:00
Andrey Prygunkov
bf34713b0c updated version string to 10.1 2013-03-31 14:10:57 +00:00
6 changed files with 20 additions and 20 deletions

View File

@@ -226,16 +226,11 @@ void ArticleDownloader::Run()
iRemainedRetries--;
}
if (!bConnected || (Status == adFailed && iRemainedRetries > 1))
if (!bConnected || (Status == adFailed && iRemainedRetries > 0))
{
pWantServer = pLastServer;
}
if (Status == adNotFound || Status == adCrcError || (Status == adFailed && iRemainedRetries == 0))
{
failedServers.push_back(pLastServer);
}
if (pWantServer && !IsStopped() &&
!(g_pOptions->GetPauseDownload() || g_pOptions->GetPauseDownload2()))
{
@@ -260,6 +255,8 @@ 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

View File

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

View File

@@ -1,3 +1,7 @@
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

20
configure vendored
View File

@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for nzbget 10.0.
# Generated by GNU Autoconf 2.61 for nzbget 10.1.
#
# 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.0'
PACKAGE_STRING='nzbget 10.0'
PACKAGE_VERSION='10.1'
PACKAGE_STRING='nzbget 10.1'
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.0 to adapt to many kinds of systems.
\`configure' configures nzbget 10.1 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.0:";;
short | recursive ) echo "Configuration of nzbget 10.1:";;
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.0
nzbget configure 10.1
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.0, which was
It was created by nzbget $as_me 10.1, 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.0
VERSION=10.1
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.0, which was
This file was extended by nzbget $as_me 10.1, 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.0
nzbget config.status 10.1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

View File

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

View File

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