coar 98/10/16 00:04:46
Modified: src CHANGES
src/main http_core.c http_protocol.c
src/include http_core.h
Log:
Revert the Options DebugServerErrors patch. Not the right
solution..
Revision Changes Path
1.1109 +1 -2 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1108
retrieving revision 1.1109
diff -u -r1.1108 -r1.1109
--- CHANGES 1998/10/15 08:01:52 1.1108
+++ CHANGES 1998/10/16 07:04:41 1.1109
@@ -2,8 +2,7 @@
*) Fix per-directory config merging for cases in which a 500 error
is encountered in an .htaccess file somewhere down the tree.
- Also make display of error details on 500 errors a customisable
- offense. [Ken Coar] PR#2409, 3173
+ [Ken Coar] PR#2409
*) Minor performance improvement to ap_escape_html(). [Roy Fielding]
1.234 +0 -3 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.233
retrieving revision 1.234
diff -u -r1.233 -r1.234
--- http_core.c 1998/10/15 07:58:23 1.233
+++ http_core.c 1998/10/16 07:04:43 1.234
@@ -994,9 +994,6 @@
else if (!strcasecmp(w, "RunScripts")) { /* AI backcompat. Yuck */
opt = OPT_MULTI|OPT_EXECCGI;
}
- else if (!strcasecmp(w, "DebugServerErrors")) {
- opt = OPT_DEBUG500;
- }
else if (!strcasecmp(w, "None")) {
opt = OPT_NONE;
}
1.245 +1 -3 apache-1.3/src/main/http_protocol.c
Index: http_protocol.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/http_protocol.c,v
retrieving revision 1.244
retrieving revision 1.245
diff -u -r1.244 -r1.245
--- http_protocol.c 1998/10/15 07:58:24 1.244
+++ http_protocol.c 1998/10/16 07:04:44 1.245
@@ -2385,9 +2385,7 @@
" and inform them of the time the error occurred,\n"
"and anything you might have done that may have\n"
"caused the error.<P>\n", NULL);
- if ((ap_allow_options(r) & OPT_DEBUG500)
- && (error_notes = ap_table_get(r->notes, "error-notes"))
- != NULL) {
+ if ((error_notes = ap_table_get(r->notes, "error-notes")) != NULL) {
ap_bvputs(fd, error_notes, "<P>\n", NULL);
}
break;
1.50 +1 -2 apache-1.3/src/include/http_core.h
Index: http_core.h
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/include/http_core.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- http_core.h 1998/10/15 07:58:23 1.49
+++ http_core.h 1998/10/16 07:04:45 1.50
@@ -83,7 +83,6 @@
#define OPT_INCNOEXEC 32
#define OPT_SYM_OWNER 64
#define OPT_MULTI 128
-#define OPT_DEBUG500 256
#define OPT_ALL (OPT_INDEXES|OPT_INCLUDES|OPT_SYM_LINKS|OPT_EXECCGI)
/* options for get_remote_host() */
@@ -166,7 +165,7 @@
/* Per-directory configuration */
-typedef unsigned int allow_options_t;
+typedef unsigned char allow_options_t;
typedef unsigned char overrides_t;
typedef struct {
