Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add DTRACE points to measure request timings. #11245

Merged
merged 18 commits into from
Mar 20, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/devel' into feature/dtrace
  • Loading branch information
neunhoef committed Mar 11, 2020
commit e50a20c4cc78336b504b044d503aae34acccc0a2
10 changes: 10 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,16 @@ devel

* Add DTRACE points to track a request through the infrastructure.

* Agency ttl bug fix

* Added the SNI feature for TLS. This means that one can configure multiple
server keys and certificate chains and the system dynamically uses
the right one depending on the value of the TLS servername extension.
This allows to use different TLS setups for the same server which is
reachable behind different DNS names, for example (enterprise only).

* Do not create a reboot tracker for empty serverId ubin sync repl.

* Fix the usage of the AQL functions `CALL` and `APPLY` for calling user-defined
AQL functions when invoking an AQL query from the arangosh or a client application.
Previously, invoking an AQL query and using the `CALL` or `APPLY` AQL functions
Expand Down
2 changes: 1 addition & 1 deletion arangod/GeneralServer/SslServerFeature.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ asio_ns::ssl::context SslServerFeature::createSslContextInternal(
sslContext.set_verify_mode(SSL_VERIFY_NONE);

if (_allowHttpProtocolNegotiation) {
SSL_CTX_set_alpn_select_cb(sslContext->native_handle(), alpn_select_proto_cb, NULL);
SSL_CTX_set_alpn_select_cb(sslContext.native_handle(), alpn_select_proto_cb, NULL);
}

return sslContext;
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.