coar 98/09/17 21:29:08
Modified: . STATUS
src CHANGES
src/main http_log.c
Log:
In ap_log_rerror(), set the "error-notes" special entry in
r->notes to the error message, unless it's already set to something
else. This makes the actual error available to ErrorDocument
scripts and the like, while allowing it to be overridden by
storing a "" value in that entry.
Reviewed by: Doug MacEachern
Revision Changes Path
1.469 +0 -6 apache-1.3/STATUS
Index: STATUS
===================================================================
RCS file: /export/home/cvs/apache-1.3/STATUS,v
retrieving revision 1.468
retrieving revision 1.469
diff -u -r1.468 -r1.469
--- STATUS 1998/09/17 16:30:46 1.468
+++ STATUS 1998/09/18 04:29:05 1.469
@@ -63,12 +63,6 @@
Available Patches:
- * Ken's patch to set *ERROR_NOTES by default in ap_log_rerror()
- Avoids special-casing the setting everywhere, and allows sensitive
- error_log-only messages to be kept out of *ERROR_NOTES.
- Message-ID: <[EMAIL PROTECTED]>
- Status: Ken +1, Doug +1
-
* Patches for the DSO/mod_perl problem (see below for description):
Doug MacEachern's "[PATCH] fix for dso/mod_perl"
1.1068 +3 -0 apache-1.3/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/CHANGES,v
retrieving revision 1.1067
retrieving revision 1.1068
diff -u -r1.1067 -r1.1068
--- CHANGES 1998/09/17 20:23:47 1.1067
+++ CHANGES 1998/09/18 04:29:06 1.1068
@@ -1,5 +1,8 @@
Changes with Apache 1.3.2
+ *) When using ap_log_rerror(), make the error message available to the
+ *ERROR_NOTES envariables by default. [Ken Coar]
+
*) BS2000 platform only: get rid of the nasty BS2000AuthFile.
You now must define a BS2000Account name for the server User.
This has fewer security implications than the old approach.
1.67 +8 -2 apache-1.3/src/main/http_log.c
Index: http_log.c
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/main/http_log.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- http_log.c 1998/09/15 00:15:18 1.66
+++ http_log.c 1998/09/18 04:29:07 1.67
@@ -433,13 +433,19 @@
va_end(args);
}
-API_EXPORT(void) ap_log_rerror (const char *file, int line, int level,
- const request_rec *r, const char *fmt, ...)
+API_EXPORT(void) ap_log_rerror(const char *file, int line, int level,
+ const request_rec *r, const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
log_error_core(file, line, level, r->server, r, fmt, args);
+ if (ap_table_get(r->notes, "error-notes") != NULL) {
+ char errstr[MAX_STRING_LEN];
+
+ ap_snprintf(errstr, sizeof(errstr), fmt, args);
+ ap_table_set(r->notes, "error-notes", errstr);
+ }
va_end(args);
}
