stas 2004/09/09 08:17:21
Modified: src/modules/perl modperl_filter.c
Log:
log the filter failure error message only once
Revision Changes Path
1.98 +5 -12 modperl-2.0/src/modules/perl/modperl_filter.c
Index: modperl_filter.c
===================================================================
RCS file: /home/cvs/modperl-2.0/src/modules/perl/modperl_filter.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -u -r1.97 -r1.98
--- modperl_filter.c 9 Sep 2004 15:08:03 -0000 1.97
+++ modperl_filter.c 9 Sep 2004 15:17:20 -0000 1.98
@@ -66,18 +66,11 @@
); \
}
-/* Restore previously saved value of $@, warning if a new error was
- * generated */
+/* Restore previously saved value of [EMAIL PROTECTED] if there was a filter error
+ * it'd have been logged by modperl_errsv call following
+ * modperl_callback */
#define MP_FILTER_RESTORE_ERRSV(tmpsv) \
if (tmpsv) { \
- if (SvTRUE(ERRSV)) { \
- Perl_warn(aTHX_ "%s", SvPVX(ERRSV)); \
- MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT \
- "error: %s", \
- MP_FILTER_NAME(filter->f), \
- SvPVX(ERRSV) \
- ); \
- } \
sv_setsv(ERRSV, tmpsv); \
MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT \
"Restoring [EMAIL PROTECTED]'%s'", \
@@ -542,13 +535,13 @@
"Apache::Filter");
}
+ MP_FILTER_RESTORE_ERRSV(errsv);
+
MP_INTERP_PUTBACK(interp);
MP_TRACE_f(MP_FUNC, MP_FILTER_NAME_FORMAT
"return: %d\n", modperl_handler_name(handler), status);
- MP_FILTER_RESTORE_ERRSV(errsv);
-
return status;
}
