From: amosjeffries <>
Date: Tue, 26 Feb 2008 06:07:29 +0000 (+0000)
Subject: Author: hno
X-Git-Tag: SQUID_3_0_STABLE2~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1a78cd7c0c36d6822a6c0187f6d8ba222599ea0;p=thirdparty%2Fsquid.git

Author: hno
Bug #2164: assertion failed: stmem.cc:321: "candidate.offset >= 0"

failed to handle responses >2GB properly unless compiled with 64-bit disk I/O.

this due to abuse of off_t where int64_t is intended.
---

diff --git a/src/ESIContext.h b/src/ESIContext.h
index 240ab3af81..329018491d 100644
--- a/src/ESIContext.h
+++ b/src/ESIContext.h
@@ -1,5 +1,5 @@
 /*
- * $Id: ESIContext.h,v 1.4 2003/08/04 22:14:40 robertc Exp $
+ * $Id: ESIContext.h,v 1.4.4.1 2008/02/25 23:07:29 amosjeffries Exp $
  *
  *
  * SQUID Web Proxy Cache          http://www.squid-cache.org/
@@ -133,8 +133,8 @@ int detached:
      * for some reason 
      */
     size_t outbound_offset;
-    off_t readpos; /* the logical position we are reading from */
-    off_t pos; /* the logical position of outbound_offset in the data stream */
+    int64_t readpos; /* the logical position we are reading from */
+    int64_t pos; /* the logical position of outbound_offset in the data stream */
 
     class ParserState
     {
diff --git a/src/Server.h b/src/Server.h
index eef3f5d2b8..e0aeb0b5c0 100644
--- a/src/Server.h
+++ b/src/Server.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: Server.h,v 1.10 2007/09/27 14:34:06 rousskov Exp $
+ * $Id: Server.h,v 1.10.2.1 2008/02/25 23:07:29 amosjeffries Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -163,7 +163,7 @@ protected:
     size_t replyBodySpace(size_t space = 4096 * 10);
 
     // These should be private
-    off_t currentOffset;	// Our current offset in the StoreEntry
+    int64_t currentOffset;	// Our current offset in the StoreEntry
     MemBuf *responseBodyBuffer;	// Data temporarily buffered for ICAP
 
 public: // should not be