From: Bradley Nicholes <bnicholes@apache.org>
Date: Tue, 7 Dec 2004 19:04:22 +0000 (+0000)
Subject: Revert patch r104923.  This patch doesn't actually fix bug 18757 and
X-Git-Tag: 2.1.2~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=694a529c09b8138fda8c9c4ccd8f0eb8609d0c2e;p=thirdparty%2Fapache%2Fhttpd.git

Revert patch r104923.  This patch doesn't actually fix bug 18757 and
breaks TLS upgrade functionality.  Also, removing the content length for
HEAD requests is being handled in ap_http_header_filter().


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@110141 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/protocol.c b/server/protocol.c
index 6b46d89eb37..152f496aec6 100644
--- a/server/protocol.c
+++ b/server/protocol.c
@@ -1232,11 +1232,8 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_content_length_filter(
      *
      * We can only set a C-L in the response header if we haven't already
      * sent any buckets on to the next output filter for this request.
-     *
-     * Also check against cases of zero bytes sent, to avoid a bogus
-     * C-L on HEAD requests, or no-body GETs like 204s.
      */
-    if (ctx->data_sent == 0 && eos && r->bytes_sent > 0 ) {
+    if (ctx->data_sent == 0 && eos) {
         ap_set_content_length(r, r->bytes_sent);
     }