diff options
| author | CoprDistGit <infra@openeuler.org> | 2024-04-06 14:19:18 +0000 |
|---|---|---|
| committer | CoprDistGit <infra@openeuler.org> | 2024-04-06 14:19:18 +0000 |
| commit | 335c7c777477eb8cf60510191edf5425da818fd0 (patch) | |
| tree | 816d7508ae1c7706076ffea89b903e7dccf53521 /backport-httpd-2.4.25-selinux.patch | |
| parent | 4b7ff4f35db09d0006b608ec171d50ed60356062 (diff) | |
automatic import of httpdopeneuler22.03_LTS_SP2openeuler22.03_LTS
Diffstat (limited to 'backport-httpd-2.4.25-selinux.patch')
| -rw-r--r-- | backport-httpd-2.4.25-selinux.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/backport-httpd-2.4.25-selinux.patch b/backport-httpd-2.4.25-selinux.patch index 0db1e45..c6add21 100644 --- a/backport-httpd-2.4.25-selinux.patch +++ b/backport-httpd-2.4.25-selinux.patch @@ -2,18 +2,18 @@ diff --git a/configure.in b/configure.in index c5896c1..96cd4a6 100644 --- a/configure.in +++ b/configure.in -@@ -508,6 +508,11 @@ getloadavg +@@ -530,6 +530,11 @@ dnl confirm that a void pointer is large enough to store a long integer APACHE_CHECK_VOID_PTR_LEN - + +AC_CHECK_LIB(selinux, is_selinux_enabled, [ + AC_DEFINE(HAVE_SELINUX, 1, [Defined if SELinux is supported]) + APR_ADDTO(HTTPD_LIBS, [-lselinux]) +]) + - AC_CACHE_CHECK([for gettid()], ac_cv_gettid, - [AC_TRY_RUN(#define _GNU_SOURCE - #include <unistd.h> + if test $ac_cv_func_gettid = no; then + # 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 4da7209..515047b 100644 --- a/server/core.c @@ -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 + { |