From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5DF7815808B for ; Sun, 27 Mar 2022 22:08:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 03EF1E0876; Sun, 27 Mar 2022 22:08:30 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6C365E085E for ; Sun, 27 Mar 2022 22:08:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 45DDE3432BF for ; Sun, 27 Mar 2022 22:08:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B19CE339 for ; Sun, 27 Mar 2022 22:08:26 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1648418825.49b84e124ee3e7ef349e79dd0fa233fb5f6e305e.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-servers/apache/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-servers/apache/files/apache-2.4.51-mpm-itk.patch X-VCS-Directories: www-servers/apache/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 49b84e124ee3e7ef349e79dd0fa233fb5f6e305e X-VCS-Branch: master Date: Sun, 27 Mar 2022 22:08:26 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9b8201fa-5313-4c70-9794-cba9b7566106 X-Archives-Hash: 217a8933690bea29642f411a55aa3f50 commit: 49b84e124ee3e7ef349e79dd0fa233fb5f6e305e Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sun Mar 27 11:47:02 2022 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sun Mar 27 22:07:05 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49b84e12 www-servers/apache: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/24776 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Conrad Kostecki gentoo.org> .../apache/files/apache-2.4.51-mpm-itk.patch | 34 ---------------------- 1 file changed, 34 deletions(-) diff --git a/www-servers/apache/files/apache-2.4.51-mpm-itk.patch b/www-servers/apache/files/apache-2.4.51-mpm-itk.patch deleted file mode 100644 index 4d36fe03dffb..000000000000 --- a/www-servers/apache/files/apache-2.4.51-mpm-itk.patch +++ /dev/null @@ -1,34 +0,0 @@ -Backport of upstream r1894171 to fix segfaults with mpm-itk. - -https://bugs.gentoo.org/816258 -https://bz.apache.org/bugzilla/show_bug.cgi?id=65627 - ---- a/server/connection.c 2021/09/21 20:03:52 1893497 -+++ b/server/connection.c 2021/10/12 16:48:18 1894171 -@@ -145,9 +145,7 @@ - { - apr_socket_t *csd = ap_get_conn_socket(c); - -- if (!csd) { -- return 1; -- } -+ ap_assert(csd != NULL); - - if (ap_prep_lingering_close(c)) { - return 1; -@@ -178,6 +176,15 @@ - apr_time_t now, timeup = 0; - apr_socket_t *csd = ap_get_conn_socket(c); - -+ if (!csd) { -+ /* Be safe with third-party modules that: -+ * ap_set_core_module_config(c->conn_config, NULL) -+ * to no-op ap_lingering_close(). -+ */ -+ c->aborted = 1; -+ return; -+ } -+ - if (ap_start_lingering_close(c)) { - apr_socket_close(csd); - return;