Mailing List Archive

svn commit: r1875988 - /httpd/httpd/trunk/modules/ssl/ssl_engine_io.c
Author: jorton
Date: Wed Apr 1 07:55:22 2020
New Revision: 1875988

URL: http://svn.apache.org/viewvc?rev=1875988&view=rev
Log:
* modules/ssl/ssl_engine_io.c (ssl_io_filter_coalesce): Treat zero-length
buckets consistently (ignore them) after a morphing bucket morphs.

Modified:
httpd/httpd/trunk/modules/ssl/ssl_engine_io.c

Modified: httpd/httpd/trunk/modules/ssl/ssl_engine_io.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ssl/ssl_engine_io.c?rev=1875988&r1=1875987&r2=1875988&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ssl/ssl_engine_io.c (original)
+++ httpd/httpd/trunk/modules/ssl/ssl_engine_io.c Wed Apr 1 07:55:22 2020
@@ -1766,8 +1766,12 @@ static apr_status_t ssl_io_filter_coales
else {
rv = apr_bucket_split(e, COALESCE_BYTES - (buffered + bytes));
}
-
- if (rv == APR_SUCCESS) {
+
+ if (rv == APR_SUCCESS && e->length == 0) {
+ /* As above, don't count in the prefix if the bucket is
+ * now zero-length. */
+ }
+ else if (rv == APR_SUCCESS) {
ap_log_cerror(APLOG_MARK, APLOG_TRACE4, 0, f->c,
"coalesce: adding %" APR_SIZE_T_FMT " bytes "
"from split bucket, adding %" APR_SIZE_T_FMT,