From: Amos Jeffries <squid3@treenet.co.nz>
Date: Mon, 27 Feb 2012 10:03:03 +0000 (-0700)
Subject: Log '-' on requests with no Referer or User-Agent headers
X-Git-Tag: BumpSslServerFirst.take05~2^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e24fa1c7b8cc5893520e4b058b1ad8e41644a5c0;p=thirdparty%2Fsquid.git

Log '-' on requests with no Referer or User-Agent headers

This data is actually meaningful for the analysis of client behaviour.

squid-dev have agreed that it is worth removing the old log behaviour of
omitting these entries.
---

diff --git a/src/log/FormatSquidReferer.cc b/src/log/FormatSquidReferer.cc
index a498af9b49..0c7236d2a4 100644
--- a/src/log/FormatSquidReferer.cc
+++ b/src/log/FormatSquidReferer.cc
@@ -43,15 +43,12 @@
 void
 Log::Format::SquidReferer(AccessLogEntry *al, Logfile *logfile)
 {
-    // do not log unless there is something to be displayed
-    if (!al || !al->request)
-        return;
+    const char *referer = NULL;
+    if (al && al->request)
+        referer = al->request->header.getStr(HDR_REFERER);
 
-    const char *referer = al->request->header.getStr(HDR_REFERER);
-
-    // do not log unless there is something to be displayed
     if (!referer || *referer == '\0')
-        return;
+        referer = "-";
 
     char clientip[MAX_IPSTRLEN];
     al->getLogClientIp(clientip, MAX_IPSTRLEN);
diff --git a/src/log/FormatSquidUseragent.cc b/src/log/FormatSquidUseragent.cc
index 470629e1f4..bfe3245e87 100644
--- a/src/log/FormatSquidUseragent.cc
+++ b/src/log/FormatSquidUseragent.cc
@@ -43,15 +43,13 @@
 void
 Log::Format::SquidUserAgent(AccessLogEntry * al, Logfile * logfile)
 {
-    // do not log unless there is something to be displayed.
-    if (!al || !al->request)
-        return;
+    const char *agent = NULL;
 
-    const char *agent = al->request->header.getStr(HDR_USER_AGENT);
+    if (al && al->request)
+        agent = al->request->header.getStr(HDR_USER_AGENT);
 
-    // do not log unless there is something to be displayed.
     if (!agent || *agent == '\0')
-        return;
+        agent = "-";
 
     char clientip[MAX_IPSTRLEN];
     al->getLogClientIp(clientip, MAX_IPSTRLEN);