fix two "(style) Variable 'Res' is assigned a value that is never used"

[apt.git] / methods / http.cc

diff --git a/methods/http.cc b/methods/http.cc
index b8ed43cd256cb99d07827adb0bff7dc761c553b8..7ddf8e045b729dd21ee2abc606438b6980ea08d4 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -534,10 +534,6 @@ bool ServerState::HeaderLine(string Line)
    if (Line.empty() == true)
       return true;
 
    if (Line.empty() == true)
       return true;
 

-   // The http server might be trying to do something evil.
-   if (Line.length() >= MAXLEN)
-      return _error->Error(_("Got a single header line over %u chars"),MAXLEN);
-

    string::size_type Pos = Line.find(' ');
    if (Pos == string::npos || Pos+1 > Line.length())
    {
    string::size_type Pos = Line.find(' ');
    if (Pos == string::npos || Pos+1 > Line.length())
    {


@@ -716,7 +712,19 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
       }
    }
 
       }
    }
 

-   
+   // If we ask for uncompressed files servers might respond with content-
+   // negotation which lets us end up with compressed files we do not support,
+   // see 657029, 657560 and co, so if we have no extension on the request
+   // ask for text only. As a sidenote: If there is nothing to negotate servers
+   // seem to be nice and ignore it.
+   if (_config->FindB("Acquire::http::SendAccept", true) == true)
+   {
+      size_t const filepos = Itm->Uri.find_last_of('/');
+      string const file = Itm->Uri.substr(filepos + 1);
+      if (flExtension(file) == file)
+        strcat(Buf,"Accept: text/*\r\n");
+   }
+

    string Req = Buf;
 
    // Check for a partial file
    string Req = Buf;
 
    // Check for a partial file