Commit 67cff58d authored by Ralf S. Engelschall's avatar Ralf S. Engelschall
Browse files

Bugfix the case where multiple <Directory>s match and all are applied 

Submitted by:	Dean Gaudet
Reviewed by:	Dean Gaudet, Ralf S. Engelschall, Randy Terbush


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3@78867 13f79535-47bb-0310-9956-ffa450edef68
parent f09a22d6

APACHE_1_2_X/src/CHANGES

+3 −0
Original line number Diff line number Diff line 
Changes with Apache 1.2.2



  *) Bugfix for case where multiple <Directory>s match and all are applied.

     [Dean Gaudet]



  *) Fixed an infinite loop in mod_imap for references above the server root

     [Dean Gaudet] PR#748

APACHE_1_2_X/src/main/http_request.c

+2 −1
Original line number Diff line number Diff line
@@ -344,7 +344,7 @@ int directory_walk (request_rec *r) 
        core_dir_config *core_dir =

	  (core_dir_config *)get_module_config(per_dir_defaults, &core_module);

	int overrides_here;

        void *this_conf = NULL, *htaccess_conf = NULL;

        void *this_conf, *htaccess_conf = NULL;

	char *this_dir = make_dirstr (r->pool, test_filename, i);

	int j;
@@ -373,6 +373,7 @@ int directory_walk (request_rec *r) 
	      (core_dir_config *)get_module_config(entry_config, &core_module);

	    entry_dir = entry_core->d;

	

	    this_conf = NULL;

	    if (entry_core->r) {

		if (!regexec(entry_core->r, this_dir, 0, NULL,

			     (j == num_sec) ? 0 : REG_NOTEOL)) {