methods/http.cc: shorten comment on return values of DealWithHeaders (because we...

diff --git a/debian/changelog b/debian/changelog
index 037e424d6d011b1e46f80814da94965481c36d33..b4aa5753b6fed195b60a1fda1620013154d67c85 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.7.26~exp5) UNRELEASED; urgency=low
+apt (0.7.26~exp5) experimental; urgency=low

 
   [ David Kalnischkies ]
   * cmdline/apt-get.cc:
 
   [ David Kalnischkies ]
   * cmdline/apt-get.cc:


@@ -55,7 +55,7 @@ apt (0.7.26~exp5) UNRELEASED; urgency=low
   * apt-pkg/acquire-item.cc:
     - Fix pkgAcqFile::Custom600Headers() to always return something.
   
   * apt-pkg/acquire-item.cc:
     - Fix pkgAcqFile::Custom600Headers() to always return something.
   

- -- David Kalnischkies <kalnischkies@gmail.com>  Thu, 06 May 2010 16:10:39 +0200
+ -- Michael Vogt <mvo@debian.org>  Tue, 25 May 2010 16:01:42 +0200

 
 apt (0.7.26~exp4) experimental; urgency=low
 
 
 apt (0.7.26~exp4) experimental; urgency=low
 

diff --git a/methods/http.cc b/methods/http.cc
index c05abc8622d8a7a7c1c7cb0b291d65b4c782c30d..d43dd14c89242818514a74f186d62477f352b637 100644 (file)
--- a/methods/http.cc
+++ b/methods/http.cc
@@ -914,13 +914,7 @@ bool HttpMethod::ServerDie(ServerState *Srv)
 // HttpMethod::DealWithHeaders - Handle the retrieved header data      /*{{{*/
 // ---------------------------------------------------------------------
 /* We look at the header data we got back from the server and decide what
 // HttpMethod::DealWithHeaders - Handle the retrieved header data      /*{{{*/
 // ---------------------------------------------------------------------
 /* We look at the header data we got back from the server and decide what

-   to do. Returns 
-     0 - File is open,
-     1 - IMS hit
-     3 - Unrecoverable error 
-     4 - Error with error content page
-     5 - Unrecoverable non-server error (close the connection) 
-     6 - Try again with a new or changed URI
+   to do. Returns DealWithHeadersResult (see http.h for details).

  */
 HttpMethod::DealWithHeadersResult
 HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv)
  */
 HttpMethod::DealWithHeadersResult
 HttpMethod::DealWithHeaders(FetchResult &Res,ServerState *Srv)