nginx-devel November 2017

nginx-devel@nginx.org

11 participants
46 discussions

by Vladimir Homutov

Hello all! We are glad to share with first results of our ongoing efforts to create documentation for nginx developers: the development guide document [1]. The guide is not yet 100% complete and more parts to follow. Of course, your feedback is welcome. [1] http://nginx.org/en/docs/dev/development_guide.html

4 years, 3 months

[PATCH] HTTP/2: don't limit number of requests per HTTP/2 connection

by Piotr Sikora

# HG changeset patch # User Piotr Sikora <piotrsikora(a)google.com> # Date 1504129797 25200 # Wed Aug 30 14:49:57 2017 -0700 # Node ID 49b677bf2ae7ab92499766e8184ddcbf7a4233f9 # Parent c7d4017c8876af6d8570e400320537d7d39e9578 HTTP/2: don't limit number of requests per HTTP/2 connection. Previous default limit (1000 requests) and lack of graceful shutdown could result in loss of requests, when clients were unable to retry. Signed-off-by: Piotr Sikora <piotrsikora(a)google.com> diff -r c7d4017c8876 -r 49b677bf2ae7 src/http/v2/ngx_http_v2_module.c --- a/src/http/v2/ngx_http_v2_module.c +++ b/src/http/v2/ngx_http_v2_module.c @@ -11,6 +11,9 @@ #include <ngx_http_v2_module.h> +#define NGX_HTTP_V2_MAX_STREAMS (1U << 30) + + static ngx_int_t ngx_http_v2_add_variables(ngx_conf_t *cf); static ngx_int_t ngx_http_v2_variable(ngx_http_request_t *r, @@ -355,7 +358,8 @@ ngx_http_v2_merge_srv_conf(ngx_conf_t *c ngx_conf_merge_uint_value(conf->concurrent_streams, prev->concurrent_streams, 128); - ngx_conf_merge_uint_value(conf->max_requests, prev->max_requests, 1000); + ngx_conf_merge_uint_value(conf->max_requests, prev->max_requests, + NGX_HTTP_V2_MAX_STREAMS); ngx_conf_merge_size_value(conf->max_field_size, prev->max_field_size, 4096);

4 years, 5 months

[PATCH] $request_scheme variable

by Chris Branch

# HG changeset patch # User Chris Branch <cbranch(a)cloudflare.com> # Date 1488195909 0 # Mon Feb 27 11:45:09 2017 +0000 # Node ID 05f555d65a33ebf005fedc569fb52eba3758e1d7 # Parent 87cf6ddb41c216876d13cffa5e637a61b159362c $request_scheme variable. Contains the URI scheme supplied by the client. If no scheme supplied, equivalent to $scheme. Scheme can be supplied by the client in two ways: * HTTP/2 :scheme pseudo-header. * HTTP/1 absolute URI in request line. diff -r 87cf6ddb41c2 -r 05f555d65a33 src/http/ngx_http_variables.c --- a/src/http/ngx_http_variables.c Fri Feb 17 17:01:27 2017 +0300 +++ b/src/http/ngx_http_variables.c Mon Feb 27 11:45:09 2017 +0000 @@ -105,6 +105,8 @@ ngx_http_variable_value_t *v, uintptr_t data); static ngx_int_t ngx_http_variable_request_id(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data); +static ngx_int_t ngx_http_variable_request_scheme(ngx_http_request_t *r, + ngx_http_variable_value_t *v, uintptr_t data); static ngx_int_t ngx_http_variable_status(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data); @@ -288,6 +290,10 @@ ngx_http_variable_request_id, 0, 0, 0 }, + { ngx_string("request_scheme"), NULL, + ngx_http_variable_request_scheme, + 0, 0, 0 }, + { ngx_string("status"), NULL, ngx_http_variable_status, 0, NGX_HTTP_VAR_NOCACHEABLE, 0 }, @@ -2158,6 +2164,24 @@ static ngx_int_t +ngx_http_variable_request_scheme(ngx_http_request_t *r, + ngx_http_variable_value_t *v, uintptr_t data) +{ + if (r->schema_start) { + v->len = r->schema_end - r->schema_start; + v->valid = 1; + v->no_cacheable = 0; + v->not_found = 0; + v->data = r->schema_start; + + return NGX_OK; + } + + return ngx_http_variable_scheme(r, v, data); +} + + +static ngx_int_t ngx_http_variable_connection(ngx_http_request_t *r, ngx_http_variable_value_t *v, uintptr_t data) {

4 years, 5 months

[patch]: document SHA-2 support in glibc crypt()

by Leonid Evdokimov

Hello! I'd like to see few more lines about SHA-2 support in glibc crypt() in documentation. I've created small patch for nginx.org repo, it's attached. -- WBRBW, Leonid Evdokimov, xmpp:leon@darkk.net.ru http://darkk.net.ru tel:+79816800702 PGP: 6691 DE6B 4CCD C1C1 76A0 0D4A E1F2 A980 7F50 FAB2

4 years, 5 months

Fwd: [ module ] Add http upstream keep alive timeout parameter

by Wei Xu

Hi I saw there's an issue talking about "implement keepalive timeout for upstream <https://trac.nginx.org/nginx/ticket/1170>". I have a different scenario for this requirement. I'm using Node.js web server as upstream, and set keep alive time out to 60 second in nodejs server. The problem is I found more than a hundred "Connection reset by peer" errors everyday. Because there's no any errors on nodejs side, I guess it was because of the upstream has disconnected, and at the same time, nginx send a new request, then received a TCP RST. I tried Tengine <http://tengine.taobao.org/> which is a taobao cloned version of nginx, and set upstream keep alive timeout to 30s, then there's no errors any more. So I want to know is there any plan to work on this enhancement? or can I submit a patch for it? Best Regards Wei Xu

4 years, 7 months

[PATCH] Proxy: support configuration of socket buffer sizes

by Karstens, Nate

# HG changeset patch # User Nate Karstens <nate.karstens at garmin.com> # Date 1493467011 18000 # Sat Apr 29 06:56:51 2017 -0500 # Node ID 1251a543804b17941b2c96b84bd1f4e58a37bc15 # Parent 8801ff7d58e1650c9d1abb50e09f5979e4f9ffbf Proxy: support configuration of socket buffer sizes Allows the size of the buffers used by the TCP sockets for HTTP proxy connections to be configured. The new configuration directives are: * proxy_socket_rcvbuf * proxy_socket_sndbuf These correspond with the SO_RCVBUF and SO_SNDBUF socket options, respectively. This is be useful in cases where the proxy processes received data slowly. Data was being buffered in three separate TCP buffers (nginx-from-client receive, nginx- to-proxy send, and proxy-from-nginx receive). The cumulative effect is that the client thinks it has sent all of the data, but times out waiting for a reply from the proxy, which cannot reply because it is still processing the data in its buffers. Signed-off-by: Nate Karstens <nate.karstens at garmin.com> diff -r 8801ff7d58e1 -r 1251a543804b src/event/ngx_event_connect.c --- a/src/event/ngx_event_connect.c Tue Apr 25 23:39:13 2017 +0300 +++ b/src/event/ngx_event_connect.c Sat Apr 29 06:56:51 2017 -0500 @@ -73,6 +73,16 @@ } } + if (pc->sndbuf) { + if (setsockopt(s, SOL_SOCKET, SO_SNDBUF, + (const void *) &pc->sndbuf, sizeof(int)) == -1) + { + ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno, + "setsockopt(SO_SNDBUF) failed"); + goto failed; + } + } + if (ngx_nonblocking(s) == -1) { ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno, ngx_nonblocking_n " failed"); diff -r 8801ff7d58e1 -r 1251a543804b src/event/ngx_event_connect.h --- a/src/event/ngx_event_connect.h Tue Apr 25 23:39:13 2017 +0300 +++ b/src/event/ngx_event_connect.h Sat Apr 29 06:56:51 2017 -0500 @@ -57,6 +57,7 @@ int type; int rcvbuf; + int sndbuf; ngx_log_t *log; diff -r 8801ff7d58e1 -r 1251a543804b src/http/modules/ngx_http_proxy_module.c --- a/src/http/modules/ngx_http_proxy_module.c Tue Apr 25 23:39:13 2017 +0300 +++ b/src/http/modules/ngx_http_proxy_module.c Sat Apr 29 06:56:51 2017 -0500 @@ -90,6 +90,9 @@ ngx_uint_t headers_hash_max_size; ngx_uint_t headers_hash_bucket_size; + ngx_int_t rcvbuf; + ngx_int_t sndbuf; + #if (NGX_HTTP_SSL) ngx_uint_t ssl; ngx_uint_t ssl_protocols; @@ -629,6 +632,20 @@ offsetof(ngx_http_proxy_loc_conf_t, http_version), &ngx_http_proxy_http_version }, + { ngx_string("proxy_socket_rcvbuf"), + NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1, + ngx_conf_set_num_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_proxy_loc_conf_t, 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_num_slot, + NGX_HTTP_LOC_CONF_OFFSET, + offsetof(ngx_http_proxy_loc_conf_t, sndbuf), + NULL }, + #if (NGX_HTTP_SSL) { ngx_string("proxy_ssl_session_reuse"), @@ -905,6 +922,13 @@ u->buffering = plcf->upstream.buffering; + if (plcf->rcvbuf != NGX_CONF_UNSET) { + u->peer.rcvbuf = plcf->rcvbuf; + } + if (plcf->sndbuf != NGX_CONF_UNSET) { + u->peer.sndbuf = plcf->sndbuf; + } + u->pipe = ngx_pcalloc(r->pool, sizeof(ngx_event_pipe_t)); if (u->pipe == NULL) { return NGX_HTTP_INTERNAL_SERVER_ERROR; @@ -2902,6 +2926,9 @@ conf->headers_hash_max_size = NGX_CONF_UNSET_UINT; conf->headers_hash_bucket_size = NGX_CONF_UNSET_UINT; + conf->rcvbuf = NGX_CONF_UNSET; + conf->sndbuf = NGX_CONF_UNSET; + ngx_str_set(&conf->upstream.module, "proxy"); return conf; @@ -3297,6 +3324,12 @@ ngx_conf_merge_uint_value(conf->headers_hash_bucket_size, prev->headers_hash_bucket_size, 64); + ngx_conf_merge_value(conf->rcvbuf, + prev->rcvbuf, NGX_CONF_UNSET); + + ngx_conf_merge_value(conf->sndbuf, + prev->sndbuf, NGX_CONF_UNSET); + conf->headers_hash_bucket_size = ngx_align(conf->headers_hash_bucket_size, ngx_cacheline_size); ________________________________ CONFIDENTIALITY NOTICE: This email and any attachments are for the sole use of the intended recipient(s) and contain information that may be Garmin confidential and/or Garmin legally privileged. If you have received this email in error, please notify the sender by reply email and delete the message. Any disclosure, copying, distribution or use of this communication (including attachments) by someone other than the intended recipient is prohibited. Thank you.

4 years, 8 months

[PATCH] Workaround for systemd error messages about nginx pid file.

by Gena Makhomed

# HG changeset patch # User Gena Makhomed <gmm(a)csdoc.com> # Date 1511951401 -7200 # Wed Nov 29 12:30:01 2017 +0200 # Node ID b529ea784244e13d8a5e58a12c8b639351652057 # Parent fc0d06224edac2c7cfbfd9a4def478f285d9957b Workaround for systemd error messages about nginx pid file. Race condition exists between nginx writing and systemd reading pid file. Sometimes systemd can produce error messages about nginx pid file: systemd: Failed to read PID from file /var/run/nginx.pid: Invalid argument systemd: PID file /var/run/nginx.pid not readable (yet?) after start. This patch add small delay before nginx original process exit to eliminate race condition between nginx and systemd. diff -r fc0d06224eda -r b529ea784244 src/os/unix/ngx_daemon.c --- a/src/os/unix/ngx_daemon.c Tue Nov 28 13:09:54 2017 +0300 +++ b/src/os/unix/ngx_daemon.c Wed Nov 29 12:30:01 2017 +0200 @@ -23,6 +23,7 @@ break; default: + ngx_msleep(100); exit(0); }

4 years, 8 months

[nginx] Removed unused FreeBSD-specific definitions in ngx_posix_config.h.

by Sergey Kandaurov

details: http://hg.nginx.org/nginx/rev/fc0d06224eda branches: changeset: 7163:fc0d06224eda user: Sergey Kandaurov <pluknet(a)nginx.com> date: Tue Nov 28 13:09:54 2017 +0300 description: Removed unused FreeBSD-specific definitions in ngx_posix_config.h. diffstat: src/os/unix/ngx_posix_config.h | 20 -------------------- 1 files changed, 0 insertions(+), 20 deletions(-) diffs (30 lines): diff -r 8b84d60ef13d -r fc0d06224eda src/os/unix/ngx_posix_config.h --- a/src/os/unix/ngx_posix_config.h Tue Nov 28 12:00:24 2017 +0300 +++ b/src/os/unix/ngx_posix_config.h Tue Nov 28 13:09:54 2017 +0300 @@ -145,26 +145,6 @@ typedef struct aiocb ngx_aiocb_t; #define ngx_debug_init() -#if (__FreeBSD__) && (__FreeBSD_version < 400017) - -#include <sys/param.h> /* ALIGN() */ - -/* - * FreeBSD 3.x has no CMSG_SPACE() and CMSG_LEN() and has the broken CMSG_DATA() - */ - -#undef CMSG_SPACE -#define CMSG_SPACE(l) (ALIGN(sizeof(struct cmsghdr)) + ALIGN(l)) - -#undef CMSG_LEN -#define CMSG_LEN(l) (ALIGN(sizeof(struct cmsghdr)) + (l)) - -#undef CMSG_DATA -#define CMSG_DATA(cmsg) ((u_char *)(cmsg) + ALIGN(sizeof(struct cmsghdr))) - -#endif - - extern char **environ;

4 years, 8 months

[nginx] Fixed "changing binary" when reaper is not init.

by Ruslan Ermilov

details: http://hg.nginx.org/nginx/rev/8b84d60ef13d branches: changeset: 7162:8b84d60ef13d user: Ruslan Ermilov <ru(a)nginx.com> date: Tue Nov 28 12:00:24 2017 +0300 description: Fixed "changing binary" when reaper is not init. On some systems, it's possible that reaper of orphaned processes is set to something other than "init" process. On such systems, the changing binary procedure did not work. The fix is to check if PPID has changed, instead of assuming it's always 1 for orphaned processes. diffstat: src/core/nginx.c | 1 + src/os/unix/ngx_daemon.c | 1 + src/os/unix/ngx_process.c | 7 ++++--- src/os/unix/ngx_process.h | 2 ++ src/os/unix/ngx_process_cycle.c | 1 + src/os/win32/ngx_process.h | 2 ++ src/os/win32/ngx_process_cycle.c | 1 + 7 files changed, 12 insertions(+), 3 deletions(-) diffs (109 lines): diff -r 325b3042edd6 -r 8b84d60ef13d src/core/nginx.c --- a/src/core/nginx.c Thu Nov 23 16:33:40 2017 +0300 +++ b/src/core/nginx.c Tue Nov 28 12:00:24 2017 +0300 @@ -228,6 +228,7 @@ main(int argc, char *const *argv) #endif ngx_pid = ngx_getpid(); + ngx_parent = ngx_getppid(); log = ngx_log_init(ngx_prefix); if (log == NULL) { diff -r 325b3042edd6 -r 8b84d60ef13d src/os/unix/ngx_daemon.c --- a/src/os/unix/ngx_daemon.c Thu Nov 23 16:33:40 2017 +0300 +++ b/src/os/unix/ngx_daemon.c Tue Nov 28 12:00:24 2017 +0300 @@ -26,6 +26,7 @@ ngx_daemon(ngx_log_t *log) exit(0); } + ngx_parent = ngx_pid; ngx_pid = ngx_getpid(); if (setsid() == -1) { diff -r 325b3042edd6 -r 8b84d60ef13d src/os/unix/ngx_process.c --- a/src/os/unix/ngx_process.c Thu Nov 23 16:33:40 2017 +0300 +++ b/src/os/unix/ngx_process.c Tue Nov 28 12:00:24 2017 +0300 @@ -194,6 +194,7 @@ ngx_spawn_process(ngx_cycle_t *cycle, ng return NGX_INVALID_PID; case 0: + ngx_parent = ngx_pid; ngx_pid = ngx_getpid(); proc(cycle, data); break; @@ -371,12 +372,12 @@ ngx_signal_handler(int signo, siginfo_t break; case ngx_signal_value(NGX_CHANGEBIN_SIGNAL): - if (getppid() > 1 || ngx_new_binary > 0) { + if (ngx_getppid() == ngx_parent || ngx_new_binary > 0) { /* * Ignore the signal in the new binary if its parent is - * not the init process, i.e. the old binary's process - * is still running. Or ignore the signal in the old binary's + * not changed, i.e. the old binary's process is still + * running. Or ignore the signal in the old binary's * process if the new binary's process is already running. */ diff -r 325b3042edd6 -r 8b84d60ef13d src/os/unix/ngx_process.h --- a/src/os/unix/ngx_process.h Thu Nov 23 16:33:40 2017 +0300 +++ b/src/os/unix/ngx_process.h Tue Nov 28 12:00:24 2017 +0300 @@ -54,6 +54,7 @@ typedef struct { #define ngx_getpid getpid +#define ngx_getppid getppid #ifndef ngx_log_pid #define ngx_log_pid ngx_pid @@ -79,6 +80,7 @@ extern char **ngx_argv; extern char **ngx_os_argv; extern ngx_pid_t ngx_pid; +extern ngx_pid_t ngx_parent; extern ngx_socket_t ngx_channel; extern ngx_int_t ngx_process_slot; extern ngx_int_t ngx_last_process; diff -r 325b3042edd6 -r 8b84d60ef13d src/os/unix/ngx_process_cycle.c --- a/src/os/unix/ngx_process_cycle.c Thu Nov 23 16:33:40 2017 +0300 +++ b/src/os/unix/ngx_process_cycle.c Tue Nov 28 12:00:24 2017 +0300 @@ -31,6 +31,7 @@ static void ngx_cache_loader_process_han ngx_uint_t ngx_process; ngx_uint_t ngx_worker; ngx_pid_t ngx_pid; +ngx_pid_t ngx_parent; sig_atomic_t ngx_reap; sig_atomic_t ngx_sigio; diff -r 325b3042edd6 -r 8b84d60ef13d src/os/win32/ngx_process.h --- a/src/os/win32/ngx_process.h Thu Nov 23 16:33:40 2017 +0300 +++ b/src/os/win32/ngx_process.h Tue Nov 28 12:00:24 2017 +0300 @@ -14,6 +14,7 @@ typedef DWORD ngx_pid_t; #define ngx_getpid GetCurrentProcessId +#define ngx_getppid() 0 #define ngx_log_pid ngx_pid @@ -73,6 +74,7 @@ extern ngx_int_t ngx_last_pro extern ngx_process_t ngx_processes[NGX_MAX_PROCESSES]; extern ngx_pid_t ngx_pid; +extern ngx_pid_t ngx_parent; #endif /* _NGX_PROCESS_H_INCLUDED_ */ diff -r 325b3042edd6 -r 8b84d60ef13d src/os/win32/ngx_process_cycle.c --- a/src/os/win32/ngx_process_cycle.c Thu Nov 23 16:33:40 2017 +0300 +++ b/src/os/win32/ngx_process_cycle.c Tue Nov 28 12:00:24 2017 +0300 @@ -31,6 +31,7 @@ static ngx_thread_value_t __stdcall ngx_ ngx_uint_t ngx_process; ngx_uint_t ngx_worker; ngx_pid_t ngx_pid; +ngx_pid_t ngx_parent; ngx_uint_t ngx_inherited; ngx_pid_t ngx_new_binary;

4 years, 8 months

[nginx] Configure: fixed clang detection on MINIX.

by Maxim Dounin

details: http://hg.nginx.org/nginx/rev/325b3042edd6 branches: changeset: 7161:325b3042edd6 user: Maxim Dounin <mdounin(a)mdounin.ru> date: Thu Nov 23 16:33:40 2017 +0300 description: Configure: fixed clang detection on MINIX. As per POSIX, basic regular expressions have no alternations, and the interpretation of the "\|" construct is undefined. At least on MINIX and Solaris grep interprets "\|" as literal "|", and not as an alternation as GNU grep does. Removed such constructs introduced in f1daa0356a1d. This fixes clang detection on MINIX. diffstat: auto/cc/clang | 2 +- auto/cc/name | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diffs (28 lines): diff --git a/auto/cc/clang b/auto/cc/clang --- a/auto/cc/clang +++ b/auto/cc/clang @@ -5,7 +5,7 @@ # clang -NGX_CLANG_VER=`$CC -v 2>&1 | grep '$clang\|LLVM$ version' 2>&1 \ +NGX_CLANG_VER=`$CC -v 2>&1 | grep 'version' 2>&1 \ | sed -e 's/^.* version $.*$/\1/'` echo " + clang version: $NGX_CLANG_VER" diff --git a/auto/cc/name b/auto/cc/name --- a/auto/cc/name +++ b/auto/cc/name @@ -44,7 +44,11 @@ elif `$CC -v 2>&1 | grep 'gcc version' > NGX_CC_NAME=gcc echo " + using GNU C compiler" -elif `$CC -v 2>&1 | grep '$clang\|LLVM$ version' >/dev/null 2>&1`; then +elif `$CC -v 2>&1 | grep 'clang version' >/dev/null 2>&1`; then + NGX_CC_NAME=clang + echo " + using Clang C compiler" + +elif `$CC -v 2>&1 | grep 'LLVM version' >/dev/null 2>&1`; then NGX_CC_NAME=clang echo " + using Clang C compiler"

4 years, 8 months

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

nginx-devel November 2017