merge with apt/experimental

[apt.git] / methods / http.cc

diff --git a/methods/http.cc b/methods/http.cc
index 7979af2995cd761595630462c98275024656d4ea..d2e03cfbc13352c295e13080d38c3f20a8beed73 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -582,7 +582,7 @@ bool ServerState::HeaderLine(string Line)
         Persistent = false;
       else
       {
         Persistent = false;
       else
       {

-        if (Major == 1 && Minor <= 0)
+        if (Major == 1 && Minor == 0)

            Persistent = false;
         else
            Persistent = true;
            Persistent = false;
         else
            Persistent = true;


@@ -1327,7 +1327,7 @@ int HttpMethod::Loop()
                after the same URI is seen twice in a queue item. */
             StringVector &R = Redirected[Queue->DestFile];
             bool StopRedirects = false;
                after the same URI is seen twice in a queue item. */
             StringVector &R = Redirected[Queue->DestFile];
             bool StopRedirects = false;

-            if (R.size() == 0)
+            if (R.empty() == true)

                R.push_back(Queue->Uri);
             else if (R[0] == "STOP" || R.size() > 10)
                StopRedirects = true;
                R.push_back(Queue->Uri);
             else if (R[0] == "STOP" || R.size() > 10)
                StopRedirects = true;