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

Jump to bottom

www/nginx proxy timeout #1211

Merged
merged 2 commits into from
Feb 27, 2019
Merged

www/nginx proxy timeout #1211

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
1fbd14a
www/nginx: add release note
fabianfrz Feb 27, 2019
e8a8ed0
www/nginx: add proxy timeout support
fabianfrz Feb 27, 2019
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: 1 addition & 0 deletions www/nginx/pkg-descr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Plugin Changelog
* Alias support for downstream proxies (trust setting)
* bugfix: deleting IP ACL
* HSTS not sent automatically anymore if HTTP over TLS is configured (still available via security header)
* add configuration directives for timeouts to location

1.7

Expand Down
14 changes: 14 additions & 0 deletions www/nginx/src/opnsense/mvc/app/controllers/OPNsense/Nginx/forms/location.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,20 @@
<advanced>true</advanced>
<help>If you enable the WebSocket Support option, nginx will pass the upgrade header to the backed server.</help>
</field>
<field>
<id>location.proxy_read_timeout</id>
<label>Proxy Read Timeout</label>
<type>text</type>
<advanced>true</advanced>
<help>Enter a custom timout between data received from the client after which the connection is closed.</help>
</field>
<field>
<id>location.proxy_send_timeout</id>
<label>Proxy Send Timeout</label>
<type>text</type>
<advanced>true</advanced>
<help>Enter a custom timout between data it sent to the client after which the connection is closed. </help>
</field>
<field>
<id>location.proxy_buffering</id>
<label>Response Buffering</label>
Expand Down
8 changes: 8 additions & 0 deletions www/nginx/src/opnsense/mvc/app/models/OPNsense/Nginx/Nginx.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,14 @@
<Required>Y</Required>
<default>1</default>
</proxy_buffering>
<proxy_read_timeout type="IntegerField">
<Required>N</Required>
<minValue>1</minValue>
</proxy_read_timeout>
<proxy_send_timeout type="IntegerField">
<Required>N</Required>
<minValue>1</minValue>
</proxy_send_timeout>
<http2_push_preload type="BooleanField">
<Required>Y</Required>
<default>0</default>
Expand Down
6 changes: 6 additions & 0 deletions www/nginx/src/opnsense/service/templates/OPNsense/Nginx/location.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,12 @@ location {{ location.matchtype }} {{ location.urlpattern }} {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-TLS-Client-Intercepted $tls_intercepted;
{% if location.proxy_read_timeout is defined and location.proxy_read_timeout != '' %}
proxy_read_timeout {{ location.proxy_read_timeout }}s;
{% endif %}
{% if location.proxy_send_timeout is defined and location.proxy_send_timeout != '' %}
proxy_send_timeout {{ location.proxy_send_timeout }}s;
{% endif %}
proxy_ignore_client_abort {% if location.proxy_ignore_client_abort == '1' %}on{% else %}off{% endif %};
proxy_request_buffering {% if location.proxy_request_buffering == '1' %}on{% else %}off{% endif %};
proxy_buffering {% if location.proxy_buffering == '1' %}on{% else %}off{% endif %};
Expand Down