rse 98/07/12 02:35:43
Modified: src CHANGES
src/modules/experimental mod_mmap_static.c
Log:
Although Dean already has moved mod_mmap_static inside the Configuration to
change its priority, it doesn't hurt is when we are additionally be even more
conservative:
Let mod_mmap_static be more reserved unless at least one "mmapfile" directive
is present in the configuration. Because this experimental module has to do
some black magic to operate inside the current API and thus forces
side-effects for other modules under some circumstances.
PS: For Apache 2.0 we really need dynamically configurable
priorities _per API hook_ for each module, yes....
Revision Changes Path
1.962 +6 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.961
retrieving revision 1.962
diff -u -r1.961 -r1.962
--- CHANGES 1998/07/12 09:25:44 1.961
+++ CHANGES 1998/07/12 09:35:40 1.962
@@ -1,4 +1,10 @@
Changes with Apache 1.3.1
+
+ *) Let mod_mmap_static be more reserved unless at least one "mmapfile"
+ directive is present in the configuration. Because this experimental
+ module has to do some black magic to operate inside the current API and
+ thus forces side-effects for other modules under some circumstances.
+ [Ralf S. Engelschall]
*) Add conservative ticks around more egrep arguments in top-level
configure
to avoid problems under brain-dead platforms like Digital Unix (OSF1).
1.8 +6 -1 apache-1.3/src/modules/experimental/mod_mmap_static.c
Index: mod_mmap_static.c
===================================================================
RCS file:
/export/home/cvs/apache-1.3/src/modules/experimental/mod_mmap_static.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mod_mmap_static.c 1998/04/11 12:00:38 1.7
+++ mod_mmap_static.c 1998/07/12 09:35:42 1.8
@@ -280,12 +280,17 @@
a_file *match;
int res;
+ sconf = ap_get_module_config(r->server->module_config,
&mmap_static_module);
+
+ /* we only operate when at least one mmapfile directive was used */
+ if (ap_is_empty_table(sconf->files))
+ return DECLINED;
+
/* we require other modules to first set up a filename */
res = core_module.translate_handler(r);
if (res == DECLINED || !r->filename) {
return res;
}
- sconf = ap_get_module_config(r->server->module_config,
&mmap_static_module);
tmp.filename = r->filename;
match = (a_file *)bsearch(&tmp, sconf->files->elts, sconf->files->nelts,
sizeof(a_file), file_compare);
