httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@apache.org (Ralf S. Engelschall)
Subject cvs commit: apache/src CHANGES http_core.c
Date Mon, 04 Aug 1997 16:05:04 GMT
rse         97/08/04 09:05:04

  Modified:    src       Tag: APACHE_1_2_X  CHANGES http_core.c
  Log:
  Fixed improper vhost merging of <Location> and <Directory>.
  
  Submitted by:	Dean Gaudet
  Reviewed by:	Roy Fielding, Ralf S. Engelschall, Dean Gaudet
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.286.2.40 +5 -0      apache/src/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /export/home/cvs/apache/src/CHANGES,v
  retrieving revision 1.286.2.39
  retrieving revision 1.286.2.40
  diff -u -r1.286.2.39 -r1.286.2.40
  --- CHANGES	1997/08/02 15:52:11	1.286.2.39
  +++ CHANGES	1997/08/04 16:04:59	1.286.2.40
  @@ -1,5 +1,10 @@
   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]
   
  
  
  
  1.81.2.7  +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.81.2.6
  retrieving revision 1.81.2.7
  diff -u -r1.81.2.6 -r1.81.2.7
  --- http_core.c	1997/07/20 18:26:16	1.81.2.6
  +++ http_core.c	1997/08/04 16:05:00	1.81.2.7
  @@ -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;
   }
  
  
  

Mime
View raw message