Commit bb24a05d authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Merge r1775770 from trunk: 

pass along error buckets

In 2.4, they are generated by LimitRequestBody failures. trunk no 
longer uses error buckets in this path, but someone else could.

PR60375

Submitted By: Eric Covener,Lubos Uhliarik <luhliari  redhat.com>
Committed By: covener



Submitted by: covener
Reviewed/backported by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1775832 13f79535-47bb-0310-9956-ffa450edef68
parent 9c5d542b

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 


Changes with Apache 2.4.26



  *) mod_ext_filter: Don't interfere with "error buckets" issued by other

     modules. PR60375.  [Eric Covener, Lubos Uhliarik]



  *) mod_http2: fixes https://github.com/icing/mod_h2/issues/126 e.g. beam

     bucket lifetime handling when data is sent over temporary pools.

     [Stefan Eissing]

STATUS

+0 −6
Original line number Diff line number Diff line
@@ -119,12 +119,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



  *) ext_filter: Don't eat error buckets. PR60375

     trunk patch: http://svn.apache.org/r1775770

     2.4 patch: trunk works

     +1: covener, ylavic, jim

     





PATCHES PROPOSED TO BACKPORT FROM TRUNK:

  [ New proposals should be added at the end of the list ]

modules/filters/mod_ext_filter.c

+7 −0
Original line number Diff line number Diff line
@@ -757,6 +757,13 @@ static int ef_unified_filter(ap_filter_t *f, apr_bucket_brigade *bb) 
            break;

        }



        if (AP_BUCKET_IS_ERROR(b)) {

            apr_bucket *cpy;

            apr_bucket_copy(b, &cpy);

            APR_BRIGADE_INSERT_TAIL(bb_tmp, cpy);

            break;

        }



        rv = apr_bucket_read(b, &data, &len, APR_BLOCK_READ);

        if (rv != APR_SUCCESS) {

            ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01463) "apr_bucket_read()");