WIP local deb install

[apt.git] / methods / http.cc

diff --git a/methods/http.cc b/methods/http.cc
index e1bb2e13061e45b937420bed6f5eb9d8ee89eba2..ed6e3517dece002eb9b4d231eb66b4e8f0a0bcd0 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -33,24 +33,21 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/netrc.h>
+#include <apt-pkg/strutl.h>
 
+#include <stddef.h>
+#include <stdlib.h>
+#include <sys/select.h>
+#include <cstring>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <unistd.h>
-#include <signal.h>
 #include <stdio.h>
 #include <errno.h>
-#include <string.h>
-#include <climits>
 #include <iostream>
-#include <map>
-
-// Internet stuff
-#include <netdb.h>
 
 #include "config.h"
 #include "connect.h"
-#include "rfc2553emu.h"
 #include "http.h"
 
 #include <apti18n.h>
@@ -473,7 +470,7 @@ bool HttpServerState::WriteResponse(const std::string &Data)                /*{{{*/
    return Out.Read(Data);
 }
                                                                        /*}}}*/
-bool HttpServerState::IsOpen()                                         /*{{{*/
+APT_PURE bool HttpServerState::IsOpen()                                        /*{{{*/
 {
    return (ServerFd != -1);
 }
@@ -488,7 +485,7 @@ bool HttpServerState::InitHashes(FileFd &File)                              /*{{{*/
    return In.Hash->AddFD(File, StartPos);
 }
                                                                        /*}}}*/
-Hashes * HttpServerState::GetHashes()                                  /*{{{*/
+APT_PURE Hashes * HttpServerState::GetHashes()                         /*{{{*/
 {
    return In.Hash;
 }