Commit f27caa6f authored by Yann Ylavic's avatar Yann Ylavic
Browse files

Follow up to r1773761: we need to check both ap_send_error_response() and... 

Follow up to r1773761: we need to check both ap_send_error_response() and internal redirect recursions.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1773862 13f79535-47bb-0310-9956-ffa450edef68
parent 4d381e94

modules/http/http_filters.c

+4 −4
Original line number Diff line number Diff line
@@ -1249,11 +1249,11 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_http_header_filter(ap_filter_t *f, 
        apr_table_clear(r->headers_out);

        apr_table_clear(r->err_headers_out);



        /* Don't try ErrorDocument if we are (internal-)redirect-ed already,

         * otherwise we can end up in infinite recursion, better fall through

         * with 500, minimal headers and an empty body (EOS only).

        /* Don't try ErrorDocument if we are (internal-)redirect-ed or dying

         * already, otherwise we can end up in infinite recursion, better fall

         * through with 500, minimal headers and an empty body (EOS only).

         */

        if (!dying) {

        if (ap_is_initial_req(r) && !dying) {

            apr_brigade_cleanup(b);

            apr_pool_userdata_setn("true", "http_header_filter_dying",

                                   apr_pool_cleanup_null, r->pool);