diff options
| author | Yann Ylavic <ylavic@apache.org> | 2020-05-31 17:04:13 +0000 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2020-05-31 17:04:13 +0000 |
| commit | 686b9492193fc7dd7f318f7b1b194358780d9070 (patch) | |
| tree | cb998121b0c57f986093c926f492575e9bacdb63 /server/util_filter.c | |
| parent | 488741fcf6fe98faa0bf97163d575b96480dc4b7 (diff) | |
| download | httpd-686b9492193fc7dd7f318f7b1b194358780d9070.tar.gz | |
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.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1878332 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/util_filter.c')
| -rw-r--r-- | server/util_filter.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/server/util_filter.c b/server/util_filter.c index 649615bf80..c537b00f73 100644 --- a/server/util_filter.c +++ b/server/util_filter.c @@ -950,10 +950,11 @@ AP_DECLARE(apr_status_t) ap_filter_setaside_brigade(ap_filter_t *f, 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(ap_filter_t *f, 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_reinstate_brigade(ap_filter_t *f, 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) { |