| yuja |
| hg-reviewers |
I'll fix the decodevaluefromheaders function in an upcoming change.
| Lint Skipped |
| Unit Tests Skipped |
| else: | else: | ||||
| data[k] = knownargs[k][0] | data[k] = knownargs[k][0] | ||||
| return [data[k] for k in keys] | return [data[k] for k in keys] | ||||
| def _args(self): | def _args(self): | ||||
| args = self.req.form.copy() | args = self.req.form.copy() | ||||
| if pycompat.ispy3: | if pycompat.ispy3: | ||||
| args = {k.encode('ascii'): [v.encode('ascii') for v in vs] | args = {k.encode('ascii'): [v.encode('ascii') for v in vs] | ||||
| for k, vs in args.items()} | for k, vs in args.items()} | ||||
| postlen = int(self.req.env.get('HTTP_X_HGARGS_POST', 0)) | postlen = int(self.req.env.get(r'HTTP_X_HGARGS_POST', 0)) | ||||
| if postlen: | if postlen: | ||||
| args.update(cgi.parse_qs( | args.update(cgi.parse_qs( | ||||
| self.req.read(postlen), keep_blank_values=True)) | self.req.read(postlen), keep_blank_values=True)) | ||||
| return args | return args | ||||
| argvalue = decodevaluefromheaders(self.req, 'X-HgArg') | argvalue = decodevaluefromheaders(self.req, r'X-HgArg') | ||||
| args.update(cgi.parse_qs(argvalue, keep_blank_values=True)) | args.update(cgi.parse_qs(argvalue, keep_blank_values=True)) | ||||
| return args | return args | ||||
| def getfile(self, fp): | def getfile(self, fp): | ||||
| length = int(self.req.env[r'CONTENT_LENGTH']) | length = int(self.req.env[r'CONTENT_LENGTH']) | ||||
| # If httppostargs is used, we need to read Content-Length | # If httppostargs is used, we need to read Content-Length | ||||
| # minus the amount that was consumed by args. | # minus the amount that was consumed by args. | ||||
| length -= int(self.req.env.get(r'HTTP_X_HGARGS_POST', 0)) | length -= int(self.req.env.get(r'HTTP_X_HGARGS_POST', 0)) | ||||
| for s in util.filechunkiter(self.req, limit=length): | for s in util.filechunkiter(self.req, limit=length): | ||||
| # For now, if it isn't compressible in the old world, it's never | # For now, if it isn't compressible in the old world, it's never | ||||
| # compressible. We can change this to send uncompressed 0.2 payloads | # compressible. We can change this to send uncompressed 0.2 payloads | ||||
| # later. | # later. | ||||
| if not v1compressible: | if not v1compressible: | ||||
| return HGTYPE, None, None | return HGTYPE, None, None | ||||
| # Determine the response media type and compression engine based | # Determine the response media type and compression engine based | ||||
| # on the request parameters. | # on the request parameters. | ||||
| protocaps = decodevaluefromheaders(self.req, 'X-HgProto').split(' ') | protocaps = decodevaluefromheaders(self.req, r'X-HgProto').split(' ') | ||||
| if '0.2' in protocaps: | if '0.2' in protocaps: | ||||
| # Default as defined by wire protocol spec. | # Default as defined by wire protocol spec. | ||||
| compformats = ['zlib', 'none'] | compformats = ['zlib', 'none'] | ||||
| for cap in protocaps: | for cap in protocaps: | ||||
| if cap.startswith('comp='): | if cap.startswith('comp='): | ||||
| compformats = cap[5:].split(',') | compformats = cap[5:].split(',') | ||||
| break | break | ||||