dgaudet 97/08/04 23:45:01
Modified: src CHANGES http_core.c
Log:
When merging the main server's <Directory> and <Location> sections into
a vhost, put the main server's first and the vhost's second. Otherwise
the vhost can't override the main server.
Reviewed by: Roy Fielding, Ralf S. Engelschall, Dean Gaudet
PR: 717
Revision Changes Path
1.383 +4 -0 apache/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.382
retrieving revision 1.383
diff -u -r1.382 -r1.383
--- CHANGES 1997/08/05 06:02:39 1.382
+++ CHANGES 1997/08/05 06:44:58 1.383
@@ -1,5 +1,9 @@
Changes with Apache 1.3a2
+ *) When merging the main server's <Directory> and <Location> sections into
+ a vhost, put the main server's first and the vhost's second. Otherwise
+ the vhost can't override the main server. [Dean Gaudet] PR#717
+
*) ip-based vhosts are stored and queried using a hashing function, which
has been shown to improve performance on servers with many ip-vhosts.
Some other changes had to be made to accomodate this:
1.107 +2 -2 apache/src/http_core.c
Index: http_core.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_core.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- http_core.c 1997/08/04 02:36:03 1.106
+++ http_core.c 1997/08/05 06:44:59 1.107
@@ -200,8 +200,8 @@
*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;
}
