summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Orton <jorton@apache.org>2020-03-30 15:00:12 +0200
committerJoe Orton <jorton@apache.org>2020-03-30 15:00:12 +0200
commit005c3eeb618c57bf23a4233593a2f8ccdcf4ddf9 (patch)
tree700099df3e1f0d9e975ffc4b2122d97bd6d55e6a
parentmod_ssl: Extend the coalescing filter to avoid sending HTTP response (diff)
downloadapache2-005c3eeb618c57bf23a4233593a2f8ccdcf4ddf9.tar.xz
apache2-005c3eeb618c57bf23a4233593a2f8ccdcf4ddf9.zip
Add lognos. [skip ci].
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1875879 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--docs/log-message-tags/next-number2
-rw-r--r--modules/ssl/ssl_engine_io.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/log-message-tags/next-number b/docs/log-message-tags/next-number
index 63b3cf1c42..f43722f0c9 100644
--- a/docs/log-message-tags/next-number
+++ b/docs/log-message-tags/next-number
@@ -1 +1 @@
-10232
+10234
diff --git a/modules/ssl/ssl_engine_io.c b/modules/ssl/ssl_engine_io.c
index a20434ed47..997df89728 100644
--- a/modules/ssl/ssl_engine_io.c
+++ b/modules/ssl/ssl_engine_io.c
@@ -1744,7 +1744,7 @@ static apr_status_t ssl_io_filter_coalesce(ap_filter_t *f,
rv = apr_bucket_read(e, &discard, &ignore, APR_NONBLOCK_READ);
if (rv != APR_SUCCESS && !APR_STATUS_IS_EAGAIN(rv)) {
- ap_log_cerror(APLOG_MARK, APLOG_ERR, rv, f->c, APLOGNO()
+ ap_log_cerror(APLOG_MARK, APLOG_ERR, rv, f->c, APLOGNO(10232)
"coalesce failed to read from data bucket");
}
}
@@ -1761,7 +1761,7 @@ static apr_status_t ssl_io_filter_coalesce(ap_filter_t *f,
e = APR_BUCKET_NEXT(e);
}
else if (rv != APR_ENOTIMPL) {
- ap_log_cerror(APLOG_MARK, APLOG_ERR, rv, f->c, APLOGNO()
+ ap_log_cerror(APLOG_MARK, APLOG_ERR, rv, f->c, APLOGNO(10233)
"coalesce: failed to split data bucket");
return AP_FILTER_ERROR;
}