VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-01 16:41:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Patch PR 62567. Fix by Michal Karm Babacek <michal.babacek gmail.com>

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1837717 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jim Jagielski
2018-08-09 11:30:10 +00:00
parent ed52157949
commit ca78ac0107
4 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -977,11 +977,11 @@ SET(rel_runtimedir "logs")
SET(rel_sysconfdir "conf")
FILE(GLOB_RECURSE conffiles RELATIVE ${CMAKE_SOURCE_DIR}/docs/conf "docs/conf/*")
FOREACH(template ${conffiles})
STRING(REPLACE ".conf.in" ".conf" conf ${template})
STRING(REPLACE ".conf.in" ".conf" conf "${template}")
FILE(READ "docs/conf/${template}" template_text)
IF(template MATCHES ".conf.in$")
# substitute @var@/@@var@@ in .conf.in
STRING(REPLACE "@@" "@" template_text ${template_text})
STRING(REPLACE "@@" "@" template_text "${template_text}")
STRING(CONFIGURE "${template_text}" template_text @ONLY)
ENDIF()
FILE(WRITE ${CMAKE_BINARY_DIR}/conf/original/${conf} "${template_text}")

2
configure.in
View File

@ -1029,7 +1029,7 @@ AC_SUBST(ap_make_delimiter)
dnl Ensure that docs/conf is created.
test -d docs/conf||$mkdir_p docs/conf
AC_CONFIG_FILES(docs/conf/httpd.conf docs/conf/extra/httpd-autoindex.conf docs/conf/extra/httpd-dav.conf docs/conf/extra/httpd-default.conf docs/conf/extra/httpd-info.conf docs/conf/extra/httpd-languages.conf docs/conf/extra/httpd-manual.conf docs/conf/extra/httpd-mpm.conf docs/conf/extra/httpd-multilang-errordoc.conf docs/conf/extra/httpd-policy.conf docs/conf/extra/httpd-ssl.conf docs/conf/extra/httpd-userdir.conf docs/conf/extra/httpd-vhosts.conf docs/conf/extra/proxy-html.conf include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk build/pkg/pkginfo build/config_vars.sh)
AC_CONFIG_FILES(docs/conf/httpd.conf docs/conf/extra/httpd-autoindex.conf docs/conf/extra/httpd-dav.conf docs/conf/extra/httpd-default.conf docs/conf/extra/httpd-info.conf docs/conf/extra/httpd-languages.conf docs/conf/extra/httpd-manual.conf docs/conf/extra/httpd-mpm.conf docs/conf/extra/httpd-multilang-errordoc.conf docs/conf/extra/httpd-policy.conf docs/conf/extra/httpd-ssl.conf docs/conf/extra/httpd-userdir.conf docs/conf/extra/httpd-vhosts.conf docs/conf/extra/proxy-html.conf docs/conf/extra/httpd-macro.conf include/ap_config_layout.h support/apxs support/apachectl support/dbmmanage support/envvars-std support/log_server_status support/logresolve.pl support/phf_abuse_log.cgi support/split-logfile build/rules.mk build/pkg/pkginfo build/config_vars.sh)
AC_CONFIG_COMMANDS([default], [true], [APACHE_GEN_MAKEFILES])
AC_OUTPUT

39
docs/conf/extra/httpd-policy.conf.in
View File

@ -1,4 +1,3 @@
#
# Load the module if not already present
<IfModule !mod_policy.c>
@ -12,32 +11,32 @@
<Location />
SetOutputFilter POLICY_TYPE;POLICY_LENGTH;POLICY_KEEPALIVE;POLICY_VARY;POLICY_VALIDATION;POLICY_CONDITIONAL;POLICY_NOCACHE;POLICY_MAXAGE
# content type must be present and valid, but can be anything<br />
PolicyType enforce */*<br />
# content type must be present and valid, but can be anything
PolicyType enforce */*
# reject if no explicitly declared content length<br />
PolicyLength enforce<br />
# reject if no explicitly declared content length
PolicyLength enforce
# covered by the policy length filter<br />
PolicyKeepalive ignore<br />
# covered by the policy length filter
PolicyKeepalive ignore
# reject if User-Agent appears within Vary headers<br />
PolicyVary enforce User-Agent<br />
# reject if User-Agent appears within Vary headers
PolicyVary enforce User-Agent
# we want to enforce validation<br />
PolicyValidation enforce<br />
# we want to enforce validation
PolicyValidation enforce
# non-functional conditional responses should be rejected<br />
PolicyConditional enforce<br />
# non-functional conditional responses should be rejected
PolicyConditional enforce
# no-cache responses should be rejected<br />
PolicyNocache enforce<br />
# no-cache responses should be rejected
PolicyNocache enforce
# maxage must be at least a day<br />
PolicyMaxage enforce 86400<br />
# maxage must be at least a day
PolicyMaxage enforce 86400
# request version can be anything<br />
PolicyVersion ignore HTTP/1.1<br />
# request version can be anything
PolicyVersion ignore HTTP/1.1
# define documentation links
PolicyConditionalURL http://httpd.apache.org/docs/trunk/compliance.html#policyconditional
@ -57,5 +56,3 @@
<Location /server-status>
PolicyFilter off
</Location>

2
docs/conf/httpd.conf.in
View File

@ -405,7 +405,7 @@ LogLevel warn
#Include @rel_sysconfdir@/extra/httpd-policy.conf
# Configuration macros
#Included @rel_sysconfdir@/extra/httpd-macro.conf
#Include @rel_sysconfdir@/extra/httpd-macro.conf
# Configure mod_proxy_html to understand HTML4/XHTML1
<IfModule proxy_html_module>