/*
- * Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2017 The Squid Software Foundation and contributors
*
* Squid software is distributed under GPLv2+ license and includes
* contributions from numerous individuals and organizations.
char clientip[MAX_IPSTRLEN];
al->getLogClientIp(clientip, MAX_IPSTRLEN);
- static SBuf method;
- if (al->_private.method_str)
- method.assign(al->_private.method_str);
- else
- method = al->http.method.image();
+ const SBuf method(al->getLogMethod());
- logfilePrintf(logfile, "%s %s %s [%s] \"" SQUIDSBUFPH " %s %s/%d.%d\" %d %" PRId64 " %s%s:%s%s",
+ logfilePrintf(logfile, "%s %s %s [%s] \"" SQUIDSBUFPH " " SQUIDSBUFPH " %s/%d.%d\" %d %" PRId64 " %s:%s%s",
clientip,
user_ident ? user_ident : dash_str,
user_auth ? user_auth : dash_str,
Time::FormatHttpd(squid_curtime),
SQUIDSBUFPRINT(method),
- al->url,
+ SQUIDSBUFPRINT(al->url),
AnyP::ProtocolType_str[al->http.version.protocol],
al->http.version.major, al->http.version.minor,
al->http.code,
al->http.clientReplySz.messageTotal(),
- LogTags_str[al->cache.code],
- al->http.statusSfx(),
+ al->cache.code.c_str(),
hier_code_str[al->hier.code],
(Config.onoff.log_mime_hdrs?"":"\n"));
safe_free(erep);
}
}
+