Commit d99724e7 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

Default handler: Don't return output filter apr_status_t values. 

PR: 31759
Helped by: Ruediger Pluem, Joe Orton


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

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 
Changes with Apache 2.3.0

  [Remove entries to the current 2.0 and 2.2 section below, when backported]









  *) Default handler: Don't return output filter apr_status_t values.









     PR 31759.  [Jeff Trawick, Ruediger Pluem, Joe Orton]

















  *) Event MPM: Fill in the scoreboard's tid field. PR 38736.









     [Chris Darroch <chrisd pearsoncmg.com>]










































server/core.c



+14
−0



























Changes for server/core.c: 14 added lines, 0 removed lines.



Original line number
Diff line number
Diff line







@@ -3596,6 +3596,20 @@ static int default_handler(request_rec *r)







        APR_BRIGADE_INSERT_TAIL(bb, e);



















        return ap_pass_brigade(r->output_filters, bb);









        status = ap_pass_brigade(r->output_filters, bb);









        if (status == APR_SUCCESS









            || r->status != HTTP_OK









            || c->aborted) {









            return OK;









        }









        else {









            /* no way to know what type of error occurred */









            ap_log_rerror(APLOG_MARK, APLOG_DEBUG, status, r,









                          "default_handler: ap_pass_brigade returned %i",









                          status);









            return HTTP_INTERNAL_SERVER_ERROR;









        }



















    }









    else {              /* unusual method (not GET or POST) */









        if (r->method_number == M_INVALID) {