Commit 6692bd213c3029fb45933e139d001f6a315c5197 - nginx

Merge of r4227, r4228: Fixed range checking for the "somaxconn" sysctl. Fixed port range checking. Maxim Dounin 10 years ago

4 changed file(s) with 9 addition(s) and 16 deletion(s). Raw diff Collapse all Expand all

-3

src/core/ngx_inet.c less more

-1

src/mail/ngx_mail_auth_http_module.c less more

782	782	sin->sin_family = AF_INET;
783	783
784	784	port = ngx_atoi(ctx->port.data, ctx->port.len);
785		if (port == NGX_ERROR \|\| port < 1 \|\| port > 65536) {
	785	if (port == NGX_ERROR \|\| port < 1 \|\| port > 65535) {
786	786	ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
787	787	"auth http server %V sent invalid server "
788	788	"port:\"%V\"",

-6

src/os/unix/ngx_darwin_init.c less more

57	57	ngx_int_t
58	58	ngx_os_specific_init(ngx_log_t *log)
59	59	{
60		int somaxconn;
61	60	size_t size;
62	61	ngx_err_t err;
63	62	ngx_uint_t i;

124	123
125	124	ngx_ncpu = ngx_darwin_hw_ncpu;
126	125
127		somaxconn = 32676;
128
129		if (ngx_darwin_kern_ipc_somaxconn > somaxconn) {
	126	if (ngx_darwin_kern_ipc_somaxconn > 32767) {
130	127	ngx_log_error(NGX_LOG_ALERT, log, 0,
131		"sysctl kern.ipc.somaxconn must be no more than %d",
132		somaxconn);
	128	"sysctl kern.ipc.somaxconn must be less than 32768");
133	129	return NGX_ERROR;
134	130	}
135	131

-6

src/os/unix/ngx_freebsd_init.c less more

96	96	ngx_int_t
97	97	ngx_os_specific_init(ngx_log_t *log)
98	98	{
99		int version, somaxconn;
	99	int version;
100	100	size_t size;
101	101	ngx_err_t err;
102	102	ngx_uint_t i;

208	208	ngx_ncpu = ngx_freebsd_hw_ncpu;
209	209	}
210	210
211		somaxconn = version < 600008 ? 32676 : 65535;
212
213		if (ngx_freebsd_kern_ipc_somaxconn > somaxconn) {
	211	if (version < 600008 && ngx_freebsd_kern_ipc_somaxconn > 32767) {
214	212	ngx_log_error(NGX_LOG_ALERT, log, 0,
215		"sysctl kern.ipc.somaxconn must be no more than %d",
216		somaxconn);
	213	"sysctl kern.ipc.somaxconn must be less than 32768");
217	214	return NGX_ERROR;
218	215	}
219	216