httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Dean Gaudet <dgau...@arctic.org>
Subject PR#131 -- multiple <Directory foo>s at the same depth
Date Sat, 01 Feb 1997 21:46:01 GMT
PR#131 provides a patch which allows multiple <Directory foo>s to match at
a given depth.  I went over the patch and it works (I'm including it here
properly massaged against current cvs).

It's debatable that we want to support this (I can quite easily see an
argument for short-circuiting the loop that walks all the <Directory>
sections when the first match is found).  To do it properly would probably
also require us to make similar tweaks for <Files> and <Location>.

Dean

Index: http_request.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_request.c,v
retrieving revision 1.40
diff -c -3 -r1.40 http_request.c
*** http_request.c	1997/01/25 15:44:39	1.40
--- http_request.c	1997/02/01 21:40:32
***************
*** 370,384 ****
  	    }
  	    else if (!strcmp (this_dir, entry_dir))
  	        this_conf = entry_config;
- 	}
  
! 	if (this_conf)
! 	{
! 	    per_dir_defaults =
! 	        merge_per_dir_configs (r->pool, per_dir_defaults, this_conf);
! 	    core_dir =(core_dir_config *)get_module_config(per_dir_defaults,
  							   &core_module);
  	}
  	overrides_here = core_dir->override;
  
  	/* If .htaccess files are enabled, check for one.
--- 370,385 ----
  	    }
  	    else if (!strcmp (this_dir, entry_dir))
  	        this_conf = entry_config;
  
!           if (this_conf)
!           {
!               per_dir_defaults =
!                   merge_per_dir_configs (r->pool, per_dir_defaults, this_conf);
!               core_dir =(core_dir_config *)get_module_config(per_dir_defaults,
  							   &core_module);
+           }
  	}
+ 
  	overrides_here = core_dir->override;
  
  	/* If .htaccess files are enabled, check for one.




Mime
View raw message