--------------------- PatchSet 846 Date: 2000/11/17 07:20:15 Author: rbcollins Branch: ntlm Tag: (none) Log: broke access_log when merging Members: src/access_log.c:1.1.1.3.12.7->1.1.1.3.12.8 Index: squid/src/access_log.c =================================================================== RCS file: /cvsroot/squid-sf//squid/src/access_log.c,v retrieving revision 1.1.1.3.12.7 retrieving revision 1.1.1.3.12.8 diff -u -r1.1.1.3.12.7 -r1.1.1.3.12.8 --- squid/src/access_log.c 16 Nov 2000 11:47:00 -0000 1.1.1.3.12.7 +++ squid/src/access_log.c 17 Nov 2000 07:20:15 -0000 1.1.1.3.12.8 @@ -1,6 +1,6 @@ /* - * $Id: access_log.c,v 1.1.1.3.12.7 2000/11/16 11:47:00 rbcollins Exp $ + * $Id: access_log.c,v 1.1.1.3.12.8 2000/11/17 07:20:15 rbcollins Exp $ * * DEBUG: section 46 Access Log * AUTHOR: Duane Wessels @@ -271,7 +271,6 @@ if (client == NULL) client = inet_ntoa(al->cache.caddr); logfilePrintf(logfile, "%s %s %s [%s] \"%s %s HTTP/%d.%d\" %d %d %s:%s", - logfilePrintf(logfile, "%s %s - [%s] \"%s %s HTTP/%d.%d\" %d %d %s:%s", client, accessLogFormatName(al->cache.rfc931), (user=accessLogFormatName(al->cache.authuser)),