summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/apt.conf.5.yo9
-rw-r--r--methods/copy.cc35
-rw-r--r--methods/http.cc3
3 files changed, 28 insertions, 19 deletions
diff --git a/doc/apt.conf.5.yo b/doc/apt.conf.5.yo
index 67838b21b..1488cc742 100644
--- a/doc/apt.conf.5.yo
+++ b/doc/apt.conf.5.yo
@@ -68,7 +68,7 @@ URI handlers.
startdit()
dit(bf(Queue-Mode))
Queuing mode; bf(Queue-Mode) can be one of bf(host) or bf(access) which
-determins how APT parallelizesoutgoing connections. bf(host) means that
+determins how APT parallelizes outgoing connections. bf(host) means that
one connection per target host will be opened, bf(access) means that one
connection per URI type will be opened.
@@ -82,8 +82,8 @@ will override all settings.
Three settings are provided for cache control with HTTP/1.1 complient proxy
caches. bf(No-Cache) tells the proxy to not used its cached response under
any circumstances, bf(Max-Age) is sent only for index files and tells the
-cache to refresh its object if it is older than the given value. Debian
-updates its index files daily so the default is 1 day. bd(No-Store)
+cache to refresh its object if it is older than the given number of seconds.
+Debian updates its index files daily so the default is 1 day. bf(No-Store)
specifies that the cache should never store this request, it is only
set for archive files. This may be usefull to prevent polluting a proxy cache
with very large .deb files. Note: Squid 2.0.2 does not support any of
@@ -155,6 +155,9 @@ manpagesection(EXAMPLES)
bf(/usr/doc/apt/examples/apt.conf) contains a sample configuration file
showing the default values for all possible options.
+mapagesection(FILES)
+/etc/apt/apt.conf
+
manpageseealso()
apt-cache (8),
apt.conf (5)
diff --git a/methods/copy.cc b/methods/copy.cc
index 94e88e503..c89eb975d 100644
--- a/methods/copy.cc
+++ b/methods/copy.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: copy.cc,v 1.5 1998/11/01 05:27:40 jgg Exp $
+// $Id: copy.cc,v 1.6 1999/01/20 04:36:43 jgg Exp $
/* ######################################################################
Copy URI - This method takes a uri like a file: uri and copies it
@@ -35,28 +35,40 @@ bool CopyMethod::Fetch(FetchItem *Itm)
URI Get = Itm->Uri;
string File = Get.Path;
+ // Stat the file and send a start message
+ struct stat Buf;
+ if (stat(File.c_str(),&Buf) != 0)
+ return _error->Errno("stat","Failed to stat");
+
+ // Forumulate a result and send a start message
+ FetchResult Res;
+ Res.Size = Buf.st_size;
+ Res.Filename = Itm->DestFile;
+ Res.LastModified = Buf.st_mtime;
+ Res.IMSHit = false;
+ URIStart(Res);
+
// See if the file exists
FileFd From(File,FileFd::ReadOnly);
FileFd To(Itm->DestFile,FileFd::WriteEmpty);
To.EraseOnFailure();
if (_error->PendingError() == true)
+ {
+ To.OpFail();
return false;
+ }
// Copy the file
if (CopyFile(From,To) == false)
+ {
+ To.OpFail();
return false;
+ }
From.Close();
To.Close();
// Transfer the modification times
- struct stat Buf;
- if (stat(File.c_str(),&Buf) != 0)
- {
- To.OpFail();
- return _error->Errno("stat","Failed to stat");
- }
-
struct utimbuf TimeBuf;
TimeBuf.actime = Buf.st_atime;
TimeBuf.modtime = Buf.st_mtime;
@@ -66,13 +78,6 @@ bool CopyMethod::Fetch(FetchItem *Itm)
return _error->Errno("utime","Failed to set modification time");
}
- // Forumulate a result
- FetchResult Res;
- Res.Size = Buf.st_size;
- Res.Filename = Itm->DestFile;
- Res.LastModified = Buf.st_mtime;
- Res.IMSHit = false;
-
URIDone(Res);
return true;
}
diff --git a/methods/http.cc b/methods/http.cc
index 0467dd3eb..79d35f65f 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: http.cc,v 1.21 1999/01/04 00:57:56 jgg Exp $
+// $Id: http.cc,v 1.22 1999/01/20 04:36:43 jgg Exp $
/* ######################################################################
HTTP Aquire Method - This is the HTTP aquire method for APT.
@@ -875,6 +875,7 @@ int HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv)
return 5;
FailFile = Queue->DestFile;
+ FailFile.c_str(); // Make sure we don't do a malloc in the signal handler
FailFd = File->Fd();
FailTime = Srv->Date;