diff options
author | Yi Zhao <yi.zhao@windriver.com> | 2019-04-15 11:39:38 +0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2019-04-16 21:07:25 -0700 |
commit | fd526d60d4b3842f1d21adbc2c1bb1492edadd48 (patch) | |
tree | 2455d57dddc62db8dca5bec2c7e8ec14f4ff95ae /meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch | |
parent | b15a7358c65c4a7960dee3844f07bb6c5e289f32 (diff) | |
download | meta-openembedded-fd526d60d4b3842f1d21adbc2c1bb1492edadd48.tar.gz |
apache2: upgrade 2.4.34 -> 2.4.39
* Drop apache2-native recipe.
Add native to BBCLASSEXTEND in apache2 recipe.
* Refresh patches.
Drop CVE-2018-11763.patch and apache-configure_perlbin.patch
* Cleanup recipe file. Remove obsolete code.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch')
-rw-r--r-- | meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch b/meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch new file mode 100644 index 0000000000..85fe6ae4bd --- /dev/null +++ b/meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch @@ -0,0 +1,51 @@ +From 7df207ad4d0dcda2ad36e5642296e0dec7e13647 Mon Sep 17 00:00:00 2001 +From: Paul Eggleton <paul.eggleton@linux.intel.com> +Date: Tue, 17 Jul 2012 11:27:39 +0100 +Subject: [PATCH] apache2: bump up the core size limit if CoreDumpDirectory + is configured + +Bump up the core size limit if CoreDumpDirectory is +configured. + +Upstream-Status: Pending + +Note: upstreaming was discussed but there are competing desires; + there are portability oddities here too. + +--- + server/core.c | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/server/core.c b/server/core.c +index eacb54f..7aa841f 100644 +--- a/server/core.c ++++ b/server/core.c +@@ -4965,6 +4965,25 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte + } + apr_pool_cleanup_register(pconf, NULL, ap_mpm_end_gen_helper, + apr_pool_cleanup_null); ++ ++#ifdef RLIMIT_CORE ++ if (ap_coredumpdir_configured) { ++ struct rlimit lim; ++ ++ if (getrlimit(RLIMIT_CORE, &lim) == 0 && lim.rlim_cur == 0) { ++ lim.rlim_cur = lim.rlim_max; ++ if (setrlimit(RLIMIT_CORE, &lim) == 0) { ++ ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, NULL, ++ "core dump file size limit raised to %lu bytes", ++ lim.rlim_cur); ++ } else { ++ ap_log_error(APLOG_MARK, APLOG_NOTICE, errno, NULL, ++ "core dump file size is zero, setrlimit failed"); ++ } ++ } ++ } ++#endif ++ + return OK; + } + +-- +2.7.4 + |