Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 78378 invoked from network); 13 Jan 2007 01:03:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 13 Jan 2007 01:03:50 -0000 Received: (qmail 5002 invoked by uid 500); 13 Jan 2007 01:03:56 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 4952 invoked by uid 500); 13 Jan 2007 01:03:56 -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 4938 invoked by uid 99); 13 Jan 2007 01:03:56 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Jan 2007 17:03:56 -0800 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 [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 12 Jan 2007 17:03:49 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 8F4001A981A; Fri, 12 Jan 2007 17:02:47 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r495808 - /httpd/httpd/trunk/modules/proxy/mod_proxy_http.c Date: Sat, 13 Jan 2007 01:02:47 -0000 To: cvs@httpd.apache.org From: jerenkrantz@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070113010247.8F4001A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jerenkrantz Date: Fri Jan 12 17:02:46 2007 New Revision: 495808 URL: http://svn.apache.org/viewvc?view=rev&rev=495808 Log: Re-add "proxy-sendextracrlf" first introduced in r157478 and silently removed in r219224. 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/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_http.c?view=diff&rev=495808&r1=495807&r2=495808 ============================================================================== --- httpd/httpd/trunk/modules/proxy/mod_proxy_http.c (original) +++ httpd/httpd/trunk/modules/proxy/mod_proxy_http.c Fri Jan 12 17:02:46 2007 @@ -309,6 +309,11 @@ 5, bucket_alloc); APR_BRIGADE_INSERT_TAIL(bb, e); + if (apr_table_get(r->subprocess_env, "proxy-sendextracrlf")) { + e = apr_bucket_immortal_create(ASCII_CRLF, 2, bucket_alloc); + APR_BRIGADE_INSERT_TAIL(bb, e); + } + /* Now we have headers-only, or the chunk EOS mark; flush it */ status = pass_brigade(bucket_alloc, r, p_conn, origin, bb, 1); return status; @@ -352,6 +357,11 @@ /* We can't pass this EOS to the output_filters. */ e = APR_BRIGADE_LAST(input_brigade); apr_bucket_delete(e); + + if (apr_table_get(r->subprocess_env, "proxy-sendextracrlf")) { + e = apr_bucket_immortal_create(ASCII_CRLF, 2, bucket_alloc); + APR_BRIGADE_INSERT_TAIL(input_brigade, e); + } } /* C-L < bytes streamed?!? @@ -546,6 +556,10 @@ APR_BRIGADE_CONCAT(header_brigade, body_brigade); if (tmpfile) { apr_brigade_insert_file(header_brigade, tmpfile, 0, fsize, p); + } + if (apr_table_get(r->subprocess_env, "proxy-sendextracrlf")) { + e = apr_bucket_immortal_create(ASCII_CRLF, 2, bucket_alloc); + APR_BRIGADE_INSERT_TAIL(header_brigade, e); } /* This is all a single brigade, pass with flush flagged */ status = pass_brigade(bucket_alloc, r, p_conn, origin, header_brigade, 1);