mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-09-05 16:41:49 +00:00
a04f595adb
* License-Update: Correctly identify origin of util_pcre.c/ap_regex.h as pcreposix[.ch] and correct LICENSE/NOTICE to match. * Refresh patches with devtool * Drop useless patch apache-ssl-ltmain-rpath.patch * Move all patches to one directory Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
From 55ebb07cc57854cbfb372c3a688365039b809bc8 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: add from OE-Classic, update to version 2.4.2 and fix
|
|
|
|
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 4af0816..4fd2b9f 100644
|
|
--- a/server/core.c
|
|
+++ b/server/core.c
|
|
@@ -4940,6 +4940,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;
|
|
}
|
|
|