From b53b7926de5d01fc33bc253fa94b9c98a0833dea Mon Sep 17 00:00:00 2001
From: Arch Librarian <arch@canonical.com>
Date: Mon, 20 Sep 2004 16:52:16 +0000
Subject: More bug fixes Author: jgg Date: 1998-12-14 08:23:10 GMT More bug
 fixes

---
 doc/Bugs        | 8 ++++++--
 doc/cache.sgml  | 4 ++--
 methods/http.cc | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/doc/Bugs b/doc/Bugs
index 536599aeb..332abc592 100644
--- a/doc/Bugs
+++ b/doc/Bugs
@@ -147,7 +147,12 @@
          a terribly good method. I do not intend any 'split mode' 
 	 support (ie a way to get Package files via rsync and .debs
 	 via http) 
-	 
+#27100: apt: Better support for project/experimental
+ Status: GUI Feature - Version selection and pinning
+         Honors the NotAutomatic flag
+#30643: base: apt-get update problems with http-/ftp-caches (i.e. squid)
+ Status: Fixed as best I can. Try the Acquire::http::No-Cache option.
+
 -- Silly things
 #26592: apt: Problems with ftpd in SunOS 5.6
 #29903: apt-get insists onto sending a SIZE command
@@ -162,7 +167,6 @@
 #27190: apt: installing source packages (wishlist)
  Status: Impossible to do without an index file for all source archives.
 #22551: apt: wish: use dist X iff pkg does not exist in dist Y
-#27100: apt: Better support for project/experimental
  Status: GUI Feature - Version selection and pinning
 #30237: apt: 0.1.9 checks dependencies against packages.gz
  Summary: For packages with identical version numbers APT prefers
diff --git a/doc/cache.sgml b/doc/cache.sgml
index fe3cfdf08..7e7328a1e 100644
--- a/doc/cache.sgml
+++ b/doc/cache.sgml
@@ -4,7 +4,7 @@
 <title>APT Cache File Format</title>
 
 <author>Jason Gunthorpe <email>jgg@debian.org</email></author>
-<version>$Id: cache.sgml,v 1.4 1998/12/14 02:23:47 jgg Exp $</version>
+<version>$Id: cache.sgml,v 1.5 1998/12/14 08:23:10 jgg Exp $</version>
 
 <abstract>
 This document describes the complete implementation and format of the APT
@@ -358,7 +358,6 @@ Header.FileList
       unsigned long Label;           // Stringtable
       unsigned long Architecture;    // Stringtable
       unsigned long Size;            
-      unsigned char NotAutomatic;    // Bool
 
       // Linked list
       unsigned long NextFile;        // PackageFile
@@ -735,6 +734,7 @@ Zero is used for unparsable or absent Priority fields.
 <p>
 <example>
 #define pkgFLAG_NotSource (1 << 0)
+#define pkgFLAG_NotAutomatic (1 << 1)
 </example>
 </sect1>
 
diff --git a/methods/http.cc b/methods/http.cc
index e947bcc95..cd0b913c3 100644
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: http.cc,v 1.16 1998/12/11 07:23:17 jgg Exp $
+// $Id: http.cc,v 1.17 1998/12/14 08:23:10 jgg Exp $
 /* ######################################################################
 
    HTTP Aquire Method - This is the HTTP aquire method for APT.
@@ -625,7 +625,7 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out)
       sprintf(Buf,"GET %s HTTP/1.1\r\nHost: %s\r\n",
 	      Itm->Uri.c_str(),ProperHost.c_str());
       if (_config->FindB("Acquire::http::No-Cache",false) == true)
-	 strcat(Buf,"Cache-Control: no-cache\r\n");
+	 strcat(Buf,"Cache-Control: no-cache\r\nPragma: no-cache\r\n");
       else
       {
 	 if (Itm->IndexFile == true)
-- 
cgit v1.2.3