diff -rup apache2-2.2.16-old/modules/http/http_filters.c apache2-2.2.16/modules/http/http_filters.c
--- apache2-2.2.16-old/modules/http/http_filters.c	2010-02-26 01:32:15.000000000 -0800
+++ apache2-2.2.16/modules/http/http_filters.c	2011-03-18 15:49:43.651898321 -0700
@@ -1256,7 +1256,11 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_
     if (r->header_only
         && (clheader = apr_table_get(r->headers_out, "Content-Length"))
         && !strcmp(clheader, "0")) {
+        ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
+                      "not unsetting Content-Length on HEAD response (rgw changes)\n");
+#if 0
         apr_table_unset(r->headers_out, "Content-Length");
+#endif
     }
 
     b2 = apr_brigade_create(r->pool, c->bucket_alloc);