]> git.kaiwu.me - nginx.git/log
nginx.git
6 years agoVersion bump.
Vladimir Homutov [Mon, 30 Sep 2019 13:43:16 +0000 (16:43 +0300)]
Version bump.

6 years agorelease-1.17.4 tag
Maxim Dounin [Tue, 24 Sep 2019 15:08:48 +0000 (18:08 +0300)]
release-1.17.4 tag

6 years agonginx-1.17.4-RELEASE release-1.17.4
Maxim Dounin [Tue, 24 Sep 2019 15:08:48 +0000 (18:08 +0300)]
nginx-1.17.4-RELEASE

6 years agoUpdated OpenSSL used for win32 builds.
Maxim Dounin [Tue, 24 Sep 2019 13:30:03 +0000 (16:30 +0300)]
Updated OpenSSL used for win32 builds.

6 years agoHTTP/2: fixed worker_shutdown_timeout.
Ruslan Ermilov [Mon, 23 Sep 2019 12:45:36 +0000 (15:45 +0300)]
HTTP/2: fixed worker_shutdown_timeout.

6 years agoHTTP/2: fixed possible alert about left open socket on shutdown.
Ruslan Ermilov [Mon, 23 Sep 2019 12:45:32 +0000 (15:45 +0300)]
HTTP/2: fixed possible alert about left open socket on shutdown.

This could happen when graceful shutdown configured by worker_shutdown_timeout
times out and is then followed by another timeout such as proxy_read_timeout.
In this case, the HEADERS frame is added to the output queue, but attempt to
send it fails (due to c->error forcibly set during graceful shutdown timeout).
This triggers request finalization which attempts to close the stream.  But the
stream cannot be closed because there is a frame in the output queue, and the
connection cannot be finalized.  This leaves the connection open without any
timer events leading to alert.

The fix is to post write event when sending output queue fails on c->error.
That will finalize the connection.

6 years agoHTTP/2: traffic-based flood detection.
Maxim Dounin [Wed, 18 Sep 2019 17:28:12 +0000 (20:28 +0300)]
HTTP/2: traffic-based flood detection.

With this patch, all traffic over an HTTP/2 connection is counted in
the h2c->total_bytes field, and payload traffic is counted in
the h2c->payload_bytes field.  As long as total traffic is many times
larger than payload traffic, we consider this to be a flood.

6 years agoHTTP/2: switched back to RST_STREAM with NO_ERROR.
Maxim Dounin [Wed, 18 Sep 2019 17:28:09 +0000 (20:28 +0300)]
HTTP/2: switched back to RST_STREAM with NO_ERROR.

In 8df664ebe037, we've switched to maximizing stream window instead
of sending RST_STREAM.  Since then handling of RST_STREAM with NO_ERROR
was fixed at least in Chrome, hence we switch back to using RST_STREAM.

This allows more effective rejecting of large bodies, and also minimizes
non-payload traffic to be accounted in the next patch.

6 years agoSSL: fixed ssl_verify_client error message.
Sergey Kandaurov [Mon, 16 Sep 2019 16:26:42 +0000 (19:26 +0300)]
SSL: fixed ssl_verify_client error message.

6 years agoResolver: fixed possible use-after-free while resolving PTR.
Sergey Kandaurov [Tue, 10 Sep 2019 12:42:34 +0000 (15:42 +0300)]
Resolver: fixed possible use-after-free while resolving PTR.

Previously, if a response to the PTR request was cached, and ngx_resolver_dup()
failed to allocate memory for the resulting name, then the original node was
freed but left in expire_queue.  A subsequent address resolving would end up
in a use-after-free memory access of the node either in ngx_resolver_expire()
or ngx_resolver_process_ptr(), when accessing it through expire_queue.

The fix is to leave the resolver node intact.

6 years agoHTTP/2: close connection on zero WINDOW_UPDATE.
Ruslan Ermilov [Tue, 10 Sep 2019 12:33:38 +0000 (15:33 +0300)]
HTTP/2: close connection on zero WINDOW_UPDATE.

Don't waste server resources by sending RST_STREAM frames.  Instead,
reject WINDOW_UPDATE frames with invalid zero increment by closing
connection with PROTOCOL_ERROR.

6 years agoHTTP/2: close connection on frames with self-dependency.
Ruslan Ermilov [Tue, 10 Sep 2019 12:33:37 +0000 (15:33 +0300)]
HTTP/2: close connection on frames with self-dependency.

Don't waste server resources by sending RST_STREAM frames.  Instead,
reject HEADERS and PRIORITY frames with self-dependency by closing
connection with PROTOCOL_ERROR.

6 years agoFixed "return" with discarding invalid chunked body.
Sergey Kandaurov [Wed, 4 Sep 2019 10:33:51 +0000 (13:33 +0300)]
Fixed "return" with discarding invalid chunked body.

When ngx_http_discard_request_body() call was added to ngx_http_send_response(),
there were no return codes other than NGX_OK and NGX_HTTP_INTERNAL_SERVER_ERROR.
Now it can also return NGX_HTTP_BAD_REQUEST, but ngx_http_send_response() still
incorrectly transforms it to NGX_HTTP_INTERNAL_SERVER_ERROR.

The fix is to propagate ngx_http_discard_request_body() errors.

6 years agoDetect runaway chunks in ngx_http_parse_chunked().
Sergey Kandaurov [Tue, 3 Sep 2019 14:26:56 +0000 (17:26 +0300)]
Detect runaway chunks in ngx_http_parse_chunked().

As defined in HTTP/1.1, body chunks have the following ABNF:

   chunk = chunk-size [ chunk-ext ] CRLF chunk-data CRLF

where chunk-data is a sequence of chunk-size octets.

With this change, chunk-data that doesn't end up with CRLF at chunk-size
offset will be treated as invalid, such as in the example provided below:

4
SEE-THIS-AND-
4
THAT
0

6 years agoHTTP/2: discard remaining request body after redirect.
Sergey Kandaurov [Mon, 19 Aug 2019 12:16:06 +0000 (15:16 +0300)]
HTTP/2: discard remaining request body after redirect.

Previously, if unbuffered request body reading wasn't finished before
the request was redirected to a different location using error_page
or X-Accel-Redirect, and the request body is read again, this could
lead to disastrous effects, such as a duplicate post_handler call or
"http request count is zero" alert followed by a segmentation fault.

This happened in the following configuration (ticket #1819):

    location / {
        proxy_request_buffering off;
        proxy_pass http://bad;
        proxy_intercept_errors on;
        error_page 502 = /error;
    }

    location /error {
        proxy_pass http://backend;
    }

6 years agoSSL: lowered log level for WSAECONNABORTED errors on Windows.
Maxim Dounin [Fri, 16 Aug 2019 15:16:21 +0000 (18:16 +0300)]
SSL: lowered log level for WSAECONNABORTED errors on Windows.

Winsock uses ECONNABORTED instead of ECONNRESET in some cases.
For non-SSL connections this is already handled since baad3036086e.

Reported at
http://mailman.nginx.org/pipermail/nginx-ru/2019-August/062363.html.

6 years agoVersion bump.
Maxim Dounin [Fri, 16 Aug 2019 15:16:14 +0000 (18:16 +0300)]
Version bump.

6 years agorelease-1.17.3 tag
Maxim Dounin [Tue, 13 Aug 2019 12:45:57 +0000 (15:45 +0300)]
release-1.17.3 tag

6 years agonginx-1.17.3-RELEASE release-1.17.3
Maxim Dounin [Tue, 13 Aug 2019 12:45:56 +0000 (15:45 +0300)]
nginx-1.17.3-RELEASE

6 years agoHTTP/2: limited number of PRIORITY frames.
Ruslan Ermilov [Tue, 13 Aug 2019 12:43:40 +0000 (15:43 +0300)]
HTTP/2: limited number of PRIORITY frames.

Fixed excessive CPU usage caused by a peer that continuously shuffles
priority of streams.  Fix is to limit the number of PRIORITY frames.

6 years agoHTTP/2: limited number of DATA frames.
Ruslan Ermilov [Tue, 13 Aug 2019 12:43:36 +0000 (15:43 +0300)]
HTTP/2: limited number of DATA frames.

Fixed excessive memory growth and CPU usage if stream windows are
manipulated in a way that results in generating many small DATA frames.
Fix is to limit the number of simultaneously allocated DATA frames.

6 years agoHTTP/2: reject zero length headers with PROTOCOL_ERROR.
Sergey Kandaurov [Tue, 13 Aug 2019 12:43:32 +0000 (15:43 +0300)]
HTTP/2: reject zero length headers with PROTOCOL_ERROR.

Fixed uncontrolled memory growth if peer sends a stream of
headers with a 0-length header name and 0-length header value.
Fix is to reject headers with zero name length.

6 years agoMail: fixed duplicate resolving.
Maxim Dounin [Thu, 1 Aug 2019 10:50:07 +0000 (13:50 +0300)]
Mail: fixed duplicate resolving.

When using SMTP with SSL and resolver, read events might be enabled
during address resolving, leading to duplicate ngx_mail_ssl_handshake_handler()
calls if something arrives from the client, and duplicate session
initialization - including starting another resolving.  This can lead
to a segmentation fault if the session is closed after first resolving
finished.  Fix is to block read events while resolving.

Reported by Robert Norris,
http://mailman.nginx.org/pipermail/nginx/2019-July/058204.html.

6 years agoGzip: fixed "zero size buf" alerts after ac5a741d39cf.
Maxim Dounin [Wed, 31 Jul 2019 14:29:00 +0000 (17:29 +0300)]
Gzip: fixed "zero size buf" alerts after ac5a741d39cf.

After ac5a741d39cf it is now possible that after zstream.avail_out
reaches 0 and we allocate additional buffer, there will be no more data
to put into this buffer, triggering "zero size buf" alert.  Fix is to
reset b->temporary flag in this case.

Additionally, an optimization added to avoid allocating additional buffer
in this case, by checking if last deflate() call returned Z_STREAM_END.
Note that checking for Z_STREAM_END by itself is not enough to fix alerts,
as deflate() can return Z_STREAM_END without producing any output if the
buffer is smaller than gzip trailer.

Reported by Witold Filipczyk,
http://mailman.nginx.org/pipermail/nginx-devel/2019-July/012469.html.

6 years agoVersion bump.
Maxim Dounin [Wed, 31 Jul 2019 14:28:41 +0000 (17:28 +0300)]
Version bump.

6 years agorelease-1.17.2 tag
Maxim Dounin [Tue, 23 Jul 2019 12:01:47 +0000 (15:01 +0300)]
release-1.17.2 tag

6 years agonginx-1.17.2-RELEASE release-1.17.2
Maxim Dounin [Tue, 23 Jul 2019 12:01:47 +0000 (15:01 +0300)]
nginx-1.17.2-RELEASE

6 years agoCore: fixed memory leak on error, missed in c3f60d618c17.
Maxim Dounin [Fri, 19 Jul 2019 14:50:00 +0000 (17:50 +0300)]
Core: fixed memory leak on error, missed in c3f60d618c17.

Found by Coverity (CID 1451664).

6 years agoXslt: fixed potential buffer overflow with null character.
Maxim Dounin [Thu, 18 Jul 2019 15:27:54 +0000 (18:27 +0300)]
Xslt: fixed potential buffer overflow with null character.

Due to shortcomings of the ccv->zero flag implementation in complex value
interface, length of the resulting string from ngx_http_complex_value()
might either not include terminating null character or include it,
so the only safe way to work with the result is to use it as a
null-terminated string.

Reported by Patrick Wollgast.

6 years agoSSI: avoid potential buffer overflow.
Maxim Dounin [Thu, 18 Jul 2019 15:27:53 +0000 (18:27 +0300)]
SSI: avoid potential buffer overflow.

When "-" follows a parameter of maximum length, a single byte buffer
overflow happens, since the error branch does not check parameter length.
Fix is to avoid saving "-" to the parameter key, and instead use an error
message with "-" explicitly written.  The message is mostly identical to
one used in similar cases in the preequal state.

Reported by Patrick Wollgast.

6 years agoUpstream: fixed EOF handling in unbuffered and upgraded modes.
Maxim Dounin [Thu, 18 Jul 2019 15:27:52 +0000 (18:27 +0300)]
Upstream: fixed EOF handling in unbuffered and upgraded modes.

With level-triggered event methods it is important to specify
the NGX_CLOSE_EVENT flag to ngx_handle_read_event(), otherwise
the event won't be removed, resulting in CPU hog.

Reported by Patrick Wollgast.

6 years agoHTTP/2: return error on output on closed stream.
Maxim Dounin [Thu, 18 Jul 2019 15:27:50 +0000 (18:27 +0300)]
HTTP/2: return error on output on closed stream.

Without this, an (incorrect) output on a closed stream could result in
a socket leak.

6 years agoCore: fixed segfault with too large bucket sizes (ticket #1806).
Maxim Dounin [Thu, 18 Jul 2019 15:27:44 +0000 (18:27 +0300)]
Core: fixed segfault with too large bucket sizes (ticket #1806).

To save memory hash code uses u_short to store resulting bucket sizes,
so maximum bucket size is limited to 65536 minus ngx_cacheline_size (larger
values will be aligned to 65536 which will overflow u_short).  However,
there were no checks to enforce this, and using larger bucket sizes
resulted in overflows and segmentation faults.

Appropriate safety checks to enforce this added to ngx_hash_init().

6 years agoPerl: removed unused variable, forgotten in 975d7ab37b39.
Maxim Dounin [Wed, 17 Jul 2019 14:00:57 +0000 (17:00 +0300)]
Perl: removed unused variable, forgotten in 975d7ab37b39.

6 years agoGzip: use zlib to write header and trailer.
Ilya Leoshkevich [Fri, 12 Jul 2019 10:43:08 +0000 (12:43 +0200)]
Gzip: use zlib to write header and trailer.

When nginx is used with zlib patched with [1], which provides
integration with the future IBM Z hardware deflate acceleration, it ends
up computing CRC32 twice: one time in hardware, which always does this,
and one time in software by explicitly calling crc32().

crc32() calls were added in changesets 133:b27548f540ad ("nginx-0.0.1-
2003-09-24-23:51:12 import") and 134:d57c6835225c ("nginx-0.0.1-
2003-09-26-09:45:21 import") as part of gzip wrapping feature - back
then zlib did not support it.

However, since then gzip wrapping was implemented in zlib v1.2.0.4,
and it's already being used by nginx for log compression.

This patch replaces hand-written gzip wrapping with the one provided by
zlib. It simplifies the code, and makes it avoid computing CRC32 twice
when using hardware acceleration.

[1] https://github.com/madler/zlib/pull/410

6 years agoPerl: named locations in $r->internal_redirect().
Maxim Dounin [Fri, 12 Jul 2019 12:39:28 +0000 (15:39 +0300)]
Perl: named locations in $r->internal_redirect().

6 years agoPerl: expect escaped URIs in $r->internal_redirect().
Maxim Dounin [Fri, 12 Jul 2019 12:39:26 +0000 (15:39 +0300)]
Perl: expect escaped URIs in $r->internal_redirect().

Similarly to the change in 5491:74bfa803a5aa (1.5.9), we should accept
properly escaped URIs and unescape them as needed, else it is not possible
to handle URIs with question marks.

6 years agoPerl: additional ctx->header_sent checks.
Maxim Dounin [Fri, 12 Jul 2019 12:39:25 +0000 (15:39 +0300)]
Perl: additional ctx->header_sent checks.

As we now have ctx->header_sent flag, it is further used to prevent
duplicate $r->send_http_header() calls, prevent output before sending
header, and $r->internal_redirect() after sending header.

Further, $r->send_http_header() protected from calls after
$r->internal_redirect().

6 years agoPerl: avoid returning 500 if header was already sent.
Maxim Dounin [Fri, 12 Jul 2019 12:39:25 +0000 (15:39 +0300)]
Perl: avoid returning 500 if header was already sent.

Returning NGX_HTTP_INTERNAL_SERVER_ERROR if a perl code died after
sending header will lead to a "header already sent" alert.  To avoid
it, we now check if header was already sent, and return NGX_ERROR
instead if it was.

6 years agoPerl: avoid redirects on errors.
Maxim Dounin [Fri, 12 Jul 2019 12:38:27 +0000 (15:38 +0300)]
Perl: avoid redirects on errors.

Previously, redirects scheduled with $r->internal_redirect() were followed
even if the code then died.  Now these are ignored and nginx will return
an error instead.

6 years agoPerl: disabled unrelated calls from variable handlers.
Maxim Dounin [Fri, 12 Jul 2019 12:35:31 +0000 (15:35 +0300)]
Perl: disabled unrelated calls from variable handlers.

Variable handlers are not expected to send anything to the client, cannot
sleep or read body, and are not expected to modify the request.  Added
appropriate protection to prevent accidental foot shooting.

6 years agoPerl: protection against duplicate $r->sleep() calls.
Maxim Dounin [Fri, 12 Jul 2019 12:34:37 +0000 (15:34 +0300)]
Perl: protection against duplicate $r->sleep() calls.

Duplicate $r->sleep() and/or $r->has_request_body() calls result
in undefined behaviour (in practice, connection leaks were observed).
To prevent this, croak() added in appropriate places.

6 years agoPerl: handling of allocation errors.
Maxim Dounin [Fri, 12 Jul 2019 10:56:23 +0000 (13:56 +0300)]
Perl: handling of allocation errors.

Previously, allocation errors in nginx.xs were more or less ignored,
potentially resulting in incorrect code execution in specific low-memory
conditions.  This is changed to use ctx->error bit and croak(), similarly
to how output errors are now handled.

Note that this is mostly a cosmetic change, as Perl itself exits on memory
allocation errors, and hence nginx with Perl is hardly usable in low-memory
conditions.

6 years agoPerl: propagate errors.
Maxim Dounin [Fri, 12 Jul 2019 10:56:21 +0000 (13:56 +0300)]
Perl: propagate errors.

When an error happens, the ctx->error bit is now set, and croak()
is called to terminate further processing.  The ctx->error bit is
checked in ngx_http_perl_call_handler() to cancel further processing,
and is also checked in various output functions - to make sure these won't
be called if croak() was handled by an eval{} in perl code.

In particular, this ensures that output chain won't be called after
errors, as filters might not expect this to happen.  This fixes some
segmentation faults under low memory conditions.  Also this stops
request processing after filter finalization or request body reading
errors.

For cases where an HTTP error status can be additionally returned (for
example, 416 (Requested Range Not Satisfiable) from the range filter),
the ctx->status field is also added.

6 years agoPerl: reworked perl module to pass ctx instead of request.
Maxim Dounin [Fri, 12 Jul 2019 08:29:22 +0000 (11:29 +0300)]
Perl: reworked perl module to pass ctx instead of request.

This ensures that correct ctx is always available, including after
filter finalization.  In particular, this fixes a segmentation fault
with the following configuration:

    location / {
        image_filter test;

        perl 'sub {
            my $r = shift;
            $r->send_http_header();
            $r->print("foo\n");
            $r->print("bar\n");
        }';
    }

This also seems to be the only way to correctly handle filter finalization
in various complex cases, for example, when embedded perl is used both
in the original handler and in an error page called after filter
finalization.

6 years agoPerl: removed unneeded NGX_DONE test.
Maxim Dounin [Thu, 11 Jul 2019 20:20:08 +0000 (23:20 +0300)]
Perl: removed unneeded NGX_DONE test.

The NGX_DONE test in ngx_http_perl_handle_request() was introduced
in 1702:86bb52e28ce0, which also modified ngx_http_perl_call_handler()
to return NGX_DONE with c->destroyed.  The latter part was then
removed in 3050:f54b02dbb12b, so NGX_DONE test is no longer needed.

6 years agoContrib: vim syntax, update core and 3rd party module directives.
Gena Makhomed [Sun, 30 Jun 2019 07:39:01 +0000 (10:39 +0300)]
Contrib: vim syntax, update core and 3rd party module directives.

6 years agoTypo.
Maxim Dounin [Tue, 9 Jul 2019 13:03:25 +0000 (16:03 +0300)]
Typo.

6 years agoVersion bump.
Maxim Dounin [Tue, 9 Jul 2019 13:01:32 +0000 (16:01 +0300)]
Version bump.

6 years agorelease-1.17.1 tag
Maxim Dounin [Tue, 25 Jun 2019 12:19:45 +0000 (15:19 +0300)]
release-1.17.1 tag

6 years agonginx-1.17.1-RELEASE release-1.17.1
Maxim Dounin [Tue, 25 Jun 2019 12:19:45 +0000 (15:19 +0300)]
nginx-1.17.1-RELEASE

6 years agoUpdated OpenSSL used for win32 builds.
Maxim Dounin [Tue, 25 Jun 2019 01:47:43 +0000 (04:47 +0300)]
Updated OpenSSL used for win32 builds.

6 years agoPerl: disabled not_modified filter (ticket #1786).
Maxim Dounin [Mon, 17 Jun 2019 16:48:56 +0000 (19:48 +0300)]
Perl: disabled not_modified filter (ticket #1786).

Embedded perl does not set any request fields needed for conditional
requests processing.  Further, filter finalization in the not_modified
filter can cause segmentation faults due to cleared ctx as in
ticket #1786.

Before 5fb1e57c758a (1.7.3) the not_modified filter was implicitly disabled
for perl responses, as r->headers_out.last_modified_time was -1.  This
change restores this behaviour by using the explicit r->disable_not_modified
flag.

Note that this patch doesn't try to address perl module robustness against
filter finalization and other errors returned from filter chains.  It should
be eventually reworked to handle errors instead of ignoring them.

6 years agoLimit req: limit_req_dry_run directive.
Roman Arutyunyan [Wed, 5 Jun 2019 16:55:27 +0000 (19:55 +0300)]
Limit req: limit_req_dry_run directive.

A new directive limit_req_dry_run allows enabling the dry run mode.  In this
mode requests are neither rejected nor delayed, but reject/delay status is
logged as usual.

6 years agoUpstream: background cache update before cache send (ticket #1782).
Roman Arutyunyan [Mon, 3 Jun 2019 17:33:26 +0000 (20:33 +0300)]
Upstream: background cache update before cache send (ticket #1782).

In case of filter finalization, essential request fields like r->uri,
r->args etc could be changed, which affected the cache update subrequest.
Also, after filter finalization r->cache could be set to NULL, leading to
null pointer dereference in ngx_http_upstream_cache_background_update().
The fix is to create background cache update subrequest before sending the
cached response.

Since initial introduction in 1aeaae6e9446 (1.11.10) background cache update
subrequest was created after sending the cached response because otherwise it
blocked the parent request output.  In 9552758a786e (1.13.1) background
subrequests were introduced to eliminate the delay before sending the final
part of the cached response.  This also made it possible to create the
background cache update subrequest before sending the response.

Note that creating the subrequest earlier does not change the fact that in case
of filter finalization the background cache update subrequest will likely not
have enough time to successfully update the cache entry.  Filter finalization
leads to the main request termination as soon the current iteration of request
processing is complete.

6 years agoUpstream hash: fall back to round-robin if hash key is empty.
Niklas Keller [Thu, 23 May 2019 13:49:22 +0000 (16:49 +0300)]
Upstream hash: fall back to round-robin if hash key is empty.

6 years agoVersion bump.
Roman Arutyunyan [Mon, 27 May 2019 16:47:50 +0000 (19:47 +0300)]
Version bump.

6 years agorelease-1.17.0 tag
Maxim Dounin [Tue, 21 May 2019 14:23:57 +0000 (17:23 +0300)]
release-1.17.0 tag

6 years agonginx-1.17.0-RELEASE release-1.17.0
Maxim Dounin [Tue, 21 May 2019 14:23:57 +0000 (17:23 +0300)]
nginx-1.17.0-RELEASE

10 years agoSSL: removed OpenSSL 0.9.7 compatibility.
Sergey Kandaurov [Mon, 11 Apr 2016 12:46:36 +0000 (15:46 +0300)]
SSL: removed OpenSSL 0.9.7 compatibility.

7 years agoRange filter: fixed duplicate last buffers.
Maxim Dounin [Mon, 13 May 2019 19:44:49 +0000 (22:44 +0300)]
Range filter: fixed duplicate last buffers.

In ngx_http_range_singlepart_body() special buffers where passed
unmodified, including ones after the end of the range.  As such,
if the last buffer of a response was sent separately as a special
buffer, two buffers with b->last_buf set were present in the response.

In particular, this might result in a duplicate final chunk when using
chunked transfer encoding (normally range filter and chunked transfer
encoding are not used together, but this may happen if there are trailers
in the response).  This also likely to cause problems in HTTP/2.

Fix is to skip all special buffers after we've sent the last part of
the range requested.  These special buffers are not meaningful anyway,
since we set b->last_buf in the buffer with the last part of the range,
and everything is expected to be flushed due to it.

Additionally, ngx_http_next_body_filter() is now called even
if no buffers are to be passed to it.  This ensures that various
write events are properly propagated through the filter chain.  In
particular, this fixes test failures observed with the above change
and aio enabled.

7 years agoRange filter: fixed loss of incoming chain links.
Maxim Dounin [Mon, 13 May 2019 19:44:02 +0000 (22:44 +0300)]
Range filter: fixed loss of incoming chain links.

Filters are not allowed to change incoming chain links, and should allocate
their own links if any modifications are needed.  Nevertheless
ngx_http_range_singlepart_body() modified incoming chain links in some
cases, notably at the end of the requested range.

No problems caused by this are currently known, mostly because of
limited number of possible modifications and the position of the range
body filter in the filter chain.  Though this behaviour is clearly incorrect
and tests demonstrate that it can at least cause some proxy buffers being
lost when using proxy_force_ranges, leading to less effective handling
of responses.

Fix is to always allocate new chain links in ngx_http_range_singlepart_body().
Links are explicitly freed to ensure constant memory usage with long-lived
requests.

7 years agoUnconditional compilation of the postpone filter.
Roman Arutyunyan [Wed, 8 May 2019 16:22:13 +0000 (19:22 +0300)]
Unconditional compilation of the postpone filter.

Postpone filter is an essential part of subrequest functionality.  In absence
of it a subrequest response body is sent to the client out of order with
respect to the main request header and body, as well as other subrequests.
For in-memory subrequests the response is also sent to the client instead of
being stored in memory.

Currently the postpone filter is automatically enabled if one of the following
standard modules which are known to create subrequests is enabled: ssi, slice,
addition.  However a third-party module that creates subrequests can still be
built without the postpone filter or be dynamically loaded in nginx built
without it.

7 years agoVariables support in proxy_upload_rate and proxy_download_rate.
Ruslan Ermilov [Wed, 24 Apr 2019 13:38:56 +0000 (16:38 +0300)]
Variables support in proxy_upload_rate and proxy_download_rate.

7 years agoVariables support in limit_rate and limit_rate_after (ticket #293).
Ruslan Ermilov [Wed, 24 Apr 2019 13:38:54 +0000 (16:38 +0300)]
Variables support in limit_rate and limit_rate_after (ticket #293).

7 years agoAdded ngx_http_set_complex_value_size_slot().
Ruslan Ermilov [Wed, 24 Apr 2019 13:38:51 +0000 (16:38 +0300)]
Added ngx_http_set_complex_value_size_slot().

If a complex value is expected to be of type size_t, and the compiled
value is constant, the constant size_t value is remembered at compile
time.

The value is accessed through ngx_http_complex_value_size() which
either returns the remembered constant or evaluates the expression
and parses it as size_t.

7 years agoCore: enabled "include" in any context (ticket #1615).
Vladimir Homutov [Tue, 9 Apr 2019 08:40:20 +0000 (11:40 +0300)]
Core: enabled "include" in any context (ticket #1615).

7 years agoVersion bump.
Vladimir Homutov [Wed, 24 Apr 2019 10:41:29 +0000 (13:41 +0300)]
Version bump.

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.