diff options
| author | Ralf S. Engelschall <rse@apache.org> | 1997-08-04 16:05:00 +0000 |
|---|---|---|
| committer | Ralf S. Engelschall <rse@apache.org> | 1997-08-04 16:05:00 +0000 |
| commit | 6379f750639c7c209c43fd549f6c142a8fe910b1 (patch) | |
| tree | d501eadd51e0277176c752969001d524769b14d8 | |
| parent | 39169b7b6a5eee33d0e73a8dca128b6822d52c06 (diff) | |
| download | httpd-6379f750639c7c209c43fd549f6c142a8fe910b1.tar.gz | |
Fixed improper vhost merging of <Location> and <Directory>.
Submitted by: Dean Gaudet
Reviewed by: Roy Fielding, Ralf S. Engelschall, Dean Gaudet
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3@78891 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | APACHE_1_2_X/src/CHANGES | 5 | ||||
| -rw-r--r-- | APACHE_1_2_X/src/main/http_core.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/APACHE_1_2_X/src/CHANGES b/APACHE_1_2_X/src/CHANGES index 7f4aef64e5..8deb421d23 100644 --- a/APACHE_1_2_X/src/CHANGES +++ b/APACHE_1_2_X/src/CHANGES @@ -1,5 +1,10 @@ Changes with Apache 1.2.2 + *) Fixed improper vhost merging of <Location> and <Directory>: changed the + ordering of the arguments to append_arrays for the main server's before + the vhost's. + [Dean Gaudet] + *) Bugfix for case where multiple <Directory>s match and all are applied. [Dean Gaudet] diff --git a/APACHE_1_2_X/src/main/http_core.c b/APACHE_1_2_X/src/main/http_core.c index 221771acf2..4460b64a85 100644 --- a/APACHE_1_2_X/src/main/http_core.c +++ b/APACHE_1_2_X/src/main/http_core.c @@ -200,8 +200,8 @@ void *merge_core_server_configs (pool *p, void *basev, void *virtv) *conf = *virt; if (!conf->access_name) conf->access_name = base->access_name; if (!conf->document_root) conf->document_root = base->document_root; - conf->sec = append_arrays (p, virt->sec, base->sec); - conf->sec_url = append_arrays (p, virt->sec_url, base->sec_url); + conf->sec = append_arrays (p, base->sec, virt->sec); + conf->sec_url = append_arrays (p, base->sec, virt->sec_url); return conf; } |