--------------------- PatchSet 4287 Date: 2007/04/19 17:24:26 Author: dwsquid Branch: squid3-largeobj Tag: (none) Log: ClientHttpRequest->out.size is now defined as int64_t, so it should never have sizeof() == 4. But we'll keep this #ifdef in place for now in case we change our minds about how to handle large files. ---------------------------------------------------------------------- Members: src/client_side_reply.cc:1.91.2.2->1.91.2.3 Index: squid3/src/client_side_reply.cc =================================================================== RCS file: /cvsroot/squid-sf//squid3/src/client_side_reply.cc,v retrieving revision 1.91.2.2 retrieving revision 1.91.2.3 diff -u -r1.91.2.2 -r1.91.2.3 --- squid3/src/client_side_reply.cc 19 Apr 2007 04:45:50 -0000 1.91.2.2 +++ squid3/src/client_side_reply.cc 19 Apr 2007 17:24:26 -0000 1.91.2.3 @@ -1,6 +1,6 @@ /* - * $Id: client_side_reply.cc,v 1.91.2.2 2007/04/19 04:45:50 dwsquid Exp $ + * $Id: client_side_reply.cc,v 1.91.2.3 2007/04/19 17:24:26 dwsquid Exp $ * * DEBUG: section 88 Client-side Reply Routines * AUTHOR: Robert Collins (Originally Duane Wessels in client_side.c) @@ -1054,10 +1054,9 @@ int clientHttpRequestStatus(int fd, ClientHttpRequest const *http) { -#if SIZEOF_OFF_T == 4 - +#if SIZEOF_INT64_T == 4 if (http->out.size > 0x7FFF0000) { - debug(88, 1) ("WARNING: closing FD %d to prevent counter overflow\n", + debug(88, 1) ("WARNING: closing FD %d to prevent out.size counter overflow\n", fd); debug(88, 1) ("\tclient %s\n", inet_ntoa(http->getConn().getRaw() != NULL ? http->getConn()->peer.sin_addr : no_addr)); @@ -1069,7 +1068,7 @@ #endif #if SIZEOF_OFF_T == 4 if (http->out.offset > 0x7FFF0000) { - debug(88, 1) ("WARNING: closing FD %d to prevent counter overflow\n", + debug(88, 1) ("WARNING: closing FD %d to prevent out.offset counter overflow\n", fd); debug(88, 1) ("\tclient %s\n", inet_ntoa(http->getConn().getRaw() != NULL ? http->getConn()->peer.sin_addr : no_addr));