]> git.kaiwu.me - nginx.git/log
nginx.git
7 years agoStable branch.
Maxim Dounin [Tue, 23 Apr 2019 13:12:17 +0000 (16:12 +0300)]
Stable branch.

7 years agorelease-1.15.12 tag
Maxim Dounin [Tue, 16 Apr 2019 14:54:59 +0000 (17:54 +0300)]
release-1.15.12 tag

7 years agonginx-1.15.12-RELEASE release-1.15.12
Maxim Dounin [Tue, 16 Apr 2019 14:54:58 +0000 (17:54 +0300)]
nginx-1.15.12-RELEASE

7 years agoUpdated PCRE used for win32 builds.
Maxim Dounin [Tue, 16 Apr 2019 13:32:44 +0000 (16:32 +0300)]
Updated PCRE used for win32 builds.

7 years agoFixed incorrect length handling in ngx_utf8_length().
Maxim Dounin [Mon, 15 Apr 2019 17:14:07 +0000 (20:14 +0300)]
Fixed incorrect length handling in ngx_utf8_length().

Previously, ngx_utf8_decode() was called from ngx_utf8_length() with
incorrect length, potentially resulting in out-of-bounds read when
handling invalid UTF-8 strings.

In practice out-of-bounds reads are not possible though, as autoindex, the
only user of ngx_utf8_length(), provides null-terminated strings, and
ngx_utf8_decode() anyway returns an errors when it sees a null in the
middle of an UTF-8 sequence.

Reported by Yunbin Liu.

7 years agoOCSP stapling: fixed segfault with dynamic certificate loading.
Maxim Dounin [Mon, 15 Apr 2019 16:13:09 +0000 (19:13 +0300)]
OCSP stapling: fixed segfault with dynamic certificate loading.

If OCSP stapling was enabled with dynamic certificate loading, with some
OpenSSL versions (1.0.2o and older, 1.1.0h and older; fixed in 1.0.2p,
1.1.0i, 1.1.1) a segmentation fault might happen.

The reason is that during an abbreviated handshake the certificate
callback is not called, but the certificate status callback was called
(https://github.com/openssl/openssl/issues/1662), leading to NULL being
returned from SSL_get_certificate().

Fix is to explicitly check SSL_get_certificate() result.

7 years agoVersion bump.
Maxim Dounin [Mon, 15 Apr 2019 16:13:06 +0000 (19:13 +0300)]
Version bump.

7 years agorelease-1.15.11 tag
Maxim Dounin [Tue, 9 Apr 2019 13:00:30 +0000 (16:00 +0300)]
release-1.15.11 tag

7 years agonginx-1.15.11-RELEASE release-1.15.11
Maxim Dounin [Tue, 9 Apr 2019 13:00:30 +0000 (16:00 +0300)]
nginx-1.15.11-RELEASE

7 years agoWin32: avoid using CFLAGS, just add define instead.
Maxim Dounin [Thu, 4 Apr 2019 19:56:41 +0000 (22:56 +0300)]
Win32: avoid using CFLAGS, just add define instead.

With CFLAGS set as in 7da71a7b141a, OpenSSL compilation drops various
non-important compiler options.  To avoid this, a define is added
instead - OpenSSL is smart enough to recognize -D... in Configure
arguments.

7 years agoWin32: defined pdb path.
Maxim Dounin [Thu, 4 Apr 2019 16:30:47 +0000 (19:30 +0300)]
Win32: defined pdb path.

By default, MSVC uses vc<version>.pdb in the current directory.
With the "-Fd" switch it is directed to be in the objs directory instead.

7 years agoWin32: preserving binary compatibility with Windows XP - Vista.
Sergey Kandaurov [Thu, 4 Apr 2019 13:26:56 +0000 (16:26 +0300)]
Win32: preserving binary compatibility with Windows XP - Vista.

OpenSSL 1.1.0 and above uses BCrypt if available (Windows 7 or higher).
This results in an unusable binary on older Windows versions, when building
with newer Windows SDK (such as 7.0A).  Using CFLAGS to define _WIN32_WINNT
allows to set a desired ABI and make sure the binary works with Windows XP.

To not mix with other potential CFLAGS uses, it is set in GNUmakefile.

7 years agoWin32: skip building OpenSSL tests to conserve time and space.
Sergey Kandaurov [Thu, 4 Apr 2019 13:22:03 +0000 (16:22 +0300)]
Win32: skip building OpenSSL tests to conserve time and space.

When building OpenSSL 1.1.1b, as used for win32 builds, with tests
it takes about twice as long and near ~1GB of additional disk space.
Using "no-tests" OpenSSL configuration option allows to skip them.
Since such an option is supported since OpenSSL 1.1.1 only, it is
residing here and not in configure.

7 years agoOCSP stapling: open ssl_stapling_file in binary-mode.
Sergey Kandaurov [Wed, 3 Apr 2019 12:35:39 +0000 (15:35 +0300)]
OCSP stapling: open ssl_stapling_file in binary-mode.

OCSP response uses the DER format and as such needs to be opened in binary-mode.
This only has any effect under Win32.

7 years agoSSL: missing free calls in $ssl_client_s_dn and $ssl_client_i_dn.
Nikolay Morozov [Tue, 26 Mar 2019 06:33:57 +0000 (09:33 +0300)]
SSL: missing free calls in $ssl_client_s_dn and $ssl_client_i_dn.

If X509_get_issuer_name() or X509_get_subject_name() returned NULL,
this could lead to a certificate reference leak.  It cannot happen
in practice though, since each function returns an internal pointer
to a mandatory subfield of the certificate successfully decoded by
d2i_X509() during certificate message processing (closes #1751).

7 years agoVersion bump.
Sergey Kandaurov [Tue, 26 Mar 2019 15:25:08 +0000 (18:25 +0300)]
Version bump.

7 years agorelease-1.15.10 tag
Maxim Dounin [Tue, 26 Mar 2019 14:06:55 +0000 (17:06 +0300)]
release-1.15.10 tag

7 years agonginx-1.15.10-RELEASE release-1.15.10
Maxim Dounin [Tue, 26 Mar 2019 14:06:54 +0000 (17:06 +0300)]
nginx-1.15.10-RELEASE

7 years agoListen port ranges.
Roman Arutyunyan [Wed, 6 Mar 2019 17:46:09 +0000 (20:46 +0300)]
Listen port ranges.

A range is specified with a dash.  For each port in a range a separate listen
socket is created.

Examples:

    listen 8080-9000;
    listen example.com:80-88;

7 years agoRemoved sorting of getaddrinfo() results.
Roman Arutyunyan [Wed, 20 Mar 2019 17:31:59 +0000 (20:31 +0300)]
Removed sorting of getaddrinfo() results.

Previously the ngx_inet_resolve_host() function sorted addresses in a way that
IPv4 addresses came before IPv6 addresses.  This was implemented in eaf95350d75c
(1.3.10) along with the introduction of getaddrinfo() which could resolve host
names to IPv6 addresses.  Since the "listen" directive only used the first
address, sorting allowed to preserve "listen" compatibility with the previous
behavior and with the behavior of nginx built without IPv6 support.  Now
"listen" uses all resolved addresses which makes sorting pointless.

7 years agoMultiple addresses in "listen".
Roman Arutyunyan [Fri, 15 Mar 2019 12:45:56 +0000 (15:45 +0300)]
Multiple addresses in "listen".

Previously only one address was used by the listen directive handler even if
host name resolved to multiple addresses.  Now a separate listening socket is
created for each address.

7 years agoSSL: support for parsing PEM certificates from memory.
Maxim Dounin [Sat, 9 Mar 2019 00:03:56 +0000 (03:03 +0300)]
SSL: support for parsing PEM certificates from memory.

This makes it possible to provide certificates directly via variables
in ssl_certificate / ssl_certificate_key directives, without using
intermediate files.

7 years agoSSL: removed redundant "pkey" variable.
Maxim Dounin [Fri, 8 Mar 2019 23:55:43 +0000 (02:55 +0300)]
SSL: removed redundant "pkey" variable.

It was accidentally introduced in 77436d9951a1 (1.15.9).  In MSVC 2015
and more recent MSVC versions it triggers warning C4456 (declaration of
'pkey' hides previous local declaration).  Previously, all such warnings
were resolved in 2a621245f4cf.

Reported by Steve Stevenson.

7 years agoSSL: moved c->ssl->handshaked check in server name callback.
Maxim Dounin [Tue, 5 Mar 2019 13:34:19 +0000 (16:34 +0300)]
SSL: moved c->ssl->handshaked check in server name callback.

Server name callback is always called by OpenSSL, even
if server_name extension is not present in ClientHello.  As such,
checking c->ssl->handshaked before the SSL_get_servername() result
should help to more effectively prevent renegotiation in
OpenSSL 1.1.0 - 1.1.0g, where neither SSL3_FLAGS_NO_RENEGOTIATE_CIPHERS
nor SSL_OP_NO_RENEGOTIATION is available.

7 years agoSSL: use of the SSL_OP_NO_CLIENT_RENEGOTIATION option.
Maxim Dounin [Sun, 3 Mar 2019 13:49:02 +0000 (16:49 +0300)]
SSL: use of the SSL_OP_NO_CLIENT_RENEGOTIATION option.

The SSL_OP_NO_CLIENT_RENEGOTIATION option was introduced in LibreSSL 2.5.1.
Unlike OpenSSL's SSL_OP_NO_RENEGOTIATION, it only disables client-initiated
renegotiation, and hence can be safely used on all SSL contexts.

7 years agoSSL: fixed potential leak on memory allocation errors.
Maxim Dounin [Sun, 3 Mar 2019 13:48:39 +0000 (16:48 +0300)]
SSL: fixed potential leak on memory allocation errors.

If ngx_pool_cleanup_add() fails, we have to clean just created SSL context
manually, thus appropriate call added.

Additionally, ngx_pool_cleanup_add() moved closer to ngx_ssl_create() in
the ngx_http_ssl_module, to make sure there are no leaks due to intermediate
code.

7 years agoSSL: server name callback changed to return fatal errors.
Maxim Dounin [Sun, 3 Mar 2019 13:48:06 +0000 (16:48 +0300)]
SSL: server name callback changed to return fatal errors.

Notably this affects various allocation errors, and should generally
improve things if an allocation error actually happens during a callback.

Depending on the OpenSSL version, returning an error can result in
either SSL_R_CALLBACK_FAILED or SSL_R_CLIENTHELLO_TLSEXT error from
SSL_do_handshake(), so both errors were switched to the "info" level.

7 years agoSSL: server name callback changed to return SSL_TLSEXT_ERR_OK.
Maxim Dounin [Sun, 3 Mar 2019 13:47:44 +0000 (16:47 +0300)]
SSL: server name callback changed to return SSL_TLSEXT_ERR_OK.

OpenSSL 1.1.1 does not save server name to the session if server name
callback returns anything but SSL_TLSEXT_ERR_OK, thus breaking
the $ssl_server_name variable in resumed sessions.

Since $ssl_server_name can be used even if we've selected the default
server and there are no other servers, it looks like the only viable
solution is to always return SSL_TLSEXT_ERR_OK regardless of the actual
result.

To fix things in the stream module as well, added a dummy server name
callback which always returns SSL_TLSEXT_ERR_OK.

7 years agoVersion bump.
Maxim Dounin [Sun, 3 Mar 2019 13:47:41 +0000 (16:47 +0300)]
Version bump.

7 years agorelease-1.15.9 tag
Maxim Dounin [Tue, 26 Feb 2019 15:29:22 +0000 (18:29 +0300)]
release-1.15.9 tag

7 years agonginx-1.15.9-RELEASE release-1.15.9
Maxim Dounin [Tue, 26 Feb 2019 15:29:22 +0000 (18:29 +0300)]
nginx-1.15.9-RELEASE

7 years agoUpdated OpenSSL used for win32 builds.
Maxim Dounin [Tue, 26 Feb 2019 15:01:30 +0000 (18:01 +0300)]
Updated OpenSSL used for win32 builds.

7 years agoSSL: fixed possible segfault with dynamic certificates.
Maxim Dounin [Mon, 25 Feb 2019 18:16:26 +0000 (21:16 +0300)]
SSL: fixed possible segfault with dynamic certificates.

A virtual server may have no SSL context if it does not have certificates
defined, so we have to use config of the ngx_http_ssl_module from the
SSL context in the certificate callback.  To do so, it is now passed as
the argument of the callback.

The stream module doesn't really need any changes, but was modified as
well to match http code.

7 years agoSSL: adjusted session id context with dynamic certificates.
Maxim Dounin [Mon, 25 Feb 2019 13:42:54 +0000 (16:42 +0300)]
SSL: adjusted session id context with dynamic certificates.

Dynamic certificates re-introduce problem with incorrect session
reuse (AKA "virtual host confusion", CVE-2014-3616), since there are
no server certificates to generate session id context from.

To prevent this, session id context is now generated from ssl_certificate
directives as specified in the configuration.  This approach prevents
incorrect session reuse in most cases, while still allowing sharing
sessions across multiple machines with ssl_session_ticket_key set as
long as configurations are identical.

7 years agoSSL: dynamic certificate loading in the stream module.
Maxim Dounin [Mon, 25 Feb 2019 13:42:43 +0000 (16:42 +0300)]
SSL: dynamic certificate loading in the stream module.

7 years agoSSL: passwords support for dynamic certificate loading.
Maxim Dounin [Mon, 25 Feb 2019 13:42:23 +0000 (16:42 +0300)]
SSL: passwords support for dynamic certificate loading.

Passwords have to be copied to the configuration pool to be used
at runtime.  Also, to prevent blocking on stdin (with "daemon off;")
an empty password list is provided.

To make things simpler, password handling was modified to allow
an empty array (with 0 elements and elts set to NULL) as an equivalent
of an array with 1 empty password.

7 years agoSSL: variables support in ssl_certificate and ssl_certificate_key.
Maxim Dounin [Mon, 25 Feb 2019 13:42:05 +0000 (16:42 +0300)]
SSL: variables support in ssl_certificate and ssl_certificate_key.

To evaluate variables, a request is created in the certificate callback,
and then freed.  To do this without side effects on the stub_status
counters and connection state, an additional function was introduced,
ngx_http_alloc_request().

Only works with OpenSSL 1.0.2+, since there is no SSL_CTX_set_cert_cb()
in older versions.

7 years agoSSL: loading of connection-specific certificates.
Maxim Dounin [Mon, 25 Feb 2019 13:41:44 +0000 (16:41 +0300)]
SSL: loading of connection-specific certificates.

7 years agoSSL: reworked ngx_ssl_certificate().
Maxim Dounin [Mon, 25 Feb 2019 13:41:28 +0000 (16:41 +0300)]
SSL: reworked ngx_ssl_certificate().

This makes it possible to reuse certificate loading at runtime,
as introduced in the following patches.

Additionally, this improves error logging, so nginx will now log
human-friendly messages "cannot load certificate" instead of only
referring to sometimes cryptic names of OpenSSL functions.

7 years agoSSL: removed logging of empty "(SSL:)" in ngx_ssl_error().
Maxim Dounin [Mon, 25 Feb 2019 13:41:15 +0000 (16:41 +0300)]
SSL: removed logging of empty "(SSL:)" in ngx_ssl_error().

The "(SSL:)" snippet currently appears in logs when nginx code uses
ngx_ssl_error() to log an error, but OpenSSL's error queue is empty.
This can happen either because the error wasn't in fact from OpenSSL,
or because OpenSSL did not indicate the error in the error queue
for some reason.

In particular, currently "(SSL:)" can be seen in errors at least in
the following cases:

- When SSL_write() fails due to a syscall error,
  "[info] ... SSL_write() failed (SSL:) (32: Broken pipe)...".

- When loading a certificate with no data in it,
  "[emerg] PEM_read_bio_X509_AUX(...) failed (SSL:)".
  This can easily happen due to an additional empty line before
  the end line, so all lines of the certificate are interpreted
  as header lines.

- When trying to configure an unknown curve,
  "[emerg] SSL_CTX_set1_curves_list("foo") failed (SSL:)".

Likely there are other cases as well.

With this change, "(SSL:...)" will be only added to the error message
if there is something in the error queue.  This is expected to make
logs more readable in the above cases.  Additionally, with this change
it is now possible to use ngx_ssl_error() to log errors when some
of the possible errors are not from OpenSSL and not expected to have
anything in the error queue.

7 years agoStyle.
Maxim Dounin [Mon, 25 Feb 2019 13:41:08 +0000 (16:41 +0300)]
Style.

7 years agoSlab: removed redundant page calculation (ticket #1721).
Maxim Dounin [Tue, 12 Feb 2019 18:51:15 +0000 (21:51 +0300)]
Slab: removed redundant page calculation (ticket #1721).

7 years agoUpstream: fixed logging of required buffer size (ticket #1722).
Chanhun Jeong [Mon, 11 Feb 2019 04:36:53 +0000 (13:36 +0900)]
Upstream: fixed logging of required buffer size (ticket #1722).

7 years agoSSL: fixed EVP_DigestFinal_ex() error message.
Sergey Kandaurov [Thu, 7 Feb 2019 16:39:35 +0000 (19:39 +0300)]
SSL: fixed EVP_DigestFinal_ex() error message.

7 years agoSSL: separate checks for errors in ngx_ssl_read_password_file().
Maxim Dounin [Thu, 31 Jan 2019 16:36:51 +0000 (19:36 +0300)]
SSL: separate checks for errors in ngx_ssl_read_password_file().

Checking multiple errors at once is a bad practice, as in general
it is not guaranteed that an object can be used after the error.
In this particular case, checking errors after multiple allocations
can result in excessive errors being logged when there is no memory
available.

7 years agoSSL: explicitly zero out session ticket keys.
Ruslan Ermilov [Thu, 31 Jan 2019 16:28:07 +0000 (19:28 +0300)]
SSL: explicitly zero out session ticket keys.

7 years agoModules compatibility: down flag in ngx_peer_connection_t.
Roman Arutyunyan [Thu, 31 Jan 2019 14:25:03 +0000 (17:25 +0300)]
Modules compatibility: down flag in ngx_peer_connection_t.

7 years agoUse %s for errors returned from configuration parsing handlers.
Ruslan Ermilov [Tue, 25 Dec 2018 12:26:58 +0000 (15:26 +0300)]
Use %s for errors returned from configuration parsing handlers.

7 years agoConfigure: added explicit ngx_binext to the linker output argument.
Sergey Kandaurov [Wed, 30 Jan 2019 16:28:27 +0000 (19:28 +0300)]
Configure: added explicit ngx_binext to the linker output argument.

Unlike with GCC or MSVC, Clang linker doesn't auto-append ".exe" to the name
of the output binary when building on win32.

7 years agoRemoved --test-build-eventport workaround for old FreeBSD versions.
Sergey Kandaurov [Mon, 28 Jan 2019 14:34:02 +0000 (14:34 +0000)]
Removed --test-build-eventport workaround for old FreeBSD versions.

7 years agoFixed portability issues with union sigval.
Sergey Kandaurov [Mon, 28 Jan 2019 14:33:31 +0000 (14:33 +0000)]
Fixed portability issues with union sigval.

AIO support in nginx was originally developed against FreeBSD versions 4-6,
where the sival_ptr field was named as sigval_ptr (seemingly by mistake[1]),
which made nginx use the only name available then.  The standard-complaint
name was restored in 2005 (first appeared in FreeBSD 7.0, 2008), retaining
compatibility with previous versions[2][3].  In DragonFly, similar changes
were committed in 2009[4], with backward compatibility recently removed[5].

The change switches to the standard name, retaining compatibility with old
FreeBSD versions.

[1] https://svnweb.freebsd.org/changeset/base/48621
[2] https://svnweb.freebsd.org/changeset/base/152029
[3] https://svnweb.freebsd.org/changeset/base/174003
[4] https://gitweb.dragonflybsd.org/dragonfly.git/commit/3693401
[5] https://gitweb.dragonflybsd.org/dragonfly.git/commit/7875042

7 years agoYear 2019.
Maxim Konovalov [Mon, 28 Jan 2019 10:23:37 +0000 (13:23 +0300)]
Year 2019.

7 years agoWin32: detection of connect() errors in select().
Maxim Dounin [Thu, 24 Jan 2019 19:00:44 +0000 (22:00 +0300)]
Win32: detection of connect() errors in select().

On Windows, connect() errors are only reported via exceptfds descriptor set
from select().  Previously exceptfds was set to NULL, and connect() errors
were not detected at all, so connects to closed ports were waiting till
a timeout occurred.

Since ongoing connect() means that there will be a write event active,
except descriptor set is copied from the write one.  While it is possible
to construct except descriptor set as a concatenation of both read and write
descriptor sets, this looks unneeded.

With this change, connect() errors are properly detected now when using
select().  Note well that it is not possible to detect connect() errors with
WSAPoll() (see https://daniel.haxx.se/blog/2012/10/10/wsapoll-is-broken/).

7 years agoWin32: enabled both select and poll on Windows by default.
Maxim Dounin [Thu, 24 Jan 2019 19:00:13 +0000 (22:00 +0300)]
Win32: enabled both select and poll on Windows by default.

Since we now have both select and poll on Windows, it is enough to
do not set EVENT_FOUND, auto/modules will enable both automatically.

7 years agoWin32: added WSAPoll() support.
Maxim Dounin [Thu, 24 Jan 2019 18:51:21 +0000 (21:51 +0300)]
Win32: added WSAPoll() support.

WSAPoll() is only available with Windows Vista and newer (and only
available during compilation if _WIN32_WINNT >= 0x0600).  To make
sure the code works with Windows XP, we do not redefine _WIN32_WINNT,
but instead load WSAPoll() dynamically if it is not available during
compilation.

Also, sockets are not guaranteed to be small integers on Windows.
So an index array is used instead of NGX_USE_FD_EVENT to map
events to connections.

7 years agoWin32: properly enabled select on Windows.
Maxim Dounin [Thu, 24 Jan 2019 18:51:00 +0000 (21:51 +0300)]
Win32: properly enabled select on Windows.

Previously, select was compiled in by default, but the NGX_HAVE_SELECT
macro was not set, resulting in iocp being used by default unless
the "--with-select_module" configure option was explicitly specified.
Since the iocp module is not finished and does not work properly, this
effectively meant that the "--with-select_module" option was mandatory.

With the change NGX_HAVE_SELECT is properly set, making "--with-select_module"
optional.  Accordingly, it is removed from misc/GNUmakefile win32 target.

7 years agoEvents: fixed copying of old events in poll init.
Maxim Dounin [Thu, 24 Jan 2019 18:50:37 +0000 (21:50 +0300)]
Events: fixed copying of old events in poll init.

Previously, the code incorrectly assumed "ngx_event_t *" elements
instead of "struct pollfd".

This is mostly cosmetic change, as this code is never called now.

7 years agoStream: do not split datagrams when limiting proxy rate.
Roman Arutyunyan [Thu, 27 Dec 2018 16:37:34 +0000 (19:37 +0300)]
Stream: do not split datagrams when limiting proxy rate.

Previously, when using proxy_upload_rate and proxy_download_rate, the buffer
size for reading from a socket could be reduced as a result of rate limiting.
For connection-oriented protocols this behavior is normal since unread data will
normally be read at the next iteration.  But for datagram-oriented protocols
this is not the case, and unread part of the datagram is lost.

Now buffer size is not limited for datagrams.  Rate limiting still works in this
case by delaying the next reading event.

7 years agoPrevented scheduling events on a shared connection.
Roman Arutyunyan [Mon, 14 Jan 2019 17:36:23 +0000 (20:36 +0300)]
Prevented scheduling events on a shared connection.

A shared connection does not own its file descriptor, which means that
ngx_handle_read_event/ngx_handle_write_event calls should do nothing for it.
Currently the c->shared flag is checked in several places in the stream proxy
module prior to calling these functions.  However it was not done everywhere.
Missing checks could lead to calling
ngx_handle_read_event/ngx_handle_write_event on shared connections.

The problem manifested itself when using proxy_upload_rate and resulted in
either duplicate file descriptor error (e.g. with epoll) or incorrect further
udp packet processing (e.g. with kqueue).

The fix is to set and reset the event active flag in a way that prevents
ngx_handle_read_event/ngx_handle_write_event from scheduling socket events.

7 years agoAdded the ngx_http_test_required_predicates() function.
Vladimir Homutov [Thu, 17 Jan 2019 11:31:04 +0000 (14:31 +0300)]
Added the ngx_http_test_required_predicates() function.

In contrast to ngx_http_test_predicates(), it requires all values to be
non-empty and not equal to "0".

7 years agoVersion bump.
Vladimir Homutov [Thu, 17 Jan 2019 11:31:01 +0000 (14:31 +0300)]
Version bump.

7 years agorelease-1.15.8 tag
Maxim Dounin [Tue, 25 Dec 2018 14:53:03 +0000 (17:53 +0300)]
release-1.15.8 tag

7 years agonginx-1.15.8-RELEASE release-1.15.8
Maxim Dounin [Tue, 25 Dec 2018 14:53:03 +0000 (17:53 +0300)]
nginx-1.15.8-RELEASE

7 years agoAutoindex: fixed possible integer overflow on 32-bit systems.
Vladimir Homutov [Tue, 25 Dec 2018 09:59:24 +0000 (12:59 +0300)]
Autoindex: fixed possible integer overflow on 32-bit systems.

7 years agoContrib: vim syntax, update core and 3rd party module directives.
Gena Makhomed [Mon, 24 Dec 2018 14:30:10 +0000 (16:30 +0200)]
Contrib: vim syntax, update core and 3rd party module directives.

7 years agoWin32: removed NGX_DIR_MASK concept.
Maxim Dounin [Mon, 24 Dec 2018 18:07:05 +0000 (21:07 +0300)]
Win32: removed NGX_DIR_MASK concept.

Previous interface of ngx_open_dir() assumed that passed directory name
has a room for NGX_DIR_MASK at the end (NGX_DIR_MASK_LEN bytes).  While all
direct users of ngx_dir_open() followed this interface, this also implied
similar requirements for indirect uses - in particular, via ngx_walk_tree().

Currently none of ngx_walk_tree() uses provides appropriate space, and
fixing this does not look like a right way to go.  Instead, ngx_dir_open()
interface was changed to not require any additional space and use
appropriate allocations instead.

7 years agoUserid: using stub for AF_UNIX addresses.
Sergey Kandaurov [Mon, 24 Dec 2018 16:55:00 +0000 (19:55 +0300)]
Userid: using stub for AF_UNIX addresses.

Previously, AF_UNIX addresses misbehaved as AF_INET, which typically resulted
in $uid_set composed from the middle of sun_path.

7 years agoSSL: avoid reading on pending SSL_write_early_data().
Sergey Kandaurov [Tue, 18 Dec 2018 12:15:15 +0000 (15:15 +0300)]
SSL: avoid reading on pending SSL_write_early_data().

If SSL_write_early_data() returned SSL_ERROR_WANT_WRITE, stop further reading
using a newly introduced c->ssl->write_blocked flag, as otherwise this would
result in SSL error "ssl3_write_bytes:bad length".  Eventually, normal reading
will be restored by read event posted from successful SSL_write_early_data().

While here, place "SSL_write_early_data: want write" debug on the path.

7 years agoGeo: fixed handling of AF_UNIX client addresses (ticket #1684).
Maxim Dounin [Fri, 14 Dec 2018 15:11:06 +0000 (18:11 +0300)]
Geo: fixed handling of AF_UNIX client addresses (ticket #1684).

Previously, AF_UNIX client addresses were handled as AF_INET, leading
to unexpected results.

7 years agoUpstream: implemented $upstream_bytes_sent.
Ruslan Ermilov [Thu, 13 Dec 2018 14:23:07 +0000 (17:23 +0300)]
Upstream: implemented $upstream_bytes_sent.

7 years agoResolver: report SRV resolve failure if all A resolves failed.
Roman Arutyunyan [Tue, 11 Dec 2018 16:41:22 +0000 (19:41 +0300)]
Resolver: report SRV resolve failure if all A resolves failed.

Previously, if an SRV record was successfully resolved, but all of its A
records failed to resolve, NXDOMAIN was returned to the caller, which is
considered a successful resolve rather than an error.  This could result in
losing the result of a previous successful resolve by the caller.

Now NXDOMAIN is only returned if at least one A resolve completed with this
code.  Otherwise the error state of the first A resolve is returned.

7 years agoCopy regex unnamed captures to cloned subrequests.
Roman Arutyunyan [Tue, 11 Dec 2018 10:09:00 +0000 (13:09 +0300)]
Copy regex unnamed captures to cloned subrequests.

Previously, unnamed regex captures matched in the parent request, were not
available in a cloned subrequest.  Now 3 fields related to unnamed captures
are copied to a cloned subrequest: r->ncaptures, r->captures and
r->captures_data.  Since r->captures cannot be changed by either request after
creating a clone, a new flag r->realloc_captures is introduced to force
reallocation of r->captures.

The issue was reported as a proxy_cache_background_update misbehavior in
http://mailman.nginx.org/pipermail/nginx/2018-December/057251.html.

7 years agoVersion bump.
Roman Arutyunyan [Tue, 11 Dec 2018 10:12:35 +0000 (13:12 +0300)]
Version bump.

7 years agorelease-1.15.7 tag
Maxim Dounin [Tue, 27 Nov 2018 14:40:21 +0000 (17:40 +0300)]
release-1.15.7 tag

7 years agonginx-1.15.7-RELEASE release-1.15.7
Maxim Dounin [Tue, 27 Nov 2018 14:40:20 +0000 (17:40 +0300)]
nginx-1.15.7-RELEASE

7 years agoUpdated OpenSSL used for win32 builds.
Maxim Dounin [Tue, 27 Nov 2018 14:02:56 +0000 (17:02 +0300)]
Updated OpenSSL used for win32 builds.

7 years agoNegative size buffers detection.
Maxim Dounin [Mon, 26 Nov 2018 15:29:56 +0000 (18:29 +0300)]
Negative size buffers detection.

In the past, there were several security issues which resulted in
worker process memory disclosure due to buffers with negative size.
It looks reasonable to check for such buffers in various places,
much like we already check for zero size buffers.

While here, removed "#if 1 / #endif" around zero size buffer checks.
It looks highly unlikely that we'll disable these checks anytime soon.

7 years agoMp4: fixed possible pointer overflow on 32-bit platforms.
Maxim Dounin [Wed, 21 Nov 2018 17:23:16 +0000 (20:23 +0300)]
Mp4: fixed possible pointer overflow on 32-bit platforms.

On 32-bit platforms mp4->buffer_pos might overflow when a large
enough (close to 4 gigabytes) atom is being skipped, resulting in
incorrect memory addesses being read further in the code.  In most
cases this results in harmless errors being logged, though may also
result in a segmentation fault if hitting unmapped pages.

To address this, ngx_mp4_atom_next() now only increments mp4->buffer_pos
up to mp4->buffer_end.  This ensures that overflow cannot happen.

7 years agoLimit req: "delay=" parameter.
Maxim Dounin [Wed, 21 Nov 2018 15:56:50 +0000 (18:56 +0300)]
Limit req: "delay=" parameter.

This parameter specifies an additional "soft" burst limit at which requests
become delayed (but not yet rejected as it happens if "burst=" limit is
exceeded).  Defaults to 0, i.e., all excess requests are delayed.

Originally inspired by Vladislav Shabanov
(http://mailman.nginx.org/pipermail/nginx-devel/2016-April/008126.html).
Further improved based on a patch by Peter Shchuchkin
(http://mailman.nginx.org/pipermail/nginx-devel/2018-October/011522.html).

7 years agoLimit req: fixed error message wording.
Maxim Dounin [Wed, 21 Nov 2018 15:56:44 +0000 (18:56 +0300)]
Limit req: fixed error message wording.

7 years agoUpstream: revised upstream response time variables.
Vladimir Homutov [Wed, 21 Nov 2018 10:40:40 +0000 (13:40 +0300)]
Upstream: revised upstream response time variables.

Variables now do not depend on presence of the HTTP status code in response.
If the corresponding event occurred, variables contain time between request
creation and the event, and "-" otherwise.

Previously, intermediate value of the $upstream_response_time variable held
unix timestamp.

7 years agoUpstream: removed unused ngx_http_upstream_t.timeout field.
Vladimir Homutov [Wed, 21 Nov 2018 10:40:36 +0000 (13:40 +0300)]
Upstream: removed unused ngx_http_upstream_t.timeout field.

7 years agoCore: ngx_explicit_memzero().
Maxim Dounin [Thu, 15 Nov 2018 18:28:02 +0000 (21:28 +0300)]
Core: ngx_explicit_memzero().

7 years agoCore: free shared memory on cycle initialization failure.
Ruslan Ermilov [Thu, 15 Nov 2018 12:28:54 +0000 (15:28 +0300)]
Core: free shared memory on cycle initialization failure.

7 years agoStream: proxy_requests directive.
Vladimir Homutov [Mon, 12 Nov 2018 13:29:30 +0000 (16:29 +0300)]
Stream: proxy_requests directive.

The directive allows to drop binding between a client and existing UDP stream
session after receiving a specified number of packets.  First packet from the
same client address and port will start a new session.  Old session continues
to exist and will terminate at moment defined by configuration: either after
receiving the expected number of responses, or after timeout, as specified by
the "proxy_responses" and/or "proxy_timeout" directives.

By default, proxy_requests is zero (disabled).

7 years agoStream: session completion check code moved to a separate function.
Vladimir Homutov [Mon, 12 Nov 2018 09:05:03 +0000 (12:05 +0300)]
Stream: session completion check code moved to a separate function.

The code refactored to simplify the ngx_stream_proxy_process() function
and facilitate adding new session termination conditions.

7 years agoStream: fixed possible use of a freed connection.
Vladimir Homutov [Wed, 7 Nov 2018 10:22:14 +0000 (13:22 +0300)]
Stream: fixed possible use of a freed connection.

The session handler may result in session termination, thus a connection
pool (from which c->udp was allocated) may be destroyed.

7 years agoVersion bump.
Vladimir Homutov [Tue, 13 Nov 2018 11:42:47 +0000 (14:42 +0300)]
Version bump.

7 years agorelease-1.15.6 tag
Maxim Dounin [Tue, 6 Nov 2018 13:32:09 +0000 (16:32 +0300)]
release-1.15.6 tag

7 years agonginx-1.15.6-RELEASE release-1.15.6
Maxim Dounin [Tue, 6 Nov 2018 13:32:08 +0000 (16:32 +0300)]
nginx-1.15.6-RELEASE

7 years agogRPC: limited allocations due to ping and settings frames.
Maxim Dounin [Tue, 6 Nov 2018 13:29:59 +0000 (16:29 +0300)]
gRPC: limited allocations due to ping and settings frames.

7 years agoHTTP/2: limit the number of idle state switches.
Ruslan Ermilov [Tue, 6 Nov 2018 13:29:49 +0000 (16:29 +0300)]
HTTP/2: limit the number of idle state switches.

An attack that continuously switches HTTP/2 connection between
idle and active states can result in excessive CPU usage.
This is because when a connection switches to the idle state,
all of its memory pool caches are freed.

This change limits the maximum allowed number of idle state
switches to 10 * http2_max_requests (i.e., 10000 by default).
This limits possible CPU usage in one connection, and also
imposes a limit on the maximum lifetime of a connection.

Initially reported by Gal Goldshtein from F5 Networks.

7 years agoHTTP/2: flood detection.
Ruslan Ermilov [Tue, 6 Nov 2018 13:29:35 +0000 (16:29 +0300)]
HTTP/2: flood detection.

Fixed uncontrolled memory growth in case peer is flooding us with
some frames (e.g., SETTINGS and PING) and doesn't read data.  Fix
is to limit the number of allocated control frames.

7 years agoMp4: fixed reading 64-bit atoms.
Roman Arutyunyan [Tue, 6 Nov 2018 13:29:18 +0000 (16:29 +0300)]
Mp4: fixed reading 64-bit atoms.

Previously there was no validation for the size of a 64-bit atom
in an mp4 file.  This could lead to a CPU hog when the size is 0,
or various other problems due to integer underflow when calculating
atom data size, including segmentation fault or worker process
memory disclosure.

7 years agoCache: improved keys zone size error reporting.
Maxim Dounin [Wed, 31 Oct 2018 13:49:40 +0000 (16:49 +0300)]
Cache: improved keys zone size error reporting.

After this change, too small keys zones are explicitly reported as such,
much like in the other modules which use shared memory.

7 years agoCache: fixed minimum cache keys zone size limit.
Maxim Dounin [Wed, 31 Oct 2018 13:49:39 +0000 (16:49 +0300)]
Cache: fixed minimum cache keys zone size limit.

Size of a shared memory zones must be at least two pages - one page
for slab allocator internal data, and another page for actual allocations.
Using 8192 instead is wrong, as there are systems with page sizes other
than 4096.

Note well that two pages is usually too low as well.  In particular, cache
is likely to use two allocations of different sizes for global structures,
and at least four pages will be needed to properly allocate cache nodes.
Except in a few very special cases, with keys zone of just two pages nginx
won't be able to start.  Other uses of shared memory impose a limit
of 8 pages, which provides some room for global allocations.  This patch
doesn't try to address this though.

Inspired by ticket #1665.

7 years agoA minor code clean for macro ngx_event_get_conf in ngx_event.h.
chronolaw [Fri, 19 Oct 2018 05:50:36 +0000 (13:50 +0800)]
A minor code clean for macro ngx_event_get_conf in ngx_event.h.

7 years agoSSL: explicitly set maximum version (ticket #1654).
Maxim Dounin [Tue, 23 Oct 2018 19:11:48 +0000 (22:11 +0300)]
SSL: explicitly set maximum version (ticket #1654).

With maximum version explicitly set, TLSv1.3 will not be unexpectedly
enabled if nginx compiled with OpenSSL 1.1.0 (without TLSv1.3 support)
will be run with OpenSSL 1.1.1 (with TLSv1.3 support).

7 years agoUpstream: proxy_socket_keepalive and friends.
Vladimir Homutov [Wed, 3 Oct 2018 11:08:51 +0000 (14:08 +0300)]
Upstream: proxy_socket_keepalive and friends.

The directives enable the use of the SO_KEEPALIVE option on
upstream connections.  By default, the value is left unchanged.

7 years agoVersion bump.
Vladimir Homutov [Wed, 3 Oct 2018 14:02:44 +0000 (17:02 +0300)]
Version bump.