Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 95434 invoked from network); 30 Mar 2005 22:58:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 30 Mar 2005 22:58:12 -0000 Received: (qmail 18054 invoked by uid 500); 30 Mar 2005 22:58:11 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 18030 invoked by uid 500); 30 Mar 2005 22:58:10 -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: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 18016 invoked by uid 99); 30 Mar 2005 22:58:10 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 30 Mar 2005 14:58:10 -0800 Received: (qmail 95427 invoked by uid 65534); 30 Mar 2005 22:58:09 -0000 Message-ID: <20050330225809.95424.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Wed, 30 Mar 2005 22:58:09 -0000 Subject: svn commit: r159533 - httpd/httpd/trunk/modules/proxy/mod_proxy_http.c To: cvs@httpd.apache.org From: striker@apache.org X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: striker Date: Wed Mar 30 14:58:08 2005 New Revision: 159533 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D159533 Log: * modules/proxy/mod_proxy_http.c (ap_proxy_http_process_response): When there are only headers and no body, give the remainder of the output filters a chance by pushing an EOS buck= et through the filter stack. Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_http.c Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_http.c URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/proxy/mod_prox= y_http.c?view=3Ddiff&r1=3D159532&r2=3D159533 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- httpd/httpd/trunk/modules/proxy/mod_proxy_http.c (original) +++ httpd/httpd/trunk/modules/proxy/mod_proxy_http.c Wed Mar 30 14:58:08 20= 05 @@ -1331,9 +1331,21 @@ } ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: end body send"); - } else { + } + else { ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server, "proxy: header only"); + + /* strikerXXX: pass EOS bucket down the filter chain? */ + e =3D apr_bucket_eos_create(c->bucket_alloc); + APR_BRIGADE_INSERT_TAIL(bb, e); + if (ap_pass_brigade(r->output_filters, bb) !=3D APR_SUCCESS + || c->aborted) { + /* Ack! Phbtt! Die! User aborted! */ + backend->close =3D 1; /* this causes socket close below */ + } + + apr_brigade_cleanup(bb); } } while (interim_response); =20