dgaudet 98/01/31 18:33:42
Modified: src CHANGES http_core.c mod_asis.c mod_dir.c
mod_include.c mod_info.c
Log:
set r->allowed properly
Revision Changes Path
1.289 +3 -0 apache-1.2/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.2/src/CHANGES,v
retrieving revision 1.288
retrieving revision 1.289
diff -u -r1.288 -r1.289
--- CHANGES 1998/01/30 14:45:45 1.288
+++ CHANGES 1998/02/01 02:33:36 1.289
@@ -1,5 +1,8 @@
Changes with Apache 1.2.6
+ *) Set r->allowed properly in mod_asis.c, mod_dir.c, mod_info.c,
+ and mod_include.c. [Dean Gaudet]
+
*) Variable 'cwd' was being used pointlessly before being set.
[Ken Coar] PR#1738
1.83 +1 -2 apache-1.2/src/http_core.c
Index: http_core.c
===================================================================
RCS file: /export/home/cvs/apache-1.2/src/http_core.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- http_core.c 1998/01/30 09:13:55 1.82
+++ http_core.c 1998/02/01 02:33:36 1.83
@@ -1332,8 +1332,7 @@
if ((errstatus = discard_request_body(r)) != OK)
return errstatus;
- r->allowed |= (1 << M_GET);
- r->allowed |= (1 << M_OPTIONS);
+ r->allowed |= (1 << M_GET) | (1 << M_OPTIONS);
if (r->method_number == M_INVALID) {
log_printf(r->server, "Invalid method in request %s", r->the_request);
1.14 +1 -0 apache-1.2/src/mod_asis.c
Index: mod_asis.c
===================================================================
RCS file: /export/home/cvs/apache-1.2/src/mod_asis.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mod_asis.c 1997/04/06 07:43:40 1.13
+++ mod_asis.c 1998/02/01 02:33:37 1.14
@@ -63,6 +63,7 @@
FILE *f;
char *location;
+ r->allowed |= (1 << M_GET);
if (r->method_number != M_GET) return DECLINED;
if (r->finfo.st_mode == 0) {
log_reason("File does not exist", r->filename, r);
1.28 +1 -0 apache-1.2/src/mod_dir.c
Index: mod_dir.c
===================================================================
RCS file: /export/home/cvs/apache-1.2/src/mod_dir.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- mod_dir.c 1998/01/30 09:14:04 1.27
+++ mod_dir.c 1998/02/01 02:33:38 1.28
@@ -872,6 +872,7 @@
if (error_notfound)
return error_notfound;
+ r->allowed |= (1 << M_GET);
if (r->method_number != M_GET) return NOT_IMPLEMENTED;
/* OK, nothing easy. Trot out the heavy artillery... */
1.35 +1 -0 apache-1.2/src/mod_include.c
Index: mod_include.c
===================================================================
RCS file: /export/home/cvs/apache-1.2/src/mod_include.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- mod_include.c 1998/01/30 09:14:05 1.34
+++ mod_include.c 1998/02/01 02:33:38 1.35
@@ -2204,6 +2204,7 @@
if (!(allow_options(r) & OPT_INCLUDES)) {
return DECLINED;
}
+ r->allowed |= (1 << M_GET);
if (r->method_number != M_GET) {
return DECLINED;
}
1.18 +5 -1 apache-1.2/src/mod_info.c
Index: mod_info.c
===================================================================
RCS file: /export/home/cvs/apache-1.2/src/mod_info.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mod_info.c 1998/01/30 09:14:06 1.17
+++ mod_info.c 1998/02/01 02:33:39 1.18
@@ -282,11 +282,15 @@
extern char server_root[MAX_STRING_LEN];
extern char server_confname[MAX_STRING_LEN];
+ r->allowed |= (1 << M_GET);
+ if (r->method_number != M_GET)
+ return DECLINED;
+
r->content_type = "text/html";
send_http_header(r);
if(r->header_only) {
return 0;
- }
+ }
hard_timeout("send server info", r);
rputs("<html><head><title>Server Information</title></head>\n",r);
