dgaudet 98/01/29 12:36:15
Modified: src/main http_core.c
src/modules/standard mod_asis.c mod_autoindex.c
mod_include.c mod_info.c mod_status.c
Log:
Clean up r->allowed handling, and r->method_number handling in some
cases.
Revision Changes Path
1.151 +1 -2 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.150
retrieving revision 1.151
diff -u -r1.150 -r1.151
--- http_core.c 1998/01/26 19:50:12 1.150
+++ http_core.c 1998/01/29 20:36:08 1.151
@@ -1869,8 +1869,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) {
aplog_error(APLOG_MARK, APLOG_NOERRNO|APLOG_ERR, r->server,
1.24 +1 -0 apache-1.3/src/modules/standard/mod_asis.c
Index: mod_asis.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_asis.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- mod_asis.c 1998/01/07 16:46:43 1.23
+++ mod_asis.c 1998/01/29 20:36:10 1.24
@@ -64,6 +64,7 @@
FILE *f;
char *location;
+ r->allowed |= (1 << M_GET);
if (r->method_number != M_GET)
return DECLINED;
if (r->finfo.st_mode == 0) {
1.65 +1 -0 apache-1.3/src/modules/standard/mod_autoindex.c
Index: mod_autoindex.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_autoindex.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- mod_autoindex.c 1998/01/28 11:33:26 1.64
+++ mod_autoindex.c 1998/01/29 20:36:11 1.65
@@ -1132,6 +1132,7 @@
&autoindex_module);
int allow_opts = allow_options(r);
+ r->allowed |= (1 << M_GET);
if (r->method_number != M_GET)
return DECLINED;
1.70 +1 -0 apache-1.3/src/modules/standard/mod_include.c
Index: mod_include.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_include.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- mod_include.c 1998/01/28 11:33:29 1.69
+++ mod_include.c 1998/01/29 20:36:12 1.70
@@ -2240,6 +2240,7 @@
if (!(allow_options(r) & OPT_INCLUDES)) {
return DECLINED;
}
+ r->allowed |= (1 << M_GET);
if (r->method_number != M_GET) {
return DECLINED;
}
1.35 +4 -0 apache-1.3/src/modules/standard/mod_info.c
Index: mod_info.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_info.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- mod_info.c 1998/01/26 18:24:38 1.34
+++ mod_info.c 1998/01/29 20:36:13 1.35
@@ -362,6 +362,10 @@
info_cfg_lines *mod_info_cfg_srm = NULL;
info_cfg_lines *mod_info_cfg_access = NULL;
+ 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) {
1.72 +2 -2 apache-1.3/src/modules/standard/mod_status.c
Index: mod_status.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/modules/standard/mod_status.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- mod_status.c 1998/01/26 18:24:39 1.71
+++ mod_status.c 1998/01/29 20:36:13 1.72
@@ -237,9 +237,9 @@
"Server status unavailable in inetd mode");
return HTTP_NOT_IMPLEMENTED;
}
- r->allowed = (1 << M_GET) | (1 << M_TRACE);
+ r->allowed = (1 << M_GET);
if (r->method_number != M_GET)
- return HTTP_METHOD_NOT_ALLOWED;
+ return DECLINED;
r->content_type = "text/html";
