mirror of
https://github.com/apache/httpd.git
synced 2025-08-08 15:02:10 +03:00
Cleanup the error bucket code a bit. This uses the error bucket directly
instead of using ap_bucket_read. It also lets ap_die handle the fact that the filter returned the error. Submitted by: Greg Stein git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87867 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
@@ -1085,6 +1085,10 @@ AP_DECLARE(void) ap_die(int type, request_rec *r)
|
||||
char *custom_response = ap_response_code_string(r, error_index);
|
||||
int recursive_error = 0;
|
||||
|
||||
if (type == AP_FILTER_ERROR) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (type == DONE) {
|
||||
ap_finalize_request_protocol(r);
|
||||
return;
|
||||
@@ -1351,7 +1355,7 @@ static void process_request_internal(request_rec *r)
|
||||
*/
|
||||
ap_run_insert_filter(r);
|
||||
|
||||
if ((access_status = ap_invoke_handler(r)) != 0 && access_status != -3) {
|
||||
if ((access_status = ap_invoke_handler(r)) != 0) {
|
||||
ap_die(access_status, r);
|
||||
return;
|
||||
}
|
||||
|
Reference in New Issue
Block a user