Show More
@@ -232,8 +232,8 b' class HTTPApplication(object):' | |||||
232 | self.global_config = global_config |
|
232 | self.global_config = global_config | |
233 | self.config.include('vcsserver.lib.rc_cache') |
|
233 | self.config.include('vcsserver.lib.rc_cache') | |
234 |
|
234 | |||
235 | locale = settings.get('locale', '') or 'en_US.UTF-8' |
|
235 | settings_locale = settings.get('locale', '') or 'en_US.UTF-8' | |
236 | vcs = VCS(locale=locale, cache_config=settings) |
|
236 | vcs = VCS(locale=settings_locale, cache_config=settings) | |
237 | self._remotes = { |
|
237 | self._remotes = { | |
238 | 'hg': vcs._hg_remote, |
|
238 | 'hg': vcs._hg_remote, | |
239 | 'git': vcs._git_remote, |
|
239 | 'git': vcs._git_remote, | |
@@ -444,14 +444,13 b' class HTTPApplication(object):' | |||||
444 |
|
444 | |||
445 | def _msgpack_renderer_factory(self, info): |
|
445 | def _msgpack_renderer_factory(self, info): | |
446 | def _render(value, system): |
|
446 | def _render(value, system): | |
447 | value = msgpack.packb(value) |
|
|||
448 | request = system.get('request') |
|
447 | request = system.get('request') | |
449 | if request is not None: |
|
448 | if request is not None: | |
450 | response = request.response |
|
449 | response = request.response | |
451 | ct = response.content_type |
|
450 | ct = response.content_type | |
452 | if ct == response.default_content_type: |
|
451 | if ct == response.default_content_type: | |
453 | response.content_type = 'application/x-msgpack' |
|
452 | response.content_type = 'application/x-msgpack' | |
454 | return value |
|
453 | return msgpack.packb(value) | |
455 | return _render |
|
454 | return _render | |
456 |
|
455 | |||
457 | def set_env_from_config(self, environ, config): |
|
456 | def set_env_from_config(self, environ, config): |
General Comments 0
You need to be logged in to leave comments.
Login now