From: dgaudet Date: Tue, 5 Aug 1997 08:20:54 +0000 (+0000) Subject: Yep I managed to post it screwed up ... and probably because I wrote X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f36b70787bc6762229519fb3291cfe478079b74;p=thirdparty%2Fapache%2Fhttpd.git Yep I managed to post it screwed up ... and probably because I wrote so much with the patch to PR#717 everyone agreed with the concept without reviewing the code! git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3@78900 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/APACHE_1_2_X/src/main/http_core.c b/APACHE_1_2_X/src/main/http_core.c index 4460b64a852..d6a82069883 100644 --- a/APACHE_1_2_X/src/main/http_core.c +++ b/APACHE_1_2_X/src/main/http_core.c @@ -201,7 +201,7 @@ void *merge_core_server_configs (pool *p, void *basev, void *virtv) 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, base->sec, virt->sec); - conf->sec_url = append_arrays (p, base->sec, virt->sec_url); + conf->sec_url = append_arrays (p, base->sec_url, virt->sec_url); return conf; }