summaryrefslogtreecommitdiff
path: root/methods
diff options
context:
space:
mode:
Diffstat (limited to 'methods')
-rw-r--r--methods/http.cc2
-rw-r--r--methods/http.h2
-rw-r--r--methods/https.cc7
-rw-r--r--methods/https.h4
4 files changed, 7 insertions, 8 deletions
diff --git a/methods/http.cc b/methods/http.cc
index ecfb80bd2..7001b217a 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -3,7 +3,7 @@
// $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $
/* ######################################################################
- HTTP Aquire Method - This is the HTTP aquire method for APT.
+ HTTP Acquire Method - This is the HTTP aquire method for APT.
It uses HTTP/1.1 and many of the fancy options there-in, such as
pipelining, range, if-range and so on.
diff --git a/methods/http.h b/methods/http.h
index a47cd961c..dec5cd80f 100644
--- a/methods/http.h
+++ b/methods/http.h
@@ -3,7 +3,7 @@
// $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $
/* ######################################################################
- HTTP Aquire Method - This is the HTTP aquire method for APT.
+ HTTP Acquire Method - This is the HTTP aquire method for APT.
##################################################################### */
/*}}}*/
diff --git a/methods/https.cc b/methods/https.cc
index b758e4ab3..d48ac97fb 100644
--- a/methods/https.cc
+++ b/methods/https.cc
@@ -3,7 +3,7 @@
// $Id: http.cc,v 1.59 2004/05/08 19:42:35 mdz Exp $
/* ######################################################################
- HTTPS Aquire Method - This is the HTTPS aquire method for APT.
+ HTTPS Acquire Method - This is the HTTPS aquire method for APT.
It uses libcurl
@@ -50,13 +50,13 @@ HttpsMethod::progress_callback(void *clientp, double dltotal, double dlnow,
{
HttpsMethod *me = (HttpsMethod *)clientp;
if(dltotal > 0 && me->Res.Size == 0) {
- me->Res.Size = dltotal;
+ me->Res.Size = (unsigned long)dltotal;
me->URIStart(me->Res);
}
return 0;
}
-bool HttpsMethod::SetupProxy()
+void HttpsMethod::SetupProxy()
{
URI ServerName = Queue->Uri;
@@ -84,7 +84,6 @@ bool HttpsMethod::SetupProxy()
}
// Determine what host and port to use based on the proxy settings
- int Port = 0;
string Host;
if (Proxy.empty() == true || Proxy.Host.empty() == true)
{
diff --git a/methods/https.h b/methods/https.h
index 6620a10fc..2c33d95ee 100644
--- a/methods/https.h
+++ b/methods/https.h
@@ -3,7 +3,7 @@
// $Id: http.h,v 1.12 2002/04/18 05:09:38 jgg Exp $
/* ######################################################################
- HTTP Aquire Method - This is the HTTP aquire method for APT.
+ HTTP Acquire Method - This is the HTTP aquire method for APT.
##################################################################### */
/*}}}*/
@@ -29,7 +29,7 @@ class HttpsMethod : public pkgAcqMethod
static size_t write_data(void *buffer, size_t size, size_t nmemb, void *userp);
static int progress_callback(void *clientp, double dltotal, double dlnow,
double ultotal, double ulnow);
- bool SetupProxy();
+ void SetupProxy();
CURL *curl;
FetchResult Res;