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 6b46d89eb37fd0af499854c2a508a201c7544b71..152f496aec6baf1b5dbd1baeef4697862dd99abd 100644 (file)
--- 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);
     }