Changeset 10639

Timestamp:

May 11, 2010, 1:32:29 PM (12 years ago)

Author:

charles

Message:

(trunk libT) #3203 "torrents halted after 'Tracker returned a 4xx message'" -- fixed in trunk for 2.00

File:

• trunk/libtransmission/announcer.c (modified) (2 diffs)

trunk/libtransmission/announcer.c

@@ -1454 +1454 @@
             tier->manualAnnounceAllowedAt = now + tier->announceMinIntervalSec;
         }
+        else if( ( responseCode == 404 ) || ( 500 <= responseCode && responseCode <= 599 ) )
+        {
+            /* 404: The requested resource could not be found but may be
+             * available again in the future.  Subsequent requests by
+             * the client are permissible. */
+
+            /* 5xx: indicate cases in which the server is aware that it
+             * has erred or is incapable of performing the request.
+             * So we pause a bit and try again. */
+
+            const int interval = getRetryInterval( tier->currentTracker->host );
+            tier->manualAnnounceAllowedAt = ~(time_t)0;
+            tierAddAnnounce( tier, announceEvent, now + interval );
+        }
         else if( 400 <= responseCode && responseCode <= 499 )
         {
@@ -1463 +1477 @@
             tier->announceAt = 0;
             tier->manualAnnounceAllowedAt = ~(time_t)0;
-        }
-        else if( 500 <= responseCode && responseCode <= 599 )
-        {
-            /* Response status codes beginning with the digit "5" indicate
-             * cases in which the server is aware that it has erred or is
-             * incapable of performing the request.  So we pause a bit and
-             * try again. */
-            const int interval = getRetryInterval( tier->currentTracker->host );
-            tier->manualAnnounceAllowedAt = ~(time_t)0;
-            tierAddAnnounce( tier, announceEvent, now + interval );
         }
         else