coar 97/11/13 07:00:11
Modified: src CHANGES
src/main http_core.c
Log:
Correct an invalid assumption about where AllowOverrides may appear.
Reviewed by: Dean Gaudet, Martin Kraemer
Revision Changes Path
1.509 +5 -1 apachen/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apachen/src/CHANGES,v
retrieving revision 1.508
retrieving revision 1.509
diff -u -r1.508 -r1.509
--- CHANGES 1997/11/12 23:26:12 1.508
+++ CHANGES 1997/11/13 15:00:08 1.509
@@ -1,5 +1,9 @@
Changes with Apache 1.3b3
+ *) Directives owned by http_core can now use the new check_cmd_context()
+ routine to ensure that they're not being used within a container
+ (e.g., <Directory>) where they're invalid. [Martin Kraemer]
+
*) PORT: SUNOS now always defines SUNOS_LIB_PROTOTYPES because a
recent change elsewhere left us without definitions for fgetc()
and fgets() breaking compilation. [Martin Kraemer, Ben Hyde]
@@ -21,7 +25,7 @@
*) http_core was mmap()ing even in cases where it wasn't going to
read the file. [Ben Hyde <[EMAIL PROTECTED]>]
- *) Complete rewrite ;_) of mod_rewrite's URL rewriting engine:
+ *) Complete rewrite ;-) of mod_rewrite's URL rewriting engine:
Now the rewriting engine (the heart of mod_rewrite) is organized more
straight-forward, first time well documented and reduced to the really
essential parts. All redundant cases were stripped off and processing
now
1.139 +4 -2 apachen/src/main/http_core.c
Index: http_core.c
===================================================================
RCS file: /export/home/cvs/apachen/src/main/http_core.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -r1.138 -r1.139
--- http_core.c 1997/11/12 20:42:09 1.138
+++ http_core.c 1997/11/13 15:00:10 1.139
@@ -667,8 +667,10 @@
{
char *w;
- const char *err = check_cmd_context(cmd,
NOT_IN_VIRTUALHOST|NOT_IN_LIMIT);
- if (err != NULL) return err;
+ const char *err = check_cmd_context(cmd, NOT_IN_LIMIT);
+ if (err != NULL) {
+ return err;
+ }
d->override = OR_NONE;
while(l[0]) {
