You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rp...@apache.org on 2021/04/30 20:08:46 UTC
svn commit: r1889341 - in /httpd/httpd/trunk:
changes-entries/fix_pr61820_regression.txt modules/http/http_filters.c
Author: rpluem
Date: Fri Apr 30 20:08:46 2021
New Revision: 1889341
URL: http://svn.apache.org/viewvc?rev=1889341&view=rev
Log:
* Do not strip any headers from 304 responses.
PR: 61820
Added:
httpd/httpd/trunk/changes-entries/fix_pr61820_regression.txt (with props)
Modified:
httpd/httpd/trunk/modules/http/http_filters.c
Added: httpd/httpd/trunk/changes-entries/fix_pr61820_regression.txt
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/changes-entries/fix_pr61820_regression.txt?rev=1889341&view=auto
==============================================================================
--- httpd/httpd/trunk/changes-entries/fix_pr61820_regression.txt (added)
+++ httpd/httpd/trunk/changes-entries/fix_pr61820_regression.txt Fri Apr 30 20:08:46 2021
@@ -0,0 +1,2 @@
+ *) core: Fix a regression that stripped the ETag header from 304 responses.
+ PR 61820 [Ruediger Pluem, Roy T. Fielding]
Propchange: httpd/httpd/trunk/changes-entries/fix_pr61820_regression.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: httpd/httpd/trunk/modules/http/http_filters.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/http/http_filters.c?rev=1889341&r1=1889340&r2=1889341&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/http/http_filters.c (original)
+++ httpd/httpd/trunk/modules/http/http_filters.c Fri Apr 30 20:08:46 2021
@@ -1433,21 +1433,6 @@ AP_CORE_DECLARE_NONSTD(apr_status_t) ap_
h.pool = r->pool;
h.bb = b2;
- if (r->status == HTTP_NOT_MODIFIED) {
- /*
- * List of headers that must not be updated on a 304 (or 206 partial content)
- * https://tools.ietf.org/id/draft-ietf-httpbis-cache-08.txt
- */
- apr_table_unset(r->headers_out, "Content-Encoding");
- apr_table_unset(r->headers_out, "Content-Length");
- apr_table_unset(r->headers_out, "Content-MD5");
- apr_table_unset(r->headers_out, "Content-Range");
- apr_table_unset(r->headers_out, "ETag");
- apr_table_unset(r->headers_out, "TE");
- apr_table_unset(r->headers_out, "Trailer");
- apr_table_unset(r->headers_out, "Transfer-Encoding");
- apr_table_unset(r->headers_out, "Upgrade");
- }
send_all_header_fields(&h, r);
terminate_header(b2);