diff options
Diffstat (limited to 'www-servers/apache')
-rw-r--r-- | www-servers/apache/Manifest | 1 | ||||
-rw-r--r-- | www-servers/apache/files/apache-2.4.51-mpm-itk.patch | 34 |
2 files changed, 0 insertions, 35 deletions
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest index f174f4ca0bf0..c48e4d230351 100644 --- a/www-servers/apache/Manifest +++ b/www-servers/apache/Manifest @@ -1,5 +1,4 @@ AUX 41_mod_http2.conf 189 BLAKE2B 70f006ead657b250bb4c30a332484baf698541d44d922453bae6133e2458a7009035156f47c1dbba42bd6830ab5bef8c56d151821b0b56e9b41ef9b3db885411 SHA512 3d56a24ea98bc3188e5d6f8e2e0148e4b718e04f23452e77750bca984c44fc7c3acd4521a945b4c415284d0a5dac0f7e846bb60daf70fe61ce2632e8fa201ed6 -AUX apache-2.4.51-mpm-itk.patch 890 BLAKE2B 882a0c92334a30c61733fe4acb314e6b25f6bd3f09fa92caf4ed29091e8e86132d184979f4b246cbb1f341aeaec309267c1313e806ea6ed0ba20b8b4981bdf4d SHA512 a15c7b53719b9a296053ae31ba0021ef6126ecab6b661229ac9bb5e448ddd8c870be004e71d328c9dbc8e8cbc70009278403b0329628acf10ba0fccb5d6bbe17 AUX apache.conf 55 BLAKE2B 05ab58ac12e51c7aa548a71a2da43bbf80e53ef8ebe7d143f698b118621f2af1498a1362e7f30b82dc12a96485652cb0c34248c290f6a1aab6a3f378d9843c2a SHA512 3a53beb7a283d17c14383f16ad14c0602681ac1b193cce8f5aca50ae9d9af3a71054ce4a9ab11cbcb72fe913459e1b306fd54660154e66afe10272f8c0f149f3 AUX apache2.2-hardened.service 970 BLAKE2B 77bf52cd0e5793aa81ad2b16267c1339e10fc4875704add053fd9ec67db60d2e175cb7a271c8d36b5e675a9cddd431062a6c31730510a921357b472383b502e4 SHA512 c206e7103d592dcf4f2d62979a20f7ab3cc7ce357ffe3c06ae8137064c812b9727e01a53fd602a0a55a64ed609664061de680ff42329381db787e2dae9310c48 DIST gentoo-apache-2.4.46-r6-20210212.tar.bz2 25854 BLAKE2B 001f16c1beac8c90fd407bb2f77417f886296baf02acf0f6d81dc0f10c209270db7005f58d845d309dec8332773556da88db41a57c6ecc86f24b8a5141ba07d0 SHA512 976dde952277542efca70831b67da32b8bf636a346adeeb6e0bc5a65b3543a7ca4fb182bc01204f747b583dd753607d184d91ef46a93d5e2f3ab55ed787860a2 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; |