Skip to content

Remove cqhv log field #9258

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

Merged
maskit merged 2 commits into from
Dec 20, 2022
Merged

Remove cqhv log field #9258

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
17eb160
Remove cqhv log field
maskit Dec 16, 2022
61ffadb
Update a comment
maskit Dec 16, 2022
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
3 changes: 0 additions & 3 deletions doc/admin-guide/logging/formatting.en.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,6 @@ cqint Client Request If a request was generated internally (via a plugin), the
Protocols and Versions
~~~~~~~~~~~~~~~~~~~~~~

.. _cqhv:
.. _cqpv:
.. _csshv:
.. _sshv:
Expand All @@ -569,8 +568,6 @@ were in effect for a given event.
===== ===================== ===================================================
Field Source Description
===== ===================== ===================================================
cqhv Client Request Client request HTTP version. Deprecated since 9.0.
Use ``cqpv`` instead.
cqpv Client Request Client request protocol and version.
sqpv Proxy Request Origin negotiated protocol and version
csshv Cached Proxy Response Origin server's HTTP version from cached version of
Expand Down
8 changes: 0 additions & 8 deletions doc/locale/ja/LC_MESSAGES/admin-guide/monitoring/logging/log-formats.en.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -987,11 +987,6 @@ msgstr ""
"|TS| へのクライアントリクエストの HTTP メソッド。``GET`` や ``POST`` やその"
"他のものです。( ``cqtx`` のサブセット )"

#: ../../../admin-guide/monitoring/logging/log-formats.en.rst:403
#, fuzzy
msgid "``cqhv``"
msgstr "``cqhl``"

#: ../../../admin-guide/monitoring/logging/log-formats.en.rst:403
msgid "The client request HTTP version."
msgstr "クライアントリクエストの HTTP バージョン。"
Expand Down Expand Up @@ -2463,9 +2458,6 @@ msgstr "クライアントが接続したが、その後リクエストを送る
#~ msgid "chp"
#~ msgstr "chp"

#~ msgid "cqhv"
#~ msgstr "cqhv"

#~ msgid "cqpv"
#~ msgstr "cqpv"

Expand Down
5 changes: 0 additions & 5 deletions proxy/logging/Log.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,11 +454,6 @@ Log::init_fields()
global_field_list.add(field, false);
field_symbol_hash.emplace("pqup", field);

field = new LogField("client_req_http_version", "cqhv", LogField::dINT, &LogAccess::marshal_client_req_http_version,
&LogAccess::unmarshal_http_version);
global_field_list.add(field, false);
field_symbol_hash.emplace("cqhv", field);

field = new LogField("client_req_protocol_version", "cqpv", LogField::dINT, &LogAccess::marshal_client_req_protocol_version,
&LogAccess::unmarshal_str);
global_field_list.add(field, false);
Expand Down
4 changes: 2 additions & 2 deletions proxy/logging/LogAccess.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -916,8 +916,8 @@ LogAccess::unmarshal_http_version(char **buf, char *dest, int len)
/*-------------------------------------------------------------------------
LogAccess::unmarshal_http_text

The http text is simply the fields http_method (cqhm) + url (pqu) +
http_version (cqhv), all right next to each other, in that order.
The http text is a reproduced HTTP/1.x request line. It's HTTP method (cqhm) + URL (pqu) + HTTP version.
This doesn't support HTTP/2 and HTTP/3 since those don't have a request line.
-------------------------------------------------------------------------*/

int
Expand Down