Skip to content
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

fix(proxy): remove kong branding from kong HTML error template #11150

Merged
merged 2 commits into from
Jun 29, 2023
Merged

fix(proxy): remove kong branding from kong HTML error template #11150

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
2225986
fix(proxy): remove kong branding in kong HTML error template
oowl Jun 29, 2023
e0e6354
fix(proxy): fix code
oowl Jun 29, 2023
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@
- Added a `User=` specification to the systemd unit definition so that
Kong can be controlled by systemd again.
[#11066](https://github.com/Kong/kong/pull/11066)
- Remove kong branding from kong HTML error template.
[#11150](https://github.com/Kong/kong/pull/11150)

#### Admin API

Expand Down
4 changes: 2 additions & 2 deletions kong/tools/utils.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1422,10 +1422,10 @@ do
<html>
<head>
<meta charset="utf-8">
<title>Kong Error</title>
<title>Error</title>
</head>
<body>
<h1>Kong Error</h1>
<h1>Error</h1>
<p>%s.</p>
</body>
</html>
Expand Down
4 changes: 2 additions & 2 deletions spec/02-integration/05-proxy/12-error_default_type_spec.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ local HTML_TEMPLATE = [[
<html>
<head>
<meta charset="utf-8">
<title>Kong Error</title>
<title>Error</title>
</head>
<body>
<h1>Kong Error</h1>
<h1>Error</h1>
<p>%s.</p>
</body>
</html>]]
Expand Down
8 changes: 4 additions & 4 deletions t/01-pdk/08-response/13-error.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,10 @@ Content-Type: text/html; charset=utf-8
<html>
<head>
<meta charset="utf-8">
<title>Kong Error</title>
<title>Error</title>
</head>
<body>
<h1>Kong Error</h1>
<h1>Error</h1>
<p>An invalid response was received from the upstream server.</p>
</body>
</html>
Expand Down Expand Up @@ -475,10 +475,10 @@ Content-Type: text/html; charset=utf-8
<html>
<head>
<meta charset="utf-8">
<title>Kong Error</title>
<title>Error</title>
</head>
<body>
<h1>Kong Error</h1>
<h1>Error</h1>
<p>An invalid response was received from the upstream server.</p>
</body>
</html>
Expand Down