@@ -1,3 +1,7 @@

+Fri Dec  4 15:55:51 CET 2009 (tk)

+---------------------------------

+ * freshclam/manager.c: improve handling of problematic mirrors (bb#1758)

+

 Fri Dec  4 14:19:23 CET 2009 (tk)

 ---------------------------------

  * clamscan: properly describe --include/exclude (bb#1765)

@@ -1126,10 +1126,9 @@ static int getfile(const char *srcfile, const char *destfile, const char *hostna

 	    return 57; /* FIXME */

 	}

-        if(totalsize > 0) {

-	    totaldownloaded += bread;

+	totaldownloaded += bread;

+        if(totalsize > 0)

             percentage = (int) (100 * (float) totaldownloaded / totalsize);

-	}

         if(!mprintf_quiet) {

             if(totalsize > 0) {

@@ -1145,9 +1144,9 @@ static int getfile(const char *srcfile, const char *destfile, const char *hostna

     closesocket(sd);

     close(fd);

-    if(bread == -1) {

+    if(bread == -1 || !totaldownloaded) {

 	logg("%cgetfile: Download interrupted: %s (IP: %s)\n", logerr ? '!' : '^', strerror(errno), ipaddr);

-	mirman_update(mdat->currip, mdat->af, mdat, 1);

+	mirman_update(mdat->currip, mdat->af, mdat, 2);

 	return 52;

     }