]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
Yep I managed to post it screwed up ... and probably because I wrote
authordgaudet <dgaudet@unknown>
Tue, 5 Aug 1997 08:20:54 +0000 (08:20 +0000)
committerdgaudet <dgaudet@unknown>
Tue, 5 Aug 1997 08:20:54 +0000 (08:20 +0000)
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

APACHE_1_2_X/src/main/http_core.c

index 4460b64a8523e0f01b9f548640083e79927b6a25..d6a82069883f48aa62e3af44733890d3fe8eff57 100644 (file)
@@ -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;
 }