diff options
author | V3n3RiX <venerix@koprulu.sector> | 2021-12-05 02:47:11 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2021-12-05 02:47:11 +0000 |
commit | 2771f79232c273bc2a57d23bf335dd81ccf6af28 (patch) | |
tree | c8af0fd04194aed03cf067d44e53c7edd3e9ab84 /www-servers/apache/files/apache-2.4.51-mpm-itk.patch | |
parent | e9d044d4b9b71200a96adfa280848858c0f468c9 (diff) |
gentoo resync : 05.12.2021
Diffstat (limited to 'www-servers/apache/files/apache-2.4.51-mpm-itk.patch')
-rw-r--r-- | www-servers/apache/files/apache-2.4.51-mpm-itk.patch | 34 |
1 files changed, 34 insertions, 0 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 new file mode 100644 index 000000000000..4d36fe03dffb --- /dev/null +++ b/www-servers/apache/files/apache-2.4.51-mpm-itk.patch @@ -0,0 +1,34 @@ +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; |