mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-15 06:45:32 +01:00
apache2: upgrade 2.4.61 -> 2.4.62
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
a8eb652918
commit
ff8cc5ddf9
|
|
@ -1,4 +1,4 @@
|
|||
From 5074ab3425e5f1e01fd9cfa2d9b7300ea1b3f38f Mon Sep 17 00:00:00 2001
|
||||
From d1f0389e699e64f3e329c0ce509f79d969a76114 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
|
||||
|
|
@ -16,10 +16,10 @@ Note: upstreaming was discussed but there are competing desires;
|
|||
1 file changed, 19 insertions(+)
|
||||
|
||||
diff --git a/server/core.c b/server/core.c
|
||||
index 090e397..3020090 100644
|
||||
index 843b973..3b50100 100644
|
||||
--- a/server/core.c
|
||||
+++ b/server/core.c
|
||||
@@ -5107,6 +5107,25 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte
|
||||
@@ -5143,6 +5143,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);
|
||||
|
|
@ -45,6 +45,3 @@ index 090e397..3020090 100644
|
|||
return OK;
|
||||
}
|
||||
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From e47cc405eadcbe37a579c375e824e20a5c53bfad Mon Sep 17 00:00:00 2001
|
||||
From b31cf12566e806e9e9c3aa01029f6bae3ada0729 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] Log the SELinux context at startup.
|
||||
|
|
@ -14,7 +14,7 @@ Note: unlikely to be any interest in this upstream
|
|||
2 files changed, 31 insertions(+)
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 352711a..f58620f 100644
|
||||
index 6319903..bffd8a1 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -514,6 +514,11 @@ gettid
|
||||
|
|
@ -30,7 +30,7 @@ index 352711a..f58620f 100644
|
|||
# On Linux before glibc 2.30, gettid() is only usable via syscall()
|
||||
AC_CACHE_CHECK([for gettid() via syscall], ap_cv_gettid,
|
||||
diff --git a/server/core.c b/server/core.c
|
||||
index 30b317e..81f145f 100644
|
||||
index 3b50100..e0c7c7f 100644
|
||||
--- a/server/core.c
|
||||
+++ b/server/core.c
|
||||
@@ -65,6 +65,10 @@
|
||||
|
|
@ -44,7 +44,7 @@ index 30b317e..81f145f 100644
|
|||
/* LimitRequestBody handling */
|
||||
#define AP_LIMIT_REQ_BODY_UNSET ((apr_off_t) -1)
|
||||
#define AP_DEFAULT_LIMIT_REQ_BODY ((apr_off_t) 1<<30) /* 1GB */
|
||||
@@ -5139,6 +5143,28 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte
|
||||
@@ -5162,6 +5166,28 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -73,5 +73,3 @@ index 30b317e..81f145f 100644
|
|||
return OK;
|
||||
}
|
||||
|
||||
--
|
||||
2.40.0
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
From 443d15b91d4e4979d92405610303797663f31102 Mon Sep 17 00:00:00 2001
|
||||
From 980eadecc128bbbe1233e5d89268be24d14e1873 Mon Sep 17 00:00:00 2001
|
||||
From: echo <fei.geng@windriver.com>
|
||||
Date: Tue, 28 Apr 2009 03:11:06 +0000
|
||||
Subject: [PATCH] Fix perl install directory to /usr/bin
|
||||
|
|
@ -16,10 +16,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
|
|||
1 file changed, 1 insertion(+), 4 deletions(-)
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 4df3ff3..4eeb609 100644
|
||||
index 4ce0fee..0362f52 100644
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -903,10 +903,7 @@ AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf",
|
||||
@@ -936,10 +936,7 @@ AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf",
|
||||
AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${rel_sysconfdir}/mime.types",
|
||||
[Location of the MIME types config file, relative to the Apache root directory])
|
||||
|
||||
|
|
@ -31,6 +31,3 @@ index 4df3ff3..4eeb609 100644
|
|||
AC_SUBST(perlbin)
|
||||
|
||||
dnl If we are running on BSD/OS, we need to use the BSD .include syntax.
|
||||
--
|
||||
2.25.1
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ SRC_URI:append:class-target = " \
|
|||
"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3"
|
||||
SRC_URI[sha256sum] = "ea8ba86fd95bd594d15e46d25ac5bbda82ae0c9122ad93998cc539c133eaceb6"
|
||||
SRC_URI[sha256sum] = "674188e7bf44ced82da8db522da946849e22080d73d16c93f7f4df89e25729ec"
|
||||
|
||||
S = "${WORKDIR}/httpd-${PV}"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user