Squid-2.5.STABLE9-2GB.patch

> The large-file patch forgets about logging in access_log.c. Both
> accessLogSquid() and accessLogCommon() print "cache.size", one
> using unsigned long and the other using long int. They should
> both print using PRINTF_OFF_T.
>
> I'm including my unified diff.
>
--- access_log.c.orig Fri Mar 25 21:50:51 2005
+++ access_log.c Tue Mar 29 14:10:36 2005
@@ -245,14 +245,14 @@
        client = inet_ntoa(al->cache.caddr);
     user = accessLogFormatName(al->cache.authuser ?
        al->cache.authuser : al->cache.rfc931);
- logfilePrintf(logfile, "%9ld.%03d %6d %s %s/%03d %lu %s %s %s %s%s/%s %s",
+ logfilePrintf(logfile, "%9ld.%03d %6d %s %s/%03d %" PRINTF_OFF_T " %s %s %s %s%s/%s %s",
        (long int) current_time.tv_sec,
        (int) current_time.tv_usec / 1000,
        al->cache.msec,
        client,
        log_tags[al->cache.code],
        al->http.code,
- (unsigned long) al->cache.size,
+ al->cache.size,
        al->private.method_str,
        al->url,
        user && *user ? user : dash_str,
@@ -274,7 +274,7 @@
        client = inet_ntoa(al->cache.caddr);
     user1 = accessLogFormatName(al->cache.authuser);
     user2 = accessLogFormatName(al->cache.rfc931);
- logfilePrintf(logfile, "%s %s %s [%s] \"%s %s HTTP/%d.%d\" %d %ld %s:%s",
+ logfilePrintf(logfile, "%s %s %s [%s] \"%s %s HTTP/%d.%d\" %d %" PRINTF_OFF_T " %s:%s",
        client,
        user2 ? user2 : dash_str,
        user1 ? user1 : dash_str,
@@ -283,7 +283,7 @@
        al->url,
        al->http.version.major, al->http.version.minor,
        al->http.code,
- (long int) al->cache.size,
+ al->cache.size,
        log_tags[al->cache.code],
        hier_strings[al->hier.code]);
     safe_free(user1);

> Mike Mitchell
> SAS Institute Inc.
> Mike.Mitchell@sas.com
> (919) 531-6793
>
>
Received on Tue Mar 29 2005 - 12:38:43 MST