VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-15 23:27:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merging of AllowOverrideList and ContentDigest.

Browse Source 
Remove some useless code.
Pointed out by covener


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1304852 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Fritsch
2012-03-24 16:32:53 +00:00
parent d662050c26
commit 5b0c08477f
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.5.0
*) core: Fix merging of AllowOverrideList and ContentDigest.
[Stefan Fritsch]
*) core: Disallow directives in AllowOverrideList which are only allowed
in VirtualHost or server context. These are usually not prepared to be
called in .htaccess files. [Stefan Fritsch]

6
server/core.c
View File

@ -247,7 +247,7 @@ static void *merge_core_dir_configs(apr_pool_t *a, void *basev, void *newv)
conf->override_opts = new->override_opts;
}
if (conf->override_list == NULL) {
if (new->override_list != NULL) {
conf->override_list = new->override_list;
}
@ -274,7 +274,7 @@ static void *merge_core_dir_configs(apr_pool_t *a, void *basev, void *newv)
conf->hostname_lookups = new->hostname_lookups;
}
if (new->content_md5 == AP_CONTENT_MD5_UNSET) {
if (new->content_md5 != AP_CONTENT_MD5_UNSET) {
conf->content_md5 = new->content_md5;
}
@ -314,8 +314,6 @@ static void *merge_core_dir_configs(apr_pool_t *a, void *basev, void *newv)
if (new->limit_xml_body != AP_LIMIT_UNSET)
conf->limit_xml_body = new->limit_xml_body;
else
conf->limit_xml_body = base->limit_xml_body;
if (!conf->sec_file) {
conf->sec_file = new->sec_file;