summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCoprDistGit <infra@openeuler.org>2024-04-06 14:03:17 +0000
committerCoprDistGit <infra@openeuler.org>2024-04-06 14:03:17 +0000
commit24f5281099b90e68d4858062bec7a36ab6a9be59 (patch)
tree18789a3c070ad0d06f74bc69fa72c554fd9313cf
parentb9197cd17a10a0830ac27d7d39b629527c3594b5 (diff)
automatic import of httpd
-rw-r--r--backport-httpd-2.4.25-selinux.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/backport-httpd-2.4.25-selinux.patch b/backport-httpd-2.4.25-selinux.patch
index dd6ed1d..c6add21 100644
--- a/backport-httpd-2.4.25-selinux.patch
+++ b/backport-httpd-2.4.25-selinux.patch
@@ -2,7 +2,7 @@ diff --git a/configure.in b/configure.in
index c5896c1..96cd4a6 100644
--- a/configure.in
+++ b/configure.in
-@@ -530,11 +530,6 @@
+@@ -530,6 +530,11 @@
dnl confirm that a void pointer is large enough to store a long integer
APACHE_CHECK_VOID_PTR_LEN
@@ -29,9 +29,9 @@ index 4da7209..515047b 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 */
-@@ -5126,6 +5130,28 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte
- }
- #endif
+@@ -5095,6 +5099,28 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte
+
+ mpm_common_pre_config(pconf);
+#ifdef HAVE_SELINUX
+ {