Don't set bytes_sent to be 0 when r->assbackwards since this screws up

logging.

The content length filter seems to track bytes_sent properly regardless
of HTTP version.  The HTTP header filter knows not to send C-L (or any
headers) to this client.

showstoppers--;

(Also fix typo of my last name in CHANGES...)

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

diff --git a/CHANGES b/CHANGES
index ae0cdfb7597e18237b2a60bf2718821737e634f4..a110a6b89755677a136c3a9b9bb95159e4d47667 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 Changes with Apache 2.0.33-dev
 
+  *) Fix CustomLog bytes-sent with HTTP 0.9.  [Justin Erenkrantz]
+
   *) Prevent Apache from ignoring SIGHUP due to some lingering 1.3
      cruft in piped logs and rewrite child processes.
      [William Rowe]
@@ -14,7 +16,7 @@ Changes with Apache 2.0.33-dev
      [Ralf S. Engelschall, Cliff Woolley]
 
   *) mod-include: make it handle flush'es and fix the 'false-alarm'
-     [Justin Everkrantz, Brian Pane, Ian Holsman]
+     [Justin Erenkrantz, Brian Pane, Ian Holsman]
 
   *) ap_get_*_filter_handle() functions to allow 3rd party modules
      to lookup filter handles so they can bypass the filter name

diff --git a/STATUS b/STATUS
index 49acdc5a63286585f4fd991ff6f561194336670c..694bc7e35298cd4b9b147f0de2b70227d4dfcc1d 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -1,5 +1,5 @@
 APACHE 2.0 STATUS:                                              -*-text-*-
-Last modified at [$Date: 2002/02/27 03:17:26 $]
+Last modified at [$Date: 2002/02/27 03:55:31 $]
 
 Release:
 
@@ -83,8 +83,6 @@ FINAL RELEASE SHOWSTOPPERS:
     * Graceful restart is broken in the worker MPM.
         Message-ID: <m3g03tnrkv.fsf@rdu163-40-092.nc.rr.com>
 
-    * CustomLog records 0 for bytes-sent when HTTP level < 1.0.
-
 CURRENT VOTES:
 
     * Should we always build binaries statically unless otherwise

diff --git a/modules/http/http_protocol.c b/modules/http/http_protocol.c
index bf2868263093fa7be9cffde0e16867bf6edec6c5..c647de8d0073223a5de3a1512015162c65c25a3d 100644 (file)
--- a/modules/http/http_protocol.c
+++ b/modules/http/http_protocol.c
@@ -1165,7 +1165,6 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_http_header_filter(ap_filter_t *f,
     }
 
     if (r->assbackwards) {
-        r->bytes_sent = 0;
         r->sent_bodyct = 1;
         ap_remove_output_filter(f);
         return ap_pass_brigade(f->next, b);