Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 78044 invoked from network); 2 Apr 2006 23:36:51 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 2 Apr 2006 23:36:51 -0000 Received: (qmail 28222 invoked by uid 500); 2 Apr 2006 23:36:50 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 28023 invoked by uid 500); 2 Apr 2006 23:36:50 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 28012 invoked by uid 99); 2 Apr 2006 23:36:50 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Apr 2006 16:36:50 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sun, 02 Apr 2006 16:36:49 -0700 Received: (qmail 77946 invoked by uid 65534); 2 Apr 2006 23:36:29 -0000 Message-ID: <20060402233629.77945.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r390922 - in /httpd/httpd/trunk: CHANGES server/core.c Date: Sun, 02 Apr 2006 23:36:28 -0000 To: cvs@httpd.apache.org From: trawick@apache.org X-Mailer: svnmailer-1.0.7 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: trawick Date: Sun Apr 2 16:36:27 2006 New Revision: 390922 URL: http://svn.apache.org/viewcvs?rev=390922&view=rev Log: Default handler: Don't return output filter apr_status_t values. PR: 31759 Helped by: Ruediger Pluem, Joe Orton Modified: httpd/httpd/trunk/CHANGES httpd/httpd/trunk/server/core.c Modified: httpd/httpd/trunk/CHANGES URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/CHANGES?rev=390922&r1=390921&r2=390922&view=diff ============================================================================== --- httpd/httpd/trunk/CHANGES [utf-8] (original) +++ httpd/httpd/trunk/CHANGES [utf-8] Sun Apr 2 16:36:27 2006 @@ -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 ] Modified: httpd/httpd/trunk/server/core.c URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/server/core.c?rev=390922&r1=390921&r2=390922&view=diff ============================================================================== --- httpd/httpd/trunk/server/core.c (original) +++ httpd/httpd/trunk/server/core.c Sun Apr 2 16:36:27 2006 @@ -3596,6 +3596,20 @@ 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) {