From 04d118301fa2d5cbdde0d39ed894ed054cfa3846 Mon Sep 17 00:00:00 2001 From: Patrik Wall Date: Mon, 27 Apr 2026 13:22:16 +0200 Subject: [PATCH] Upstream: proxy_socket_sndbuf and proxy_socket_rcvbuf directives Similarly to "listen ... sndbuf/rcvbuf", proxy_socket_sndbuf and proxy_socket_rcvbuf can be used to set the SO_SNDBUF and SO_RCVBUF socket options, respectively, for upstream connections. By default, the values are left unchanged. Similar changes made in fastcgi, grpc, scgi, uwsgi, tunnel. --- src/http/modules/ngx_http_fastcgi_module.c | 22 ++++++++++++++++++++++ src/http/modules/ngx_http_grpc_module.c | 22 ++++++++++++++++++++++ src/http/modules/ngx_http_proxy_module.c | 22 ++++++++++++++++++++++ src/http/modules/ngx_http_scgi_module.c | 22 ++++++++++++++++++++++ src/http/modules/ngx_http_tunnel_module.c | 22 ++++++++++++++++++++++ src/http/modules/ngx_http_uwsgi_module.c | 22 ++++++++++++++++++++++ src/http/ngx_http_upstream.c | 8 ++++++++ src/http/ngx_http_upstream.h | 2 ++ 8 files changed, 142 insertions(+) diff --git a/src/http/modules/ngx_http_fastcgi_module.c b/src/http/modules/ngx_http_fastcgi_module.c index f7f0696a8..cb34dcc8d 100644 --- a/src/http/modules/ngx_http_fastcgi_module.c +++ b/src/http/modules/ngx_http_fastcgi_module.c @@ -296,6 +296,20 @@ static ngx_command_t ngx_http_fastcgi_commands[] = { offsetof(ngx_http_fastcgi_loc_conf_t, upstream.socket_keepalive), NULL }, + { ngx_string("fastcgi_socket_rcvbuf"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, + ngx_conf_set_size_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_fastcgi_loc_conf_t, upstream.socket_rcvbuf), + NULL }, + + { ngx_string("fastcgi_socket_sndbuf"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, + ngx_conf_set_size_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_fastcgi_loc_conf_t, upstream.socket_sndbuf), + NULL }, + { ngx_string("fastcgi_connect_timeout"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, ngx_conf_set_msec_slot, @@ -2899,6 +2913,8 @@ ngx_http_fastcgi_create_loc_conf(ngx_conf_t *cf) conf->upstream.local = NGX_CONF_UNSET_PTR; conf->upstream.socket_keepalive = NGX_CONF_UNSET; + conf->upstream.socket_rcvbuf = NGX_CONF_UNSET_SIZE; + conf->upstream.socket_sndbuf = NGX_CONF_UNSET_SIZE; conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; @@ -3005,6 +3021,12 @@ ngx_http_fastcgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) ngx_conf_merge_value(conf->upstream.socket_keepalive, prev->upstream.socket_keepalive, 0); + ngx_conf_merge_size_value(conf->upstream.socket_rcvbuf, + prev->upstream.socket_rcvbuf, 0); + + ngx_conf_merge_size_value(conf->upstream.socket_sndbuf, + prev->upstream.socket_sndbuf, 0); + ngx_conf_merge_msec_value(conf->upstream.connect_timeout, prev->upstream.connect_timeout, 60000); diff --git a/src/http/modules/ngx_http_grpc_module.c b/src/http/modules/ngx_http_grpc_module.c index 248ec179c..533806ced 100644 --- a/src/http/modules/ngx_http_grpc_module.c +++ b/src/http/modules/ngx_http_grpc_module.c @@ -277,6 +277,20 @@ static ngx_command_t ngx_http_grpc_commands[] = { offsetof(ngx_http_grpc_loc_conf_t, upstream.socket_keepalive), NULL }, + { ngx_string("grpc_socket_rcvbuf"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, + ngx_conf_set_size_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_grpc_loc_conf_t, upstream.socket_rcvbuf), + NULL }, + + { ngx_string("grpc_socket_sndbuf"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, + ngx_conf_set_size_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_grpc_loc_conf_t, upstream.socket_sndbuf), + NULL }, + { ngx_string("grpc_connect_timeout"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, ngx_conf_set_msec_slot, @@ -4466,6 +4480,8 @@ ngx_http_grpc_create_loc_conf(ngx_conf_t *cf) conf->upstream.local = NGX_CONF_UNSET_PTR; conf->upstream.socket_keepalive = NGX_CONF_UNSET; + conf->upstream.socket_rcvbuf = NGX_CONF_UNSET_SIZE; + conf->upstream.socket_sndbuf = NGX_CONF_UNSET_SIZE; conf->upstream.next_upstream_tries = NGX_CONF_UNSET_UINT; conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; @@ -4532,6 +4548,12 @@ ngx_http_grpc_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) ngx_conf_merge_value(conf->upstream.socket_keepalive, prev->upstream.socket_keepalive, 0); + ngx_conf_merge_size_value(conf->upstream.socket_rcvbuf, + prev->upstream.socket_rcvbuf, 0); + + ngx_conf_merge_size_value(conf->upstream.socket_sndbuf, + prev->upstream.socket_sndbuf, 0); + ngx_conf_merge_uint_value(conf->upstream.next_upstream_tries, prev->upstream.next_upstream_tries, 0); diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c index 7e08df702..8a9bffe10 100644 --- a/src/http/modules/ngx_http_proxy_module.c +++ b/src/http/modules/ngx_http_proxy_module.c @@ -291,6 +291,20 @@ static ngx_command_t ngx_http_proxy_commands[] = { offsetof(ngx_http_proxy_loc_conf_t, upstream.socket_keepalive), NULL }, + { ngx_string("proxy_socket_rcvbuf"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, + ngx_conf_set_size_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_proxy_loc_conf_t, upstream.socket_rcvbuf), + NULL }, + + { ngx_string("proxy_socket_sndbuf"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, + ngx_conf_set_size_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_proxy_loc_conf_t, upstream.socket_sndbuf), + NULL }, + { ngx_string("proxy_connect_timeout"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, ngx_conf_set_msec_slot, @@ -3527,6 +3541,8 @@ ngx_http_proxy_create_loc_conf(ngx_conf_t *cf) conf->upstream.local = NGX_CONF_UNSET_PTR; conf->upstream.socket_keepalive = NGX_CONF_UNSET; + conf->upstream.socket_rcvbuf = NGX_CONF_UNSET_SIZE; + conf->upstream.socket_sndbuf = NGX_CONF_UNSET_SIZE; conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; @@ -3662,6 +3678,12 @@ ngx_http_proxy_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) ngx_conf_merge_value(conf->upstream.socket_keepalive, prev->upstream.socket_keepalive, 0); + ngx_conf_merge_size_value(conf->upstream.socket_rcvbuf, + prev->upstream.socket_rcvbuf, 0); + + ngx_conf_merge_size_value(conf->upstream.socket_sndbuf, + prev->upstream.socket_sndbuf, 0); + ngx_conf_merge_msec_value(conf->upstream.connect_timeout, prev->upstream.connect_timeout, 60000); diff --git a/src/http/modules/ngx_http_scgi_module.c b/src/http/modules/ngx_http_scgi_module.c index 406b5f88f..05cbdded0 100644 --- a/src/http/modules/ngx_http_scgi_module.c +++ b/src/http/modules/ngx_http_scgi_module.c @@ -151,6 +151,20 @@ static ngx_command_t ngx_http_scgi_commands[] = { offsetof(ngx_http_scgi_loc_conf_t, upstream.socket_keepalive), NULL }, + { ngx_string("scgi_socket_rcvbuf"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, + ngx_conf_set_size_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_scgi_loc_conf_t, upstream.socket_rcvbuf), + NULL }, + + { ngx_string("scgi_socket_sndbuf"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, + ngx_conf_set_size_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_scgi_loc_conf_t, upstream.socket_sndbuf), + NULL }, + { ngx_string("scgi_connect_timeout"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, ngx_conf_set_msec_slot, @@ -1317,6 +1331,8 @@ ngx_http_scgi_create_loc_conf(ngx_conf_t *cf) conf->upstream.local = NGX_CONF_UNSET_PTR; conf->upstream.socket_keepalive = NGX_CONF_UNSET; + conf->upstream.socket_rcvbuf = NGX_CONF_UNSET_SIZE; + conf->upstream.socket_sndbuf = NGX_CONF_UNSET_SIZE; conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; @@ -1418,6 +1434,12 @@ ngx_http_scgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) ngx_conf_merge_value(conf->upstream.socket_keepalive, prev->upstream.socket_keepalive, 0); + ngx_conf_merge_size_value(conf->upstream.socket_rcvbuf, + prev->upstream.socket_rcvbuf, 0); + + ngx_conf_merge_size_value(conf->upstream.socket_sndbuf, + prev->upstream.socket_sndbuf, 0); + ngx_conf_merge_msec_value(conf->upstream.connect_timeout, prev->upstream.connect_timeout, 60000); diff --git a/src/http/modules/ngx_http_tunnel_module.c b/src/http/modules/ngx_http_tunnel_module.c index a249fe270..5925a6376 100644 --- a/src/http/modules/ngx_http_tunnel_module.c +++ b/src/http/modules/ngx_http_tunnel_module.c @@ -73,6 +73,20 @@ static ngx_command_t ngx_http_tunnel_commands[] = { offsetof(ngx_http_tunnel_loc_conf_t, upstream.socket_keepalive), NULL }, + { ngx_string("tunnel_socket_rcvbuf"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, + ngx_conf_set_size_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_tunnel_loc_conf_t, upstream.socket_rcvbuf), + NULL }, + + { ngx_string("tunnel_socket_sndbuf"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, + ngx_conf_set_size_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_tunnel_loc_conf_t, upstream.socket_sndbuf), + NULL }, + { ngx_string("tunnel_connect_timeout"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, ngx_conf_set_msec_slot, @@ -332,6 +346,8 @@ ngx_http_tunnel_create_loc_conf(ngx_conf_t *cf) conf->upstream.local = NGX_CONF_UNSET_PTR; conf->upstream.socket_keepalive = NGX_CONF_UNSET; + conf->upstream.socket_rcvbuf = NGX_CONF_UNSET_SIZE; + conf->upstream.socket_sndbuf = NGX_CONF_UNSET_SIZE; conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; @@ -366,6 +382,12 @@ ngx_http_tunnel_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) ngx_conf_merge_value(conf->upstream.socket_keepalive, prev->upstream.socket_keepalive, 0); + ngx_conf_merge_size_value(conf->upstream.socket_rcvbuf, + prev->upstream.socket_rcvbuf, 0); + + ngx_conf_merge_size_value(conf->upstream.socket_sndbuf, + prev->upstream.socket_sndbuf, 0); + ngx_conf_merge_msec_value(conf->upstream.connect_timeout, prev->upstream.connect_timeout, 60000); diff --git a/src/http/modules/ngx_http_uwsgi_module.c b/src/http/modules/ngx_http_uwsgi_module.c index cb03ca77c..f5841375f 100644 --- a/src/http/modules/ngx_http_uwsgi_module.c +++ b/src/http/modules/ngx_http_uwsgi_module.c @@ -219,6 +219,20 @@ static ngx_command_t ngx_http_uwsgi_commands[] = { offsetof(ngx_http_uwsgi_loc_conf_t, upstream.socket_keepalive), NULL }, + { ngx_string("uwsgi_socket_rcvbuf"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, + ngx_conf_set_size_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_uwsgi_loc_conf_t, upstream.socket_rcvbuf), + NULL }, + + { ngx_string("uwsgi_socket_sndbuf"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, + ngx_conf_set_size_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_uwsgi_loc_conf_t, upstream.socket_sndbuf), + NULL }, + { ngx_string("uwsgi_connect_timeout"), NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, ngx_conf_set_msec_slot, @@ -1566,6 +1580,8 @@ ngx_http_uwsgi_create_loc_conf(ngx_conf_t *cf) conf->upstream.local = NGX_CONF_UNSET_PTR; conf->upstream.socket_keepalive = NGX_CONF_UNSET; + conf->upstream.socket_rcvbuf = NGX_CONF_UNSET_SIZE; + conf->upstream.socket_sndbuf = NGX_CONF_UNSET_SIZE; conf->upstream.connect_timeout = NGX_CONF_UNSET_MSEC; conf->upstream.send_timeout = NGX_CONF_UNSET_MSEC; @@ -1680,6 +1696,12 @@ ngx_http_uwsgi_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) ngx_conf_merge_value(conf->upstream.socket_keepalive, prev->upstream.socket_keepalive, 0); + ngx_conf_merge_size_value(conf->upstream.socket_rcvbuf, + prev->upstream.socket_rcvbuf, 0); + + ngx_conf_merge_size_value(conf->upstream.socket_sndbuf, + prev->upstream.socket_sndbuf, 0); + ngx_conf_merge_msec_value(conf->upstream.connect_timeout, prev->upstream.connect_timeout, 60000); diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index bd6ae5f07..3f865345b 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c @@ -680,6 +680,14 @@ ngx_http_upstream_init_request(ngx_http_request_t *r) u->peer.so_keepalive = 1; } + if (u->conf->socket_rcvbuf) { + u->peer.rcvbuf = (int) u->conf->socket_rcvbuf; + } + + if (u->conf->socket_sndbuf) { + u->peer.sndbuf = (int) u->conf->socket_sndbuf; + } + clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); u->output.alignment = clcf->directio_alignment; diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h index 4560bbe9a..f07df42cf 100644 --- a/src/http/ngx_http_upstream.h +++ b/src/http/ngx_http_upstream.h @@ -205,6 +205,8 @@ typedef struct { ngx_http_upstream_local_t *local; ngx_flag_t socket_keepalive; + size_t socket_rcvbuf; + size_t socket_sndbuf; #if (NGX_HTTP_CACHE) ngx_shm_zone_t *cache_zone; -- 2.47.3