rse 97/08/02 08:52:14
Modified: src Tag: APACHE_1_2_X CHANGES http_request.c
Log:
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
Revision Changes Path
No revision
No revision
1.286.2.39 +3 -0 apache/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache/src/CHANGES,v
retrieving revision 1.286.2.38
retrieving revision 1.286.2.39
diff -u -r1.286.2.38 -r1.286.2.39
--- CHANGES 1997/08/01 08:48:16 1.286.2.38
+++ CHANGES 1997/08/02 15:52:11 1.286.2.39
@@ -1,5 +1,8 @@
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
1.50.2.6 +2 -1 apache/src/http_request.c
Index: http_request.c
===================================================================
RCS file: /export/home/cvs/apache/src/http_request.c,v
retrieving revision 1.50.2.5
retrieving revision 1.50.2.6
diff -u -r1.50.2.5 -r1.50.2.6
--- http_request.c 1997/07/31 08:19:49 1.50.2.5
+++ http_request.c 1997/08/02 15:52:12 1.50.2.6
@@ -344,7 +344,7 @@
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 @@
(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)) {
