Repository navigation
Carry the ClickHouse patches onto v3.13.0 - #7
Merged
thevar1able merged 2 commits intoSep 11, 2026
Merged
Conversation
This file contains hidden or 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
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.
Rebases the ClickHouse patches of
nats-ioonto upstream tagv3.13.0(78981ed5). Two commits are carried, cherry-picked with-xand keeping their original authors: "Merge pull request #2 from tchepavel/patch-1" (Alexey Milovidov — include<sys/socket.h>inn-unix.hon FreeBSD) and "Merge pull request #3 from tavplubix/fix_build_clang_15" (Ivan Blinkov — add<stdio.h>ton-unix.h, and includenatsp.hbefore<ctype.h>injs.candkv.cso_GNU_SOURCEis defined before the first system header). Both applied cleanly, with no conflicts.Two patches are dropped as obsolete. "Merge pull request #1 from tchepavel/main" (Alexey Milovidov) replaced libc
randwith an OpenSSLRAND_bytes-based_rand32;v3.13.0no longer callsrandinsrc/at all, usingnats_Rand64and a seeded CMWC generator instead. "Remove legacy OpenSSL API usage" (Konstantin Bogdanov) droppedERR_remove_thread_state,TLSv1_2_client_methodand theNATS_USE_OPENSSL_1_1branches, none of which exist upstream anymore. The remaining commits in the GitHub compare are upstreamrelease_3_9branch commits, not ClickHouse patches.Once merged, ClickHouse's
contrib/nats-iosubmodule is bumped to this branch head.