integrate upstream #25
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…epalive-options OpenBSD misses some TCP keepalive options
refactor(types): improve readability of `impl ToSql for &str`
Fix serialization of oidvector
Co-authored-by: Petros Angelatos <[email protected]>
Signed-off-by: Petros Angelatos <[email protected]>
benesch
approved these changes
Aug 21, 2024
Signed-off-by: Petros Angelatos <[email protected]>
Signed-off-by: Petros Angelatos <[email protected]>
Signed-off-by: Petros Angelatos <[email protected]>
When a connection is established, the added modes are treated in the same way as the existing `require` mode as they both require a TLS connection.
Adds additional SSL config params: - sslcert - sslkey - sslrootcert More details at https://www.postgresql.org/docs/9.5/libpq-connect.html#LIBPQ-CONNSTRING.
Signed-off-by: Petros Angelatos <[email protected]>
petrosagg
force-pushed
the
integrate-upstream
branch
2 times, most recently
from
0bd6209 to
f1abff6
Compare
This is often quite a bit more convenient than mucking with files on disk, as it allows the URL to be fully self contained.
petrosagg
force-pushed
the
integrate-upstream
branch
2 times, most recently
from
22901cc to
86991d0
Compare
So that clients can observe the ID of their connection without a network roundtrip.
petrosagg
force-pushed
the
integrate-upstream
branch
from
86991d0 to
900ed50
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This integration is a little bit unconventional in that it's not a single merge commit. The patches in our fork were interleaved between upstream commits and some times applied twice (no idea why) which makes it difficult to organize the repo for a potential upstreaming of the changes. So instead I first reverted everything we've done in our fork and brought the repo back to an old upstream state, then merged current master, and then re-applied all our changes fixing up and cleaning commits along the way.