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

diff --git a/APACHE_1_2_X/src/CHANGES b/APACHE_1_2_X/src/CHANGES
index 7f4aef64e52d8f94bc6ef15630eb41275fd77c30..8deb421d230a6f5f731e0306c677026168c24dcc 100644 (file)
--- 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 221771acf2d2267ecbcf8da6e5b9d4f747f548c2..4460b64a8523e0f01b9f548640083e79927b6a25 100644 (file)
--- 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;
 }