github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #4092 from Yihao-G/master

Browse Source 
Fix nginx proxy-read-timeout not set for HTTPS
This commit is contained in:
Jose Diaz-Gonzalez
2020-08-01 20:30:47 -04:00
committed by GitHub
parent 5bd5e6249b 9cbe771123
commit d6273b4751
2 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/nginx-vhosts/templates/nginx.conf.sigil
View File

@@ -84,6 +84,7 @@ server {
proxy_pass http://{{ $.APP }}-{{ $upstream_port }};
{{ if eq $.HTTP2_PUSH_SUPPORTED "true" }}http2_push_preload on; {{ end }}
proxy_http_version 1.1;
proxy_read_timeout {{ $.PROXY_READ_TIMEOUT }};
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection $http_connection;
proxy_set_header Host $http_host;

35
tests/unit/nginx-vhosts_8.bats
View File

@@ -138,6 +138,41 @@ teardown() {
assert_output_contains "45s;" 0
}
@test "(nginx-vhosts) nginx:set proxy-read-timeout (with SSL)" {
setup_test_tls
deploy_app
run /bin/bash -c "dokku nginx:set $TEST_APP proxy-read-timeout 45s"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku nginx:build-config $TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku nginx:show-config $TEST_APP"
echo "output: $output"
echo "status: $status"
assert_output_contains "45s;"
run /bin/bash -c "dokku nginx:set $TEST_APP proxy-read-timeout"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku nginx:build-config $TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku nginx:show-config $TEST_APP"
echo "output: $output"
echo "status: $status"
assert_output_contains "45s;" 0
}
@test "(nginx-vhosts) nginx:build-config (with SSL and unrelated domain)" {
setup_test_tls
add_domain "node-js-app.dokku.me"