HttpsMethod::Fetch(): Zero the FetchResult object when leaving due to 404

[apt.git] / methods / http.cc

diff --git a/methods/http.cc b/methods/http.cc
index c734d3799bca55cadf27aafce93fb4e3391289e1..1b996db9816bab01f688a645a0f855b90a0c138f 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -34,6 +34,7 @@
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/netrc.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/netrc.h>
 #include <apt-pkg/strutl.h>

+#include <apt-pkg/proxy.h>

 
 #include <stddef.h>
 #include <stdlib.h>
 
 #include <stddef.h>
 #include <stdlib.h>


@@ -304,6 +305,7 @@ bool HttpServerState::Open()
    Persistent = true;
    
    // Determine the proxy setting
    Persistent = true;
    
    // Determine the proxy setting

+   AutoDetectProxy(ServerName);

    string SpecificProxy = _config->Find("Acquire::http::Proxy::" + ServerName.Host);
    if (!SpecificProxy.empty())
    {
    string SpecificProxy = _config->Find("Acquire::http::Proxy::" + ServerName.Host);
    if (!SpecificProxy.empty())
    {


@@ -438,6 +440,8 @@ bool HttpServerState::RunData(FileFd * const File)
          loss of the connection means we are done */
       if (Encoding == Closes)
         In.Limit(-1);
          loss of the connection means we are done */
       if (Encoding == Closes)
         In.Limit(-1);

+      else if (JunkSize != 0)
+        In.Limit(JunkSize);

       else
         In.Limit(Size - StartPos);
       
       else
         In.Limit(Size - StartPos);
       


@@ -744,7 +748,7 @@ void HttpMethod::SendReq(FetchItem *Itm)
    Req << "\r\n";
 
    if (Debug == true)
    Req << "\r\n";
 
    if (Debug == true)

-      cerr << Req << endl;
+      cerr << Req.str() << endl;

 
    Server->WriteResponse(Req.str());
 }
 
    Server->WriteResponse(Req.str());
 }


@@ -762,66 +766,6 @@ bool HttpMethod::Configuration(string Message)
                                  PipelineDepth);
    Debug = _config->FindB("Debug::Acquire::http",false);
 
                                  PipelineDepth);
    Debug = _config->FindB("Debug::Acquire::http",false);
 

-   // Get the proxy to use
-   AutoDetectProxy();
-
-   return true;
-}
-                                                                       /*}}}*/
-// HttpMethod::AutoDetectProxy - auto detect proxy                     /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-bool HttpMethod::AutoDetectProxy()
-{
-   // option is "Acquire::http::Proxy-Auto-Detect" but we allow the old
-   // name without the dash ("-")
-   AutoDetectProxyCmd = _config->Find("Acquire::http::Proxy-Auto-Detect",
-                                      _config->Find("Acquire::http::ProxyAutoDetect"));
-
-   if (AutoDetectProxyCmd.empty())
-      return true;
-
-   if (Debug)
-      clog << "Using auto proxy detect command: " << AutoDetectProxyCmd << endl;
-
-   int Pipes[2] = {-1,-1};
-   if (pipe(Pipes) != 0)
-      return _error->Errno("pipe", "Failed to create Pipe");
-
-   pid_t Process = ExecFork();
-   if (Process == 0)
-   {
-      close(Pipes[0]);
-      dup2(Pipes[1],STDOUT_FILENO);
-      SetCloseExec(STDOUT_FILENO,false);
-
-      const char *Args[2];
-      Args[0] = AutoDetectProxyCmd.c_str();
-      Args[1] = 0;
-      execv(Args[0],(char **)Args);
-      cerr << "Failed to exec method " << Args[0] << endl;
-      _exit(100);
-   }
-   char buf[512];
-   int InFd = Pipes[0];
-   close(Pipes[1]);
-   int res = read(InFd, buf, sizeof(buf)-1);
-   ExecWait(Process, "ProxyAutoDetect", true);
-
-   if (res < 0)
-      return _error->Errno("read", "Failed to read");
-   if (res == 0)
-      return _error->Warning("ProxyAutoDetect returned no data");
-
-   // add trailing \0
-   buf[res] = 0;
-
-   if (Debug)
-      clog << "auto detect command returned: '" << buf << "'" << endl;
-
-   if (strstr(buf, "http://") == buf)
-      _config->Set("Acquire::http::proxy", _strstrip(buf));
-

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/