Skip to content

Commit

Permalink
Revert "Adjust more timeouts (#4264)" (#4267)
Browse files Browse the repository at this point in the history
This reverts commit 1582508.
  • Loading branch information
jcscottiii authored Feb 14, 2025
1 parent 38af5bc commit 359cd8b
Showing 1 changed file with 0 additions and 19 deletions.
19 changes: 0 additions & 19 deletions webapp/web/nginx.conf
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ http {
sendfile on;
tcp_nopush on;
tcp_nodelay on;
# Adjust server wide timeouts
keepalive_timeout 65;
# Similar to the timeouts specifically for the Go server below
client_header_timeout 10m;
types_hash_max_size 2048;
include /etc/nginx/mime.types;
default_type application/octet-stream;
Expand Down Expand Up @@ -76,22 +73,6 @@ http {
proxy_set_header X-Forwarded-Proto $scheme;
# Disable checking of the body size
client_max_body_size 0;
# Disable or increase timeout checks. Allow the application to determine the appropriate timeouts
client_body_timeout 0;
send_timeout 10m;
proxy_read_timeout 10m;
proxy_connect_timeout 10m;
# TODO(https://github.com/web-platform-tests/wpt.fyi/issues/4231)
# Nginx client keepalive timeout. Due to the use of nicehttp, the Go application's
# idle timeout is not configurable, and it defaults to no timeout as per Go 1.23.
# 10 minutes is a temporary high value until nicehttp can be replaced or configured.
# Consider reducing this timeout to a more reasonable value (e.g., 60s) to prevent
# excessive idle connections.
# IMPORTANT: The NGINX UPSTREAM keepalive timeout (configured in the upstream block)
# MUST be LESS than the Go application's idle timeout to avoid connection errors.
# However, since the Go application effectively has no timeout right now because of nicehttp,
# the upstream timeout must be set to a reasonably high value.
keepalive_timeout 10m;
}
}
}

0 comments on commit 359cd8b

Please sign in to comment.