diff options
| author | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-14 11:36:50 +0200 |
|---|---|---|
| committer | Emmanuel ROHEE <erohee@amdocs.com> | 2014-08-14 11:36:50 +0200 |
| commit | d05ff3e0985d40f2a5fd6c095178f75aebf53220 (patch) | |
| tree | 44c323d736e3e91d7cd38a9f6ea5f54c465f8990 /synapse/http/server.py | |
| parent | Created m-file-input. A directive to open a file selection dialog on whatever... (diff) | |
| parent | Honour the -w flag to enable the web client at /matrix/client (diff) | |
| download | synapse-d05ff3e0985d40f2a5fd6c095178f75aebf53220.tar.xz | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'synapse/http/server.py')
| -rw-r--r-- | synapse/http/server.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/synapse/http/server.py b/synapse/http/server.py index d7f4b691bc..87b4fc8a5f 100644 --- a/synapse/http/server.py +++ b/synapse/http/server.py @@ -52,10 +52,9 @@ class HttpServer(object): pass -# The actual HTTP server impl, using twisted http server -class TwistedHttpServer(HttpServer, resource.Resource): - """ This wraps the twisted HTTP server, and triggers the correct callbacks - on the transport_layer. +class JsonResource(HttpServer, resource.Resource): + """ This implements the HttpServer interface and provides JSON support for + Resources. Register callbacks via register_path() """ |