diff options
| author |   Michael Mair-Keimberger <mmk@levelnine.at> | 2022-03-27 13:47:02 +0200 |
|---|---|---|
| committer |   Conrad Kostecki <conikost@gentoo.org> | 2022-03-28 00:07:05 +0200 |
| commit | 49b84e124ee3e7ef349e79dd0fa233fb5f6e305e (patch) | |
| tree | 3f3b8b6a825e9081cd5b2897b5c8ed99de3139b1 | |
| parent | sys-libs/glibc: Rekeyword 2.35-r1 (diff) | |
| download | gentoo-49b84e124ee3e7ef349e79dd0fa233fb5f6e305e.tar.gz gentoo-49b84e124ee3e7ef349e79dd0fa233fb5f6e305e.tar.bz2 gentoo-49b84e124ee3e7ef349e79dd0fa233fb5f6e305e.zip | |
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 <mmk@levelnine.at>
Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
| -rw-r--r-- | www-servers/apache/files/apache-2.4.51-mpm-itk.patch | 34 |
1 files changed, 0 insertions, 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; |