| durin42 |
| hg-reviewers |
The values in header are of str type.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| # What follows mostly reimplements HTTPConnection.request() | # What follows mostly reimplements HTTPConnection.request() | ||||
| # except it adds self.parent.addheaders in the mix and sends headers | # except it adds self.parent.addheaders in the mix and sends headers | ||||
| # in a deterministic order (to make testing easier). | # in a deterministic order (to make testing easier). | ||||
| headers = util.sortdict(self.parent.addheaders) | headers = util.sortdict(self.parent.addheaders) | ||||
| headers.update(sorted(req.headers.items())) | headers.update(sorted(req.headers.items())) | ||||
| headers.update(sorted(req.unredirected_hdrs.items())) | headers.update(sorted(req.unredirected_hdrs.items())) | ||||
| headers = util.sortdict((n.lower(), v) for n, v in headers.items()) | headers = util.sortdict((n.lower(), v) for n, v in headers.items()) | ||||
| skipheaders = {} | skipheaders = {} | ||||
| for n in ('host', 'accept-encoding'): | for n in (r'host', r'accept-encoding'): | ||||
| if n in headers: | if n in headers: | ||||
| skipheaders['skip_' + n.replace('-', '_')] = 1 | skipheaders[r'skip_' + n.replace(r'-', r'_')] = 1 | ||||
| try: | try: | ||||
| if urllibcompat.hasdata(req): | if urllibcompat.hasdata(req): | ||||
| data = urllibcompat.getdata(req) | data = urllibcompat.getdata(req) | ||||
| h.putrequest( | h.putrequest( | ||||
| req.get_method(), urllibcompat.getselector(req), | req.get_method(), urllibcompat.getselector(req), | ||||
| **pycompat.strkwargs(skipheaders)) | skipheaders) | ||||
| if r'content-type' not in headers: | if r'content-type' not in headers: | ||||
| h.putheader(r'Content-type', | h.putheader(r'Content-type', | ||||
| r'application/x-www-form-urlencoded') | r'application/x-www-form-urlencoded') | ||||
| if r'content-length' not in headers: | if r'content-length' not in headers: | ||||
| h.putheader(r'Content-length', r'%d' % len(data)) | h.putheader(r'Content-length', r'%d' % len(data)) | ||||
| else: | else: | ||||
| h.putrequest( | h.putrequest( | ||||
| req.get_method(), urllibcompat.getselector(req), | req.get_method(), urllibcompat.getselector(req), | ||||
| **pycompat.strkwargs(skipheaders)) | skipheaders) | ||||
| except socket.error as err: | except socket.error as err: | ||||
| raise urlerr.urlerror(err) | raise urlerr.urlerror(err) | ||||
| for k, v in headers.items(): | for k, v in headers.items(): | ||||
| h.putheader(k, v) | h.putheader(k, v) | ||||
| h.endheaders() | h.endheaders() | ||||
| if urllibcompat.hasdata(req): | if urllibcompat.hasdata(req): | ||||
| h.send(data) | h.send(data) | ||||