Author: svn-role
Date: Wed May 29 04:00:16 2013
New Revision: 1487227
URL: http://svn.apache.org/r1487227
Log:
Merge r1486809 from trunk:
* r1486809
svnpubsub: fix MIME type of response.
Justification:
Be friendly to generic MIME/HTTP clients.
Votes:
+1: danielsh, brane, breser
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:r1486809
Modified: subversion/branches/1.8.x/STATUS
URL:
http://svn.apache.org/viewvc/subversion/branches/1.8.x/STATUS?rev=1487227&r1=1487226&r2=1487227&view=diff
==============================================================================
--- subversion/branches/1.8.x/STATUS (original)
+++ subversion/branches/1.8.x/STATUS Wed May 29 04:00:16 2013
@@ -101,10 +101,3 @@ Approved changes:
# that would restart the soak should not be added unless they are resolving
# blocking issues. If in doubt see this link for details:
#
http://subversion.apache.org/docs/community-guide/releasing.html#release-stabilization
-
- * r1486809
- svnpubsub: fix MIME type of response.
- Justification:
- Be friendly to generic MIME/HTTP clients.
- Votes:
- +1: danielsh, brane, breser
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=1487227&r1=1487226&r2=1487227&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
Wed May 29 04:00:16 2013
@@ -152,7 +152,10 @@ class Client(object):
self.r.write(str(input))
def write_start(self):
- self.r.setHeader('content-type', 'application/json')
+ # TODO: use application/x-* or vnd.* - see
+ # Message-ID:
<CADkdwvR=hwwevz+xn2hdild-hbpiz7q5fqafq_f5+m77zg6...@mail.gmail.com>
+ # on May 2013
+ self.r.setHeader('content-type', 'application/octet-stream')
self.write('{"svnpubsub": {"version": 1}}\n\0')
def write_heartbeat(self):
