| pulkit |
| hg-reviewers |
Fixes test-phabricator.t.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| r = None | r = None | ||||
| else: | else: | ||||
| if DEBUG: | if DEBUG: | ||||
| DEBUG.info("re-using connection to %s (%d)", host, id(h)) | DEBUG.info("re-using connection to %s (%d)", host, id(h)) | ||||
| return r | return r | ||||
| def _start_transaction(self, h, req): | def _start_transaction(self, h, req): | ||||
| oldbytescount = h.sentbytescount | oldbytescount = getattr(h, 'sentbytescount', 0) | ||||
| # 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()) | ||||
| 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) | ||||
| # This will fail to record events in case of I/O failure. That's OK. | # This will fail to record events in case of I/O failure. That's OK. | ||||
| self.requestscount += 1 | self.requestscount += 1 | ||||
| self.sentbytescount += h.sentbytescount - oldbytescount | self.sentbytescount += getattr(h, 'sentbytescount', 0) - oldbytescount | ||||
| try: | try: | ||||
| self.parent.requestscount += 1 | self.parent.requestscount += 1 | ||||
| self.parent.sentbytescount += h.sentbytescount - oldbytescount | self.parent.sentbytescount += ( | ||||
| getattr(h, 'sentbytescount', 0) - oldbytescount) | |||||
| except AttributeError: | except AttributeError: | ||||
| pass | pass | ||||
| class HTTPHandler(KeepAliveHandler, urlreq.httphandler): | class HTTPHandler(KeepAliveHandler, urlreq.httphandler): | ||||
| pass | pass | ||||
| class HTTPResponse(httplib.HTTPResponse): | class HTTPResponse(httplib.HTTPResponse): | ||||
| # we need to subclass HTTPResponse in order to | # we need to subclass HTTPResponse in order to | ||||