Skip to content

[fix](thirdparty) patch libevent to enable keepalive on tcp #36026

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.

Sign up for GitHub

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

Merged
dataroaring merged 1 commit into from
Jun 10, 2024
Merged

[fix](thirdparty) patch libevent to enable keepalive on tcp #36026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions thirdparty/download-thirdparty.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,8 @@ if [[ " ${TP_ARCHIVES[*]} " =~ " LIBEVENT " ]]; then
cd "${TP_SOURCE_DIR}/${LIBEVENT_SOURCE}"
if [[ ! -f "${PATCHED_MARK}" ]]; then
patch -p1 <"${TP_PATCH_DIR}/libevent.patch"
patch -p1 <"${TP_PATCH_DIR}/libevent-1532.patch"
patch -p1 <"${TP_PATCH_DIR}/libevent-keepalive-accepted-socket.patch"
touch "${PATCHED_MARK}"
fi
cd -
Expand Down
12 changes: 0 additions & 12 deletions thirdparty/patches/libevent-1532.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,15 +186,3 @@ index 02aa7ba..688b641 100644
#ifdef _WIN32
/** Return the most recent socket error. Not idempotent on all platforms. */
#define EVUTIL_SOCKET_ERROR() WSAGetLastError()
diff --git a/listener.c b/listener.c
index f5c00c9..424b28c 100644
--- a/listener.c
+++ b/listener.c
@@ -214,7 +214,6 @@ evconnlistener_new_bind(struct event_base *base, evconnlistener_cb cb,
{
struct evconnlistener *listener;
evutil_socket_t fd;
- int on = 1;
int family = sa ? sa->sa_family : AF_UNSPEC;
int socktype = SOCK_STREAM | EVUTIL_SOCK_NONBLOCK;

4 changes: 2 additions & 2 deletions ...nt-enable_keepalive_accepted_socket.patch → .../libevent-keepalive-accepted-socket.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/http.c b/http.c
index 53951cb..85d4d67 100644
index 1ad60f8..267fa1f 100644
--- a/http.c
+++ b/http.c
@@ -4265,6 +4265,12 @@ evhttp_get_request_connection(
Expand All @@ -8,7 +8,7 @@ index 53951cb..85d4d67 100644

+ if (sa->sa_family != AF_UNIX) {
+ if (evutil_set_tcp_keepalive(fd, 1, 300) < 0) {
+ return (NULL)
+ return (NULL);
+ }
+ }
+
Expand Down