diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-04-06 22:33:41 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-04-06 22:33:41 +0100 |
commit | e68d405c5d712af4387159df07e226217bdda049 (patch) | |
tree | 009ab0f3d427f0813e62930d71802cb054c07e30 /www-servers/apache/files | |
parent | 401101f9c8077911929d3f2b60a37098460a5d89 (diff) |
gentoo resync : 06.04.2022
Diffstat (limited to 'www-servers/apache/files')
-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; |