summaryrefslogtreecommitdiffhomepage
path: root/src/http (unfollow)
AgeCommit message (Collapse)AuthorFilesLines
2018-07-02Upstream: fixed tcp_nopush with gRPC.Maxim Dounin1-0/+12
With gRPC it is possible that a request sending is blocked due to flow control. Moreover, further sending might be only allowed once the backend sees all the data we've already sent. With such a backend it is required to clear the TCP_NOPUSH socket option to make sure all the data we've sent are actually delivered to the backend. As such, we now clear TCP_NOPUSH in ngx_http_upstream_send_request() also on NGX_AGAIN if c->write->ready is set. This fixes a test (which waits for all the 64k bytes as per initial window before allowing more bytes) with sendfile enabled when the body was written to a file in a different context.
2018-07-02Upstream: fixed unexpected tcp_nopush usage on peer connections.Maxim Dounin1-0/+4
Now tcp_nopush on peer connections is disabled if it is disabled on the client connection, similar to how we handle c->sendfile. Previously, tcp_nopush was always used on upstream connections, regardless of the "tcp_nopush" directive.
2018-07-02gRPC: clearing buffers in ngx_http_grpc_get_buf().Maxim Dounin1-11/+16
We copy input buffers to our buffers, so various flags might be unexpectedly set in buffers returned by ngx_chain_get_free_buf(). In particular, the b->in_file flag might be set when the body was written to a file in a different context. With sendfile enabled this in turn might result in protocol corruption if such a buffer was reused for a control frame. Make sure to clear buffers and set only fields we really need to be set.
2018-06-15Upstream: ngx_http_upstream_random module.Vladimir Homutov1-0/+502
The module implements random load-balancing algorithm with optional second choice. In the latter case, the best of two servers is chosen, accounting number of connections and server weight. Example: upstream u { random [two [least_conn]]; server 127.0.0.1:8080; server 127.0.0.1:8081; server 127.0.0.1:8082; server 127.0.0.1:8083; }
2018-06-14Upstream: improved peer selection concurrency for hash and ip_hash.Ruslan Ermilov2-2/+14
2018-06-13Upstream: disable body cleanup with preserve_output (ticket #1565).Maxim Dounin1-1/+2
With u->conf->preserve_output set the request body file might be used after the response header is sent, so avoid cleaning it. (Normally this is not a problem as u->conf->preserve_output is only set with r->request_body_no_buffering, but the request body might be already written to a file in a different context.)
2018-06-07HTTP/2: use scheme from original request for pushes (closes #1549).Ruslan Ermilov2-20/+19
Instead of the connection scheme, use scheme from the original request. This fixes pushes when SSL is terminated by a proxy server in front of nginx.
2018-06-07Added r->schema.Ruslan Ermilov4-9/+13
For HTTP/1, it keeps scheme from the absolute form of URI. For HTTP/2, the :scheme request pseudo-header field value.
2018-06-07Removed extraneous check while processing request line.Ruslan Ermilov1-1/+1
2018-06-07HTTP/2: validate client request scheme.Ruslan Ermilov1-0/+23
The scheme is validated as per RFC 3986, Section 3.1.
2018-05-24Allowed digits, '+', '-', and '.' in scheme names as per RFC 3986.Ruslan Ermilov1-0/+5
2018-05-30Limit req: improved handling of negative times.Maxim Dounin1-4/+25
Negative times can appear since workers only update time on an event loop iteration start. If a worker was blocked for a long time during an event loop iteration, it is possible that another worker already updated the time stored in the node. As such, time since last update of the node (ms) will be negative. Previous code used ngx_abs(ms) in the calculations. That is, negative times were effectively treated as positive ones. As a result, it was not possible to maintain high request rates, where the same node can be updated multiple times from during an event loop iteration. In particular, this affected setups with many SSL handshakes, see http://mailman.nginx.org/pipermail/nginx/2018-May/056291.html. Fix is to only update the last update time stored in the node if the new time is larger than previously stored one. If a future time is stored in the node, we preserve this time as is. To prevent breaking things on platforms without monotonic time available if system time is updated backwards, a safety limit of 60 seconds is used. If the time stored in the node is more than 60 seconds in the future, we assume that the time was changed backwards and update lr->last to the current time.
2018-05-07Silenced -Wcast-function-type warnings (closes #1546).Sergey Kandaurov6-13/+24
Cast to intermediate "void *" to lose compiler knowledge about the original type and pass the warning. This is not a real fix but rather a workaround. Found by gcc8.
2018-04-25SSL: deprecated the "ssl" directive.Ruslan Ermilov1-1/+6
2018-04-24SSL: detect "listen ... ssl" without certificates (ticket #178).Maxim Dounin4-14/+38
In mail and stream modules, no certificate provided is a fatal condition, much like with the "ssl" and "starttls" directives. In http, "listen ... ssl" can be used in a non-default server without certificates as long as there is a certificate in the default one, so missing certificate is only fatal for default servers.
2018-04-18Cache: fixed cache valid slot to reject incorrect statuses.Maxim Dounin1-1/+2
Previously, result of ngx_atoi() was assigned to an ngx_uint_t variable, and errors reported by ngx_atoi() became positive, so the following check in "status < 100" failed to catch them. This resulted in the configurations like "proxy_cache_valid 2xx 30s" being accepted as correct, while they in fact do nothing. Changing type to ngx_int_t fixes this, and such configurations are now properly rejected.
2018-04-05Upstream: fixed u->conf->preserve_output (ticket #1519).Maxim Dounin1-6/+12
Previously, ngx_http_upstream_process_header() might be called after we've finished reading response headers and switched to a different read event handler, leading to errors with gRPC proxying. Additionally, the u->conf->read_timeout timer might be re-armed during reading response headers (while this is expected to be a single timeout on reading the whole response header).
2018-04-03Upstream: fixed ngx_http_upstream_test_next() conditions.Maxim Dounin1-2/+18
Previously, ngx_http_upstream_test_next() used an outdated condition on whether it will be possible to switch to a different server or not. It did not take into account restrictions on non-idempotent requests, requests with non-buffered request body, and the next upstream timeout. For such requests, switching to the next upstream server was rejected later in ngx_http_upstream_next(), resulting in nginx own error page being returned instead of the original upstream response.
2018-03-22gRPC: fixed possible sign extension of error and setting_value.Maxim Dounin1-3/+3
All cases are harmless and should not happen on valid values, though can result in bad values being shown incorrectly in logs. Found by Coverity (CID 1430311, 1430312, 1430313).
2018-03-20gRPC: fixed missing state save in frame header parsing.Sergey Kandaurov1-0/+1
Previously, frame state wasn't saved if HEADERS frame payload that begins with header fragment was not received at once.
2018-03-19HTTP/2: improved frame info debugging.Ruslan Ermilov2-5/+8
2018-03-19gRPC: fixed parsing response headers split on CONTINUATION frames.Sergey Kandaurov1-2/+2
2018-03-19Fixed checking ngx_tcp_push() and ngx_tcp_nopush() return values.Ruslan Ermilov1-1/+1
No functional changes.
2018-03-19Upstream: fixed comments after 13f8dec720b5.Ruslan Ermilov3-6/+2
The fields "uri", "location", and "url" from ngx_http_upstream_conf_t moved to ngx_http_proxy_loc_conf_t and ngx_http_proxy_vars_t, reflect this change in create_loc_conf comments.
2018-03-17gRPC: special handling of "trailer only" responses.Maxim Dounin2-10/+16
The gRPC protocol makes a distinction between HEADERS frame with the END_STREAM flag set, and a HEADERS frame followed by an empty DATA frame with the END_STREAM flag. The latter is not permitted, and results in errors not being propagated through nginx. Instead, gRPC clients complain that "server closed the stream without sending trailers" (seen in grpc-go) or "13: Received RST_STREAM with error code 2" (seen in grpc-c). To fix this, nginx now returns HEADERS with the END_STREAM flag if the response length is known to be 0, and we are not expecting any trailer headers to be added. And the response length is explicitly set to 0 in the gRPC proxy if we see initial HEADERS frame with the END_STREAM flag set.
2018-03-17gRPC: special handling of the TE request header.Maxim Dounin3-2/+72
According to the gRPC protocol specification, the "TE" header is used to detect incompatible proxies, and at least grpc-c server rejects requests without "TE: trailers". To preserve the logic, we have to pass "TE: trailers" to the backend if and only if the original request contains "trailers" in the "TE" header. Note that no other TE values are allowed in HTTP/2, so we have to remove anything else.
2018-03-17The gRPC proxy module.Maxim Dounin1-0/+4571
The module allows passing requests to upstream gRPC servers. The module is built by default as long as HTTP/2 support is compiled in. Example configuration: grpc_pass 127.0.0.1:9000; Alternatively, the "grpc://" scheme can be used: grpc_pass grpc://127.0.0.1:9000; Keepalive support is available via the upstream keepalive module. Note that keepalive connections won't currently work with grpc-go as it fails to handle SETTINGS_HEADER_TABLE_SIZE. To use with SSL: grpc_pass grpcs://127.0.0.1:9000; SSL connections use ALPN "h2" when available. At least grpc-go works fine without ALPN, so if ALPN is not available we just establish a connection without it. Tested with grpc-c++ and grpc-go.
2018-03-17Upstream: u->conf->preserve_output flag.Maxim Dounin2-2/+5
The flag can be used to continue sending request body even after we've got a response from the backend. In particular, this is needed for gRPC proxying of bidirectional streaming RPCs, and also to send control frames in other forms of RPCs.
2018-03-17Upstream: u->request_body_blocked flag.Maxim Dounin2-2/+20
The flag indicates whether last ngx_output_chain() returned NGX_AGAIN or not. If the flag is set, we arm the u->conf->send_timeout timer. The flag complements c->write->ready test, and allows to stop sending the request body in an output filter due to protocol-specific flow control.
2018-03-17Upstream: trailers support, u->conf->pass_trailers flag.Maxim Dounin2-0/+98
Basic trailer headers support allows one to access response trailers via the $upstream_trailer_* variables. Additionally, the u->conf->pass_trailers flag was introduced. When the flag is set, trailer headers from the upstream response are passed to the client. Like normal headers, trailer headers will be hidden if present in u->conf->hide_headers_hash.
2018-03-17HTTP/2: externalized various constants and interfaces.Maxim Dounin5-91/+129
2018-03-07Improved code readablity.Ruslan Ermilov1-2/+6
No functional changes.
2018-03-05HTTP/2: unknown frames now logged at info level.Maxim Dounin1-2/+2
2018-03-01Access log: support for disabling escaping (ticket #1450).Vladimir Homutov1-8/+60
Based on patches by Johannes Baiter <johannes.baiter@bsb-muenchen.de> and Calin Don.
2018-03-01Postpone filter: prevented uninitialized r->out.Roman Arutyunyan1-5/+5
The r->out chain link could be left uninitialized in case of error. A segfault could happen if the subrequest handler accessed it. The issue was introduced in commit 20f139e9ffa8.
2018-02-28Generic subrequests in memory.Roman Arutyunyan7-188/+107
Previously, only the upstream response body could be accessed with the NGX_HTTP_SUBREQUEST_IN_MEMORY feature. Now any response body from a subrequest can be saved in a memory buffer. It is available as a single buffer in r->out and the buffer size is configured by the subrequest_output_buffer_size directive. Upstream, proxy and fastcgi code used to handle the old-style feature is removed.
2018-02-22Modules compatibility: additional upstream metrics.Vladimir Homutov1-0/+1
2018-02-26Auth basic: prevent null character in error log (ticket #1494).Vadim Filimonov1-2/+2
2018-02-22HTTP/2: style.Ruslan Ermilov1-17/+4
Unified the style of validity checks in ngx_http_v2_validate_header().
2018-02-21Geo: optimized configuration parser.Ruslan Ermilov1-1/+5
If the geo block parser has failed, doing more things is pointless.
2018-02-21Geo: fixed memory allocation error handling (closes #1482).Ruslan Ermilov1-11/+16
If during configuration parsing of the geo directive the memory allocation has failed, pool used to parse configuration inside the block, and sometimes the temporary pool were not destroyed.
2018-02-15HTTP/2: precalculate hash for "Cookie".Maxim Dounin1-1/+2
There is no need to calculate hashes of static strings at runtime. The ngx_hash() macro can be used to do it during compilation instead, similarly to how it is done in ngx_http_proxy_module.c for "Server" and "Date" headers.
2018-02-15HTTP/2: fixed ngx_http_v2_push_stream() allocation error handling.Ruslan Ermilov1-15/+47
In particular, if a stream object allocation failed, and a client sent the PRIORITY frame for this stream, ngx_http_v2_set_dependency() could dereference a null pointer while trying to re-parent a dependency node.
2018-02-15HTTP/2: push additional request headers (closes #1478).Ruslan Ermilov3-94/+214
The Accept-Encoding, Accept-Language, and User-Agent header fields are now copied from the original request to pushed requests.
2018-02-15Expose more headers with NGX_HTTP_HEADERS.Ruslan Ermilov2-2/+2
2018-02-15HTTP/2: style.Sergey Kandaurov2-4/+4
2018-02-09HTTP/2: fixed null pointer dereference with server push.Ruslan Ermilov1-1/+5
r->headers_in.host can be NULL in ngx_http_v2_push_resource(). This happens when a request is terminated with 400 before the :authority or Host header is parsed, and either pushing is enabled on the server{} level or error_page 400 redirects to a location with pushes configured. Found by Coverity (CID 1429156).
2018-02-08HTTP/2: fixed build with -Werror=unused-but-set-variable.Ruslan Ermilov1-10/+3
2018-02-08HTTP/2: server push.Ruslan Ermilov5-18/+873
Resources to be pushed are configured with the "http2_push" directive. Also, preload links from the Link response headers, as described in https://www.w3.org/TR/preload/#server-push-http-2, can be pushed, if enabled with the "http2_push_preload" directive. Only relative URIs with absolute paths can be pushed. The number of concurrent pushes is normally limited by a client, but cannot exceed a hard limit set by the "http2_max_concurrent_pushes" directive.
2018-02-08HTTP/2: changed prototypes of request pseudo-headers parsers.Ruslan Ermilov1-25/+24
No functional changes.