You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2020/05/31 17:04:13 UTC
svn commit: r1878332 - /httpd/httpd/trunk/server/util_filter.c
Author: ylavic
Date: Sun May 31 17:04:13 2020
New Revision: 1878332
URL: http://svn.apache.org/viewvc?rev=1878332&view=rev
Log:
util_filter: both directions for setaside/reinstate/adapt logging.
ap_filter_{setaside,reinstate,adopt}() can be called by both input and output
filters, so adapt confusing (always out) logging.
Modified:
httpd/httpd/trunk/server/util_filter.c
Modified: httpd/httpd/trunk/server/util_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_filter.c?rev=1878332&r1=1878331&r2=1878332&view=diff
==============================================================================
--- httpd/httpd/trunk/server/util_filter.c (original)
+++ httpd/httpd/trunk/server/util_filter.c Sun May 31 17:04:13 2020
@@ -950,10 +950,11 @@ AP_DECLARE(apr_status_t) ap_filter_setas
struct ap_filter_private *fp = f->priv;
ap_log_cerror(APLOG_MARK, APLOG_TRACE6, 0, f->c,
- "setaside %s brigade to %s brigade in '%s' output filter",
+ "setaside %s brigade to %s brigade in '%s' %sput filter",
APR_BRIGADE_EMPTY(bb) ? "empty" : "full",
(!fp->bb || APR_BRIGADE_EMPTY(fp->bb)) ? "empty" : "full",
- f->frec->name);
+ f->frec->name,
+ f->frec->direction == AP_FILTER_INPUT ? "in" : "out");
/* This API is not suitable for request filters */
if (f->frec->ftype < AP_FTYPE_CONNECTION) {
@@ -1041,10 +1042,11 @@ AP_DECLARE(void) ap_filter_adopt_brigade
struct ap_filter_private *fp = f->priv;
ap_log_cerror(APLOG_MARK, APLOG_TRACE6, 0, f->c,
- "adopt %s brigade to %s brigade in '%s' output filter",
+ "adopt %s brigade to %s brigade in '%s' %sput filter",
APR_BRIGADE_EMPTY(bb) ? "empty" : "full",
(!fp->bb || APR_BRIGADE_EMPTY(fp->bb)) ? "empty" : "full",
- f->frec->name);
+ f->frec->name,
+ f->frec->direction == AP_FILTER_INPUT ? "in" : "out");
if (!APR_BRIGADE_EMPTY(bb)) {
ap_filter_prepare_brigade(f);
@@ -1063,10 +1065,11 @@ AP_DECLARE(apr_status_t) ap_filter_reins
core_server_config *conf;
ap_log_cerror(APLOG_MARK, APLOG_TRACE6, 0, f->c,
- "reinstate %s brigade to %s brigade in '%s' output filter",
+ "reinstate %s brigade to %s brigade in '%s' %sput filter",
(!fp->bb || APR_BRIGADE_EMPTY(fp->bb) ? "empty" : "full"),
(APR_BRIGADE_EMPTY(bb) ? "empty" : "full"),
- f->frec->name);
+ f->frec->name,
+ f->frec->direction == AP_FILTER_INPUT ? "in" : "out");
/* This API is not suitable for request filters */
if (f->frec->ftype < AP_FTYPE_CONNECTION) {