[fix](thirdparty) patch libevent to enable keepalive on tcp (apache#3…

…6026) Followup apache#35805, fix patch issue and compile issue of libevent
dataroaring · Jun 11, 2024 · 93e84a5 · 93e84a5
1 parent eb2df00
commit 93e84a5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/thirdparty/download-thirdparty.sh b/thirdparty/download-thirdparty.sh
@@ -252,6 +252,8 @@ echo "Finished patching ${MYSQL_SOURCE}"
 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 -

diff --git a/thirdparty/patches/libevent-1532.patch b/thirdparty/patches/libevent-1532.patch
@@ -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;
-
diff --git a/...nt-enable_keepalive_accepted_socket.patch → .../libevent-keepalive-accepted-socket.patch b/...nt-enable_keepalive_accepted_socket.patch → .../libevent-keepalive-accepted-socket.patch
@@ -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(
@@ -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);
 +		}
 +	}
 +