commit 3b767c2c1e7f3cf525accc29d2249c01df260676
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Wed Nov 20 10:57:31 2024 +0100
Rel 3; don't activate mod_access_compat.c rules if we have
mod_authz_host.c. Activating compat causes inheritance rules (you need to
override compat rules below and you cannot just use new mod_authz_host rules in
such case).
apache-common.conf | 8 ++++++++
apache-httpd.conf | 2 ++
apache-manual.conf | 6 +++++-
apache-mod_autoindex.conf | 2 ++
apache-mod_info.conf | 2 ++
apache-mod_proxy.conf | 2 ++
apache-mod_status.conf | 2 ++
apache-mod_userdir.conf | 4 ++++
apache-multilang-errordoc.conf | 2 ++
apache.spec | 2 +-
10 files changed, 30 insertions(+), 2 deletions(-)
---
diff --git a/apache.spec b/apache.spec
index fd7de63..0b0d9be 100644
--- a/apache.spec
+++ b/apache.spec
@@ -35,7 +35,7 @@ Summary(ru.UTF-8): Самый популярный веб-сервер
Summary(tr.UTF-8): Lider WWW tarayıcı
Name: apache
Version: 2.4.62
-Release: 2
+Release: 3
License: Apache v2.0
Group: Networking/Daemons/HTTP
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
diff --git a/apache-common.conf b/apache-common.conf
index 714c05b..7ada572 100644
--- a/apache-common.conf
+++ b/apache-common.conf
@@ -19,8 +19,10 @@ DocumentRoot "/home/services/httpd/html"
Require all denied
</IfModule>
<IfModule mod_access_compat.c>
+ <IfModule !mod_authz_host.c>
Order deny,allow
Deny from all
+ </IfModule>
</IfModule>
</Directory>
@@ -33,8 +35,10 @@ DocumentRoot "/home/services/httpd/html"
Require all denied
</IfModule>
<IfModule mod_access_compat.c>
+ <IfModule !mod_authz_host.c>
Order deny,allow
Deny from all
+ </IfModule>
</IfModule>
</FilesMatch>
@@ -45,8 +49,10 @@ DocumentRoot "/home/services/httpd/html"
Require all denied
</IfModule>
<IfModule mod_access_compat.c>
+ <IfModule !mod_authz_host.c>
Order deny,allow
Deny from all
+ </IfModule>
</IfModule>
</DirectoryMatch>
@@ -82,8 +88,10 @@ DocumentRoot "/home/services/httpd/html"
Require all granted
</IfModule>
<IfModule mod_access_compat.c>
+ <IfModule !mod_authz_host.c>
Order allow,deny
Allow from all
+ </IfModule>
</IfModule>
</Directory>
diff --git a/apache-httpd.conf b/apache-httpd.conf
index 31ff912..241e0cf 100644
--- a/apache-httpd.conf
+++ b/apache-httpd.conf
@@ -121,8 +121,10 @@ IncludeOptional webapps.d/*.conf
Require all granted
</IfModule>
<IfModule mod_access_compat.c>
+ <IfModule !mod_authz_host.c>
Order allow,deny
Allow from all
+ </IfModule>
</IfModule>
</Directory>
</IfModule>
diff --git a/apache-manual.conf b/apache-manual.conf
index a427941..056afc4 100644
--- a/apache-manual.conf
+++ b/apache-manual.conf
@@ -12,10 +12,14 @@ AliasMatch
^/manual(?:/(?:da|de|en|es|fr|ja|ko|pt-br|ru|tr|zh-cn))?(/.*)?$ "/hom
<Directory "/home/services/httpd/manual">
Options Indexes
AllowOverride None
- Require all granted
+ <IfModule mod_authz_host.c>
+ Require all granted
+ </IfModule>
<IfModule mod_access_compat.c>
+ <IfModule !mod_authz_host.c>
Order allow,deny
Allow from all
+ </IfModule>
</IfModule>
<Files *.html>
diff --git a/apache-mod_autoindex.conf b/apache-mod_autoindex.conf
index 165fde4..f25800d 100644
--- a/apache-mod_autoindex.conf
+++ b/apache-mod_autoindex.conf
@@ -28,8 +28,10 @@ Alias /icons/ "/home/services/httpd/icons/"
Require all granted
</IfModule>
<IfModule mod_access_compat.c>
+ <IfModule !mod_authz_host.c>
Order allow,deny
Allow from all
+ </IfModule>
</IfModule>
</Directory>
diff --git a/apache-mod_info.conf b/apache-mod_info.conf
index 4dca480..7e176fd 100644
--- a/apache-mod_info.conf
+++ b/apache-mod_info.conf
@@ -17,9 +17,11 @@ LoadModule info_module modules/mod_info.so
# Require ip 127
Require local
<IfModule mod_access_compat.c>
+ <IfModule !mod_authz_host.c>
Order deny,allow
Deny from all
Allow from 127.0.0.1
+ </IfModule>
</IfModule>
</Location>
diff --git a/apache-mod_proxy.conf b/apache-mod_proxy.conf
index 00f9a57..5dcd0dd 100644
--- a/apache-mod_proxy.conf
+++ b/apache-mod_proxy.conf
@@ -32,9 +32,11 @@ ProxyRequests On
Require all denied
# Require host .your-domain.com
<IfModule mod_access_compat.c>
+ <IfModule !mod_authz_host.c>
Order deny,allow
Deny from all
# Allow from .your-domain.com
+ </IfModule>
</IfModule>
</Proxy>
diff --git a/apache-mod_status.conf b/apache-mod_status.conf
index 6477a23..7028ef4 100644
--- a/apache-mod_status.conf
+++ b/apache-mod_status.conf
@@ -18,9 +18,11 @@ LoadModule status_module modules/mod_status.so
# Require ip 127
Require local
<IfModule mod_access_compat.c>
+ <IfModule !mod_authz_host.c>
Order deny,allow
Deny from all
Allow from 127.0.0.1
+ </IfModule>
</IfModule>
</Location>
diff --git a/apache-mod_userdir.conf b/apache-mod_userdir.conf
index 534367a..3f4379a 100644
--- a/apache-mod_userdir.conf
+++ b/apache-mod_userdir.conf
@@ -22,15 +22,19 @@ UserDir public_html
<Limit GET POST OPTIONS>
Require all granted
<IfModule mod_access_compat.c>
+ <IfModule !mod_authz_host.c>
Order allow,deny
Allow from all
+ </IfModule>
</IfModule>
</Limit>
<LimitExcept GET POST OPTIONS>
Require all denied
<IfModule mod_access_compat.c>
+ <IfModule !mod_authz_host.c>
Order deny,allow
Deny from all
+ </IfModule>
</IfModule>
</LimitExcept>
#<IfModule mod_php.c>
diff --git a/apache-multilang-errordoc.conf b/apache-multilang-errordoc.conf
index b4bf2a3..e027032 100644
--- a/apache-multilang-errordoc.conf
+++ b/apache-multilang-errordoc.conf
@@ -28,8 +28,10 @@ Alias /error/ "/home/services/httpd/error/"
AddHandler type-map var
Require all granted
<IfModule mod_access_compat.c>
+ <IfModule !mod_authz_host.c>
Order allow,deny
Allow from all
+ </IfModule>
</IfModule>
LanguagePriority en cs de es fr it ja ko nl pl pt-br ro sv tr
ForceLanguagePriority Prefer Fallback
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/apache.git/commitdiff/3b767c2c1e7f3cf525accc29d2249c01df260676
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
