Author: svn-role
Date: Sun Dec 23 04:00:35 2012
New Revision: 1425401
URL: http://svn.apache.org/viewvc?rev=1425401&view=rev
Log:
Merge r1390653 from trunk:
* r1390653
Add Vary: header to GET response.
Justification:
The 1.8 serf-only client may fail to work with caching proxies.
Votes:
+1: philip, stefan2, brane
Modified:
subversion/branches/1.6.x/ (props changed)
subversion/branches/1.6.x/STATUS
subversion/branches/1.6.x/subversion/mod_dav_svn/repos.c
Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1390653
Modified: subversion/branches/1.6.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=1425401&r1=1425400&r2=1425401&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Sun Dec 23 04:00:35 2012
@@ -63,10 +63,3 @@ Veto-blocked changes:
Approved changes:
=================
-
- * r1390653
- Add Vary: header to GET response.
- Justification:
- The 1.8 serf-only client may fail to work with caching proxies.
- Votes:
- +1: philip, stefan2, brane
Modified: subversion/branches/1.6.x/subversion/mod_dav_svn/repos.c
URL:
http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/mod_dav_svn/repos.c?rev=1425401&r1=1425400&r2=1425401&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/mod_dav_svn/repos.c (original)
+++ subversion/branches/1.6.x/subversion/mod_dav_svn/repos.c Sun Dec 23
04:00:35 2012
@@ -2718,6 +2718,13 @@ set_headers(request_rec *r, const dav_re
if ((serr == NULL) && (info.rev != SVN_INVALID_REVNUM))
{
mimetype = SVN_SVNDIFF_MIME_TYPE;
+
+ /* Note the base that this svndiff is based on, and tell any
+ intermediate caching proxies that this header is
+ significant. */
+ apr_table_setn(r->headers_out, "Vary", SVN_DAV_DELTA_BASE_HEADER);
+ apr_table_setn(r->headers_out, SVN_DAV_DELTA_BASE_HEADER,
+ resource->info->delta_base);
}
svn_error_clear(serr);
}
