Commit 997a7cf8 authored by Ralf S. Engelschall's avatar Ralf S. Engelschall
Browse files

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
parent d3ce8119

APACHE_1_2_X/src/CHANGES

+5 −0
Original line number Diff line number Diff line 
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]

APACHE_1_2_X/src/main/http_core.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}