| durin42 |
| hg-reviewers |
This is our last public attribute not part of the protocol
interface!
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| self._ui.ferr = olderr | self._ui.ferr = olderr | ||||
| def client(self): | def client(self): | ||||
| return 'remote:%s:%s:%s' % ( | return 'remote:%s:%s:%s' % ( | ||||
| self._req.env.get('wsgi.url_scheme') or 'http', | self._req.env.get('wsgi.url_scheme') or 'http', | ||||
| urlreq.quote(self._req.env.get('REMOTE_HOST', '')), | urlreq.quote(self._req.env.get('REMOTE_HOST', '')), | ||||
| urlreq.quote(self._req.env.get('REMOTE_USER', ''))) | urlreq.quote(self._req.env.get('REMOTE_USER', ''))) | ||||
| def responsetype(self, prefer_uncompressed): | |||||
| """Determine the appropriate response type and compression settings. | |||||
| Returns a tuple of (mediatype, compengine, engineopts). | |||||
| """ | |||||
| # Determine the response media type and compression engine based | |||||
| # on the request parameters. | |||||
| protocaps = decodevaluefromheaders(self._req, r'X-HgProto').split(' ') | |||||
| if '0.2' in protocaps: | |||||
| # All clients are expected to support uncompressed data. | |||||
| if prefer_uncompressed: | |||||
| return HGTYPE2, util._noopengine(), {} | |||||
| # Default as defined by wire protocol spec. | |||||
| compformats = ['zlib', 'none'] | |||||
| for cap in protocaps: | |||||
| if cap.startswith('comp='): | |||||
| compformats = cap[5:].split(',') | |||||
| break | |||||
| # Now find an agreed upon compression format. | |||||
| for engine in wireproto.supportedcompengines(self._ui, | |||||
| util.SERVERROLE): | |||||
| if engine.wireprotosupport().name in compformats: | |||||
| opts = {} | |||||
| level = self._ui.configint('server', | |||||
| '%slevel' % engine.name()) | |||||
| if level is not None: | |||||
| opts['level'] = level | |||||
| return HGTYPE2, engine, opts | |||||
| # No mutually supported compression format. Fall back to the | |||||
| # legacy protocol. | |||||
| # Don't allow untrusted settings because disabling compression or | |||||
| # setting a very high compression level could lead to flooding | |||||
| # the server's network or CPU. | |||||
| opts = {'level': self._ui.configint('server', 'zliblevel')} | |||||
| return HGTYPE, util.compengines['zlib'], opts | |||||
| def iscmd(cmd): | def iscmd(cmd): | ||||
| return cmd in wireproto.commands | return cmd in wireproto.commands | ||||
| def parsehttprequest(repo, req, query): | def parsehttprequest(repo, req, query): | ||||
| """Parse the HTTP request for a wire protocol request. | """Parse the HTTP request for a wire protocol request. | ||||
| If the current request appears to be a wire protocol request, this | If the current request appears to be a wire protocol request, this | ||||
| function returns a dict with details about that request, including | function returns a dict with details about that request, including | ||||
| return { | return { | ||||
| 'cmd': cmd, | 'cmd': cmd, | ||||
| 'proto': proto, | 'proto': proto, | ||||
| 'dispatch': lambda: _callhttp(repo, req, proto, cmd), | 'dispatch': lambda: _callhttp(repo, req, proto, cmd), | ||||
| 'handleerror': lambda ex: _handlehttperror(ex, req, cmd), | 'handleerror': lambda ex: _handlehttperror(ex, req, cmd), | ||||
| } | } | ||||
| def _httpresponsetype(ui, req, prefer_uncompressed): | |||||
| """Determine the appropriate response type and compression settings. | |||||
| Returns a tuple of (mediatype, compengine, engineopts). | |||||
| """ | |||||
| # Determine the response media type and compression engine based | |||||
| # on the request parameters. | |||||
| protocaps = decodevaluefromheaders(req, r'X-HgProto').split(' ') | |||||
| if '0.2' in protocaps: | |||||
| # All clients are expected to support uncompressed data. | |||||
| if prefer_uncompressed: | |||||
| return HGTYPE2, util._noopengine(), {} | |||||
| # Default as defined by wire protocol spec. | |||||
| compformats = ['zlib', 'none'] | |||||
| for cap in protocaps: | |||||
| if cap.startswith('comp='): | |||||
| compformats = cap[5:].split(',') | |||||
| break | |||||
| # Now find an agreed upon compression format. | |||||
| for engine in wireproto.supportedcompengines(ui, util.SERVERROLE): | |||||
| if engine.wireprotosupport().name in compformats: | |||||
| opts = {} | |||||
| level = ui.configint('server', '%slevel' % engine.name()) | |||||
| if level is not None: | |||||
| opts['level'] = level | |||||
| return HGTYPE2, engine, opts | |||||
| # No mutually supported compression format. Fall back to the | |||||
| # legacy protocol. | |||||
| # Don't allow untrusted settings because disabling compression or | |||||
| # setting a very high compression level could lead to flooding | |||||
| # the server's network or CPU. | |||||
| opts = {'level': ui.configint('server', 'zliblevel')} | |||||
| return HGTYPE, util.compengines['zlib'], opts | |||||
| def _callhttp(repo, req, proto, cmd): | def _callhttp(repo, req, proto, cmd): | ||||
| def genversion2(gen, engine, engineopts): | def genversion2(gen, engine, engineopts): | ||||
| # application/mercurial-0.2 always sends a payload header | # application/mercurial-0.2 always sends a payload header | ||||
| # identifying the compression engine. | # identifying the compression engine. | ||||
| name = engine.wireprotosupport().name | name = engine.wireprotosupport().name | ||||
| assert 0 < len(name) < 256 | assert 0 < len(name) < 256 | ||||
| yield struct.pack('B', len(name)) | yield struct.pack('B', len(name)) | ||||
| yield name | yield name | ||||
| gen = rsp.gen | gen = rsp.gen | ||||
| req.respond(HTTP_OK, HGTYPE) | req.respond(HTTP_OK, HGTYPE) | ||||
| return gen | return gen | ||||
| elif isinstance(rsp, wireproto.streamres): | elif isinstance(rsp, wireproto.streamres): | ||||
| gen = rsp.gen | gen = rsp.gen | ||||
| # This code for compression should not be streamres specific. It | # This code for compression should not be streamres specific. It | ||||
| # is here because we only compress streamres at the moment. | # is here because we only compress streamres at the moment. | ||||
| mediatype, engine, engineopts = proto.responsetype( | mediatype, engine, engineopts = _httpresponsetype( | ||||
| rsp.prefer_uncompressed) | repo.ui, req, rsp.prefer_uncompressed) | ||||
| gen = engine.compressstream(gen, engineopts) | gen = engine.compressstream(gen, engineopts) | ||||
| if mediatype == HGTYPE2: | if mediatype == HGTYPE2: | ||||
| gen = genversion2(gen, engine, engineopts) | gen = genversion2(gen, engine, engineopts) | ||||
| req.respond(HTTP_OK, mediatype) | req.respond(HTTP_OK, mediatype) | ||||
| return gen | return gen | ||||
| elif isinstance(rsp, wireproto.pushres): | elif isinstance(rsp, wireproto.pushres): | ||||