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

Feature: Add support for PROXY Protocol. #1113

Merged
merged 3 commits into from
Feb 12, 2020
Merged

Feature: Add support for PROXY Protocol. #1113

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6226ed3
Add support for PROXY Protocol.
agile6v Feb 8, 2020
818ac41
Add deprecating message.
agile6v Feb 11, 2020
eb4cb7a
Merge branch 'master' into proxy_protocol
agile6v Feb 11, 2020
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
Prev Previous commit
Next Next commit
Add deprecating message.
  • Loading branch information
@agile6v
agile6v committed Feb 11, 2020
commit 818ac41ffb5934819322fe1af4741ad98be406e5
15 changes: 12 additions & 3 deletions bin/apisix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,10 +204,19 @@ http {

include mime.types;

{% if http.real_ip_header then %}
{% if real_ip_header then %}
real_ip_header {* real_ip_header *};
{% print("\nDeprecated: apisix.real_ip_header has been moved to nginx_config.http.real_ip_header. apisix.real_ip_header will be removed in the future version. Please use nginx_config.http.real_ip_header first.\n\n") %}
{% elseif http.real_ip_header then %}
real_ip_header {* http.real_ip_header *};
{%end%}
{% if http.real_ip_from then %}
{% end %}

{% if real_ip_from then %}
{% print("\nDeprecated: apisix.real_ip_from has been moved to nginx_config.http.real_ip_from. apisix.real_ip_from will be removed in the future version. Please use nginx_config.http.real_ip_from first.\n\n") %}
{% for _, real_ip in ipairs(real_ip_from) do %}
set_real_ip_from {*real_ip*};
{% end %}
{% elseif http.real_ip_from then %}
{% for _, real_ip in ipairs(http.real_ip_from) do %}
set_real_ip_from {*real_ip*};
{% end %}
Expand Down