You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by sv...@apache.org on 2013/06/24 06:00:45 UTC
svn commit: r1495920 - in /subversion/branches/1.8.x: ./ STATUS
tools/server-side/svnpubsub/svnpubsub/server.py
Author: svn-role
Date: Mon Jun 24 04:00:44 2013
New Revision: 1495920
URL: http://svn.apache.org/r1495920
Log:
Merge r1491707 from trunk:
* r1491707
Add version header to svnpubsub server.
Justification:
Make Daniel happy; potentially allow proxies to filter on this or some
hypothetical use case.
Votes:
+1: danielsh, breser, stefan2
Modified:
subversion/branches/1.8.x/ (props changed)
subversion/branches/1.8.x/STATUS
subversion/branches/1.8.x/tools/server-side/svnpubsub/svnpubsub/server.py
Propchange: subversion/branches/1.8.x/
------------------------------------------------------------------------------
Merged /subversion/trunk:r1491707
Modified: subversion/branches/1.8.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1495920&r1=1495919&r2=1495920&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Mon Jun 24 04:00:44 2013
@@ -175,14 +175,6 @@ Veto-blocked changes:
Approved changes:
=================
- * r1491707
- Add version header to svnpubsub server.
- Justification:
- Make Daniel happy; potentially allow proxies to filter on this or some
- hypothetical use case.
- Votes:
- +1: danielsh, breser, stefan2
-
* r1495850
Use the correct baton in a callback API.
Justification:
Modified: subversion/branches/1.8.x/tools/server-side/svnpubsub/svnpubsub/server.py
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x/tools/server-side/svnpubsub/svnpubsub/server.py?rev=1495920&r1=1495919&r2=1495920&view=diff
==============================================================================
--- subversion/branches/1.8.x/tools/server-side/svnpubsub/svnpubsub/server.py (original)
+++ subversion/branches/1.8.x/tools/server-side/svnpubsub/svnpubsub/server.py Mon Jun 24 04:00:44 2013
@@ -152,6 +152,7 @@ class Client(object):
self.r.write(str(input))
def write_start(self):
+ self.r.setHeader('X-SVNPubSub-Version', '1')
self.r.setHeader('content-type', 'application/vnd.apache.vc-notify+json')
self.write('{"svnpubsub": {"version": 1}}\n\0')