You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2021/10/12 08:27:15 UTC
svn commit: r1894152 - in /httpd/httpd/trunk:
docs/log-message-tags/next-number modules/filters/mod_deflate.c
Author: jorton
Date: Tue Oct 12 08:27:15 2021
New Revision: 1894152
URL: http://svn.apache.org/viewvc?rev=1894152&view=rev
Log:
* modules/filters/mod_deflate.c (deflate_out_filter): Catch
apr_bucket_read() errors.
Modified:
httpd/httpd/trunk/docs/log-message-tags/next-number
httpd/httpd/trunk/modules/filters/mod_deflate.c
Modified: httpd/httpd/trunk/docs/log-message-tags/next-number
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/log-message-tags/next-number?rev=1894152&r1=1894151&r2=1894152&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/log-message-tags/next-number (original)
+++ httpd/httpd/trunk/docs/log-message-tags/next-number Tue Oct 12 08:27:15 2021
@@ -1 +1 @@
-10298
+10299
Modified: httpd/httpd/trunk/modules/filters/mod_deflate.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_deflate.c?rev=1894152&r1=1894151&r2=1894152&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_deflate.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_deflate.c Tue Oct 12 08:27:15 2021
@@ -989,7 +989,12 @@ static apr_status_t deflate_out_filter(a
}
/* read */
- apr_bucket_read(e, &data, &len, APR_BLOCK_READ);
+ rv = apr_bucket_read(e, &data, &len, APR_BLOCK_READ);
+ if (rv) {
+ ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(10298)
+ "failed reading from %s bucket", e->type->name);
+ return rv;
+ }
if (!len) {
apr_bucket_delete(e);
continue;