From 6379f750639c7c209c43fd549f6c142a8fe910b1 Mon Sep 17 00:00:00 2001 From: "Ralf S. Engelschall" Date: Mon, 4 Aug 1997 16:05:00 +0000 Subject: [PATCH] Fixed improper vhost merging of and . 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 --- APACHE_1_2_X/src/CHANGES | 5 +++++ 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 7f4aef64e52..8deb421d230 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 and : 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 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 221771acf2d..4460b64a852 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; } -- 2.47.3