summary refs log tree commit diff
path: root/synapse/http/server.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2014-12-22 10:16:02 +0000
committerMark Haines <mark.haines@matrix.org>2014-12-22 10:16:02 +0000
commit24b5d0185357a308c066bae45306a9c78625dba7 (patch)
tree88dd9d92b90a014de8eb33601bde6347e7fe9c68 /synapse/http/server.py
parentMerge branch 'hotfixes-v0.6.0' (diff)
downloadsynapse-24b5d0185357a308c066bae45306a9c78625dba7.tar.xz
Include version in User-Agent and Server headers
Diffstat (limited to 'synapse/http/server.py')
-rw-r--r--synapse/http/server.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/synapse/http/server.py b/synapse/http/server.py
index f33859cf76..5765dffe39 100644
--- a/synapse/http/server.py
+++ b/synapse/http/server.py
@@ -14,14 +14,16 @@
 # limitations under the License.
 
 
-from syutil.jsonutil import (
-    encode_canonical_json, encode_pretty_printed_json
-)
+from synapse.http.agent_name import AGENT_NAME
 from synapse.api.errors import (
     cs_exception, SynapseError, CodeMessageException
 )
 from synapse.util.logcontext import LoggingContext
 
+from syutil.jsonutil import (
+    encode_canonical_json, encode_pretty_printed_json
+)
+
 from twisted.internet import defer, reactor
 from twisted.web import server, resource
 from twisted.web.server import NOT_DONE_YET
@@ -230,6 +232,7 @@ def respond_with_json_bytes(request, code, json_bytes, send_cors=False,
 
     request.setResponseCode(code, message=response_code_message)
     request.setHeader(b"Content-Type", b"application/json")
+    request.setHeader(b"Server", AGENT_NAME)
 
     if send_cors:
         request.setHeader("Access-Control-Allow-Origin", "*")