httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n..@apache.org
Subject svn commit: r541926 - /httpd/httpd/trunk/modules/generators/mod_cgi.c
Date Sat, 26 May 2007 18:50:18 GMT
Author: niq
Date: Sat May 26 11:50:18 2007
New Revision: 541926

URL: http://svn.apache.org/viewvc?view=rev&rev=541926
Log:
PR#39710 - badly broken errordocuments for CGI

We've just had another duplicate report of this on bugzilla.
We've got a simple patch, and people asking WTF is going on
with inaction.  Noone seems clear on why the patch shouldn't
be applied (http://marc.info/?l=apache-httpd-dev&m=117760311129386&w=2).

Modified:
    httpd/httpd/trunk/modules/generators/mod_cgi.c

Modified: httpd/httpd/trunk/modules/generators/mod_cgi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/generators/mod_cgi.c?view=diff&rev=541926&r1=541925&r2=541926
==============================================================================
--- httpd/httpd/trunk/modules/generators/mod_cgi.c (original)
+++ httpd/httpd/trunk/modules/generators/mod_cgi.c Sat May 26 11:50:18 2007
@@ -929,18 +929,7 @@
         int ret;
 
         if ((ret = ap_scan_script_header_err_brigade(r, bb, sbuf))) {
-            ret = log_script(r, conf, ret, dbuf, sbuf, bb, script_err);
-
-            /* Set our status. */
-            r->status = ret;
-
-            /* Pass EOS bucket down the filter chain. */
-            apr_brigade_cleanup(bb);
-            b = apr_bucket_eos_create(c->bucket_alloc);
-            APR_BRIGADE_INSERT_TAIL(bb, b);
-            ap_pass_brigade(r->output_filters, bb);
-
-            return ret;
+            return log_script(r, conf, ret, dbuf, sbuf, bb, script_err);
         }
 
         location = apr_table_get(r->headers_out, "Location");



Mime
View raw message