httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r393002 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS server/core.c
Date Mon, 10 Apr 2006 17:56:16 GMT
Author: trawick
Date: Mon Apr 10 10:56:14 2006
New Revision: 393002

URL: http://svn.apache.org/viewcvs?rev=393002&view=rev
Log:
Default handler: Don't return output filter apr_status_t values. 
PR:          31759
Reviewed by: rpleum, jim

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/server/core.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/CHANGES?rev=393002&r1=393001&r2=393002&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Mon Apr 10 10:56:14 2006
@@ -1,6 +1,8 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.2
 
+  *) Default handler: Don't return output filter apr_status_t values.
+     PR 31759.  [Jeff Trawick, Ruediger Pluem, Joe Orton]
 
 Changes with Apache 2.2.1
 

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/STATUS?rev=393002&r1=393001&r2=393002&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Mon Apr 10 10:56:14 2006
@@ -91,14 +91,6 @@
       -1 bnicholes - The authorization refactoring that was done is for 2.3 and above.
                      This can not be backported to 2.2.
 
-    * Default handler: Don't return output filter apr_status_t values. PR 31759.
-        Trunk version of patch:
-          http://svn.apache.org/viewcvs?rev=390922&view=rev
-          http://svn.apache.org/viewcvs?rev=391025&view=rev
-        2.2.x version of patch:
-          Trunk version works
-      +1: rpluem, trawick, jim
-
     * mod_proxy: Forward proxy requests created by mod_rewrite to the correct
                  backend server. PR 39253.
         Trunk version of patch:

Modified: httpd/httpd/branches/2.2.x/server/core.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/server/core.c?rev=393002&r1=393001&r2=393002&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/core.c (original)
+++ httpd/httpd/branches/2.2.x/server/core.c Mon Apr 10 10:56:14 2006
@@ -3698,7 +3698,19 @@
         e = apr_bucket_eos_create(c->bucket_alloc);
         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) {



Mime
View raw message