[Pkg-owncloud-commits] [owncloud-client] 419/484: Blacklist: Treat all 403s the same #4071

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 698f47d5ad2e84508a461b205e6b9d57f6f6f8ca
Author: Christian Kamm <mail at ckamm.de>
Date:   Wed Nov 25 12:49:57 2015 +0100

    Blacklist: Treat all 403s the same #4071
    
    We can't detect firewall errors due to error message localization.
---
 src/libsync/syncjournalfilerecord.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libsync/syncjournalfilerecord.cpp b/src/libsync/syncjournalfilerecord.cpp
index 04664ef..9d1a59c 100644
--- a/src/libsync/syncjournalfilerecord.cpp
+++ b/src/libsync/syncjournalfilerecord.cpp
@@ -152,11 +152,11 @@ SyncJournalErrorBlacklistRecord SyncJournalErrorBlacklistRecord::update(
     entry._ignoreDuration = old._ignoreDuration * 5;
     entry._file = item._file;
 
-    if (item._httpErrorCode == 403 && item._errorString.contains("firewall", Qt::CaseInsensitive)) {
-        qDebug() << "Firewall error: " << item._httpErrorCode << ", blacklisting up to 1h only";
+    if( item._httpErrorCode == 403 ) {
+        qDebug() << "Probably firewall error: " << item._httpErrorCode << ", blacklisting up to 1h only";
         entry._ignoreDuration = qMin(entry._ignoreDuration, time_t(60*60));
 
-    } else if( item._httpErrorCode == 403 || item._httpErrorCode == 413 || item._httpErrorCode == 415 ) {
+    } else if( item._httpErrorCode == 413 || item._httpErrorCode == 415 ) {
         qDebug() << "Fatal Error condition" << item._httpErrorCode << ", maximum blacklist ignore time!";
         entry._ignoreDuration = maxBlacklistTime;
     }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git