Another sync with Christian

debian/changelog

@@ -29,6 +29,7 @@ apt (0.7.4) UNRELEASED; urgency=low
   * French translation update
   * Re-generate PO(T) files
   * Spanish translation update
+  * Swedish translation update
 
  -- Otavio Salvador <otavio@ossystems.com.br>  Sat, 14 Jul 2007 15:52:15 -0300
 
@@ -2569,4 +2570,3 @@ apt (0.0.1) unstable; urgency=low
   * Initial Release.
 
  -- Scott K. Ellis <scott@debian.org>  Tue, 31 Mar 1998 12:49:28 -0500
-

methods/http.cc

@@ -1164,25 +1164,24 @@ int HttpMethod::Loop()
 	       URIDone(Res);
 	    }
 	    else
-		{
-		  if (Server->ServerFd == -1)
+	    {
+	       if (Server->ServerFd == -1)
+	       {
+		  FailCounter++;
+		  _error->Discard();
+		  Server->Close();
+		  
+		  if (FailCounter >= 2)
 		  {
-			  FailCounter++;
-			  _error->Discard();
-			  Server->Close();
-	    
-			  if (FailCounter >= 2)
-			  {
-				  Fail(_("Connection failed"),true);
-				  FailCounter = 0;
-			  }
-	    
-			  QueueBack = Queue;
+		     Fail(_("Connection failed"),true);
+		     FailCounter = 0;
 		  }
-		  else
-			  Fail(true);
-		}
-
+		  
+		  QueueBack = Queue;
+	       }
+	       else
+		  Fail(true);
+	    }
 	    break;
 	 }