dgaudet 98/03/28 12:57:10
Modified: htdocs/manual/mod core.html
src CHANGES
src/main http_core.c
Log:
"Options +Includes" wasn't corrently merged if "+IncludesNoExec"
was defined in a parent directory.
Submitted by: Lars Eilebrecht
Revision Changes Path
1.107 +3 -0 apache-1.3/htdocs/manual/mod/core.html
Index: core.html
===================================================================
RCS file: /export/home/cvs/apache-1.3/htdocs/manual/mod/core.html,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- core.html 1998/03/21 22:31:53 1.106
+++ core.html 1998/03/28 20:57:04 1.107
@@ -1818,6 +1818,9 @@
then the options <CODE>FollowSymLinks</CODE> and <CODE>Includes</CODE>
are set for the /web/docs/spec directory.<P>
+<STRONG>Note:</STRONG> Using <CODE>-IncludesNOEXEC</CODE> or
<CODE>-Includes</CODE>
+disables server-side includes completely regardless of the previous
setting.<P>
+
The default in the absence of any other settings is <CODE>All</CODE>.<P>
<HR>
1.743 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.742
retrieving revision 1.743
diff -u -r1.742 -r1.743
--- CHANGES 1998/03/28 12:06:52 1.742
+++ CHANGES 1998/03/28 20:57:07 1.743
@@ -1,5 +1,8 @@
Changes with Apache 1.3b6
+ *) "Options +Includes" wasn't corrently merged if "+IncludesNoExec"
+ was defined in a parent directory. [Lars Eilebrecht]
+
*) API: ap_snprintf() code mutated into apapi_vformatter(), which is
a generic printf-style routine that can call arbitrary output
routines. Use this to replace http_bprintf.c. Add new routines
1.179 +2 -0 apache-1.3/src/main/http_core.c
Index: http_core.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/http_core.c,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- http_core.c 1998/03/28 11:58:23 1.178
+++ http_core.c 1998/03/28 20:57:10 1.179
@@ -166,6 +166,8 @@
conf->opts_add = (conf->opts_add & ~new->opts_remove) | new->opts_add;
conf->opts_remove = (conf->opts_remove & ~new->opts_add) |
new->opts_remove;
conf->opts = (conf->opts & ~conf->opts_remove) | conf->opts_add;
+ if ((base->opts & OPT_INCNOEXEC) && (new->opts & OPT_INCLUDES))
+ conf->opts = (conf->opts & ~OPT_INCNOEXEC) | OPT_INCLUDES;
}
else {
/* otherwise we just copy, because an explicit opts setting
