Skip to content

Replace built-in logformat referrer #2430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yadij wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Replace built-in logformat referrer #2430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f42e17d
Replace built-in logformat referrer
yadij Jun 2, 2026
c1ff0eb
remove debugs documentation
yadij Jun 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion doc/debug-sections.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,6 @@ section 46 Access Log - Apache common format
section 46 Access Log - Squid Custom format
section 46 Access Log - Squid ICAP Logging
section 46 Access Log - Squid format
section 46 Access Log - Squid referer format
section 46 Access Log - Squid useragent format
section 47 Store Directory Routines
section 47 Store Search
Expand Down
2 changes: 1 addition & 1 deletion src/cf.data.pre
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4671,7 +4671,7 @@ COMMENT_END
NAME: logformat
TYPE: logformat
LOC: Log::TheConfig
DEFAULT: none
DEFAULT: referrer %ts.%03tu %>a %{Referer}http::>h %http::ru
DEFAULT_DOC: The format definitions squid, common, combined, referrer, useragent are built in.
DOC_START
Usage:
Expand Down
6 changes: 0 additions & 6 deletions src/log/Config.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,6 @@ Log::LogConfig::BuiltInFormatName(const Format::log_type logformatType)

case Format::CLF_USERAGENT:
return "useragent";

case Log::Format::CLF_REFERER:
return "referrer";
}

// forgotten (by developers) type, invalid type, or unreachable code
Expand Down Expand Up @@ -75,9 +72,6 @@ Log::LogConfig::FindBuiltInFormat(const char *logformatName)
if (strcmp(logformatName, "useragent") == 0)
return Format::CLF_USERAGENT;

if (strcmp(logformatName, "referrer") == 0)
return Format::CLF_REFERER;

// CLF_NONE, CLF_UNKNOWN, CLF_CUSTOM types cannot be specified explicitly.
// TODO: Ban "none" and "unknown" custom logformat names to avoid confusion.
return Format::CLF_UNKNOWN;
Expand Down
39 changes: 0 additions & 39 deletions src/log/FormatSquidReferer.cc
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions src/log/Formats.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ typedef enum {
#if ICAP_CLIENT
CLF_ICAP_SQUID,
#endif
CLF_REFERER,
CLF_SQUID,
CLF_USERAGENT,
CLF_NONE
Expand All @@ -46,9 +45,6 @@ void SquidIcap(const AccessLogEntryPointer &al, Logfile * logfile);
/// Display log details in useragent format.
void SquidUserAgent(const AccessLogEntryPointer &al, Logfile * logfile);

/// Display log details in Squid old refererlog format.
void SquidReferer(const AccessLogEntryPointer &al, Logfile * logfile);

/// Log with a local custom format
void SquidCustom(const AccessLogEntryPointer &al, CustomLog * log);

Expand Down
1 change: 0 additions & 1 deletion src/log/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ liblog_la_SOURCES = \
FormatSquidCustom.cc \
FormatSquidIcap.cc \
FormatSquidNative.cc \
FormatSquidReferer.cc \
FormatSquidUseragent.cc \
Formats.h \
FormattedLog.cc \
Expand Down
4 changes: 0 additions & 4 deletions src/log/access_log.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,6 @@ accessLogLogTo(CustomLog *log, const AccessLogEntryPointer &al, ACLChecklist *ch
Log::Format::HttpdCommon(al, log->logfile);
break;

case Log::Format::CLF_REFERER:
Log::Format::SquidReferer(al, log->logfile);
break;

case Log::Format::CLF_USERAGENT:
Log::Format::SquidUserAgent(al, log->logfile);
break;
Expand Down
1 change: 0 additions & 1 deletion src/tests/stub_liblog.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ namespace Format
void SquidNative(const AccessLogEntryPointer &, Logfile *) STUB
void SquidIcap(const AccessLogEntryPointer &, Logfile *) STUB
void SquidUserAgent(const AccessLogEntryPointer &, Logfile *) STUB
void SquidReferer(const AccessLogEntryPointer &, Logfile *) STUB
void SquidCustom(const AccessLogEntryPointer &, CustomLog *) STUB
void HttpdCommon(const AccessLogEntryPointer &, Logfile *) STUB
void HttpdCombined(const AccessLogEntryPointer &, Logfile *) STUB
Expand Down
Loading