rse 98/10/03 08:11:54
Modified: src CHANGES
src/modules/standard mod_auth.c mod_auth_db.c mod_auth_dbm.c
Log:
Fix `require ...' directive parsing in mod_auth, mod_auth_dbm and mod_auth_db
by using ap_getword_white() (which uses ap_isspace()) instead of
ap_getword(..., ' ') (which parses only according to spaces but not tabs).
Submitted by: James Morris <[EMAIL PROTECTED]>
Reviewed and extended to other mods: Ralf S. Engelschall
PR: 3105
Revision Changes Path
1.1094 +5 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1093
retrieving revision 1.1094
diff -u -r1.1093 -r1.1094
--- CHANGES 1998/10/03 14:42:23 1.1093
+++ CHANGES 1998/10/03 15:11:50 1.1094
@@ -1,5 +1,10 @@
Changes with Apache 1.3.3
+ *) Fix `require ...' directive parsing in mod_auth, mod_auth_dbm and
+ mod_auth_db by using ap_getword_white() (which uses ap_isspace())
instead of
+ ap_getword(..., ' ') (which parses only according to spaces but not
tabs).
+ [James Morris <[EMAIL PROTECTED]>, Ralf S. Engelschall] PR#3105
+
*) Fix the SERVER_NAME variable under sub-request situations (where
`UseCanonicalName off' is used) like CGI's called from SSI pages or
RewriteCond variables by adopting r->hostname to sub-requests.
1.40 +1 -1 apache-1.3/src/modules/standard/mod_auth.c
Index: mod_auth.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_auth.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- mod_auth.c 1998/08/06 17:30:54 1.39
+++ mod_auth.c 1998/10/03 15:11:52 1.40
@@ -264,7 +264,7 @@
method_restricted = 1;
t = reqs[x].requirement;
- w = ap_getword(r->pool, &t, ' ');
+ w = ap_getword_white(r->pool, &t);
if (!strcmp(w, "valid-user"))
return OK;
if (!strcmp(w, "user")) {
1.34 +2 -2 apache-1.3/src/modules/standard/mod_auth_db.c
Index: mod_auth_db.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_auth_db.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- mod_auth_db.c 1998/09/19 12:12:36 1.33
+++ mod_auth_db.c 1998/10/03 15:11:52 1.34
@@ -281,7 +281,7 @@
continue;
t = reqs[x].requirement;
- w = ap_getword(r->pool, &t, ' ');
+ w = ap_getword_white(r->pool, &t);
if (!strcmp(w, "group") && sec->auth_dbgrpfile) {
const char *orig_groups, *groups;
@@ -298,7 +298,7 @@
}
orig_groups = groups;
while (t[0]) {
- w = ap_getword(r->pool, &t, ' ');
+ w = ap_getword_white(r->pool, &t);
groups = orig_groups;
while (groups[0]) {
v = ap_getword(r->pool, &groups, ',');
1.40 +2 -2 apache-1.3/src/modules/standard/mod_auth_dbm.c
Index: mod_auth_dbm.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_auth_dbm.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- mod_auth_dbm.c 1998/08/06 17:30:55 1.39
+++ mod_auth_dbm.c 1998/10/03 15:11:53 1.40
@@ -266,7 +266,7 @@
continue;
t = reqs[x].requirement;
- w = ap_getword(r->pool, &t, ' ');
+ w = ap_getword_white(r->pool, &t);
if (!strcmp(w, "group") && sec->auth_dbmgrpfile) {
const char *orig_groups, *groups;
@@ -283,7 +283,7 @@
}
orig_groups = groups;
while (t[0]) {
- w = ap_getword(r->pool, &t, ' ');
+ w = ap_getword_white(r->pool, &t);
groups = orig_groups;
while (groups[0]) {
v = ap_getword(r->pool, &groups, ',');
