Show More
@@ -92,19 +92,7 b' class httppeer(wireproto.wirepeer):' | |||||
92 | if cmd == 'pushkey': |
|
92 | if cmd == 'pushkey': | |
93 | args['data'] = '' |
|
93 | args['data'] = '' | |
94 | data = args.pop('data', None) |
|
94 | data = args.pop('data', None) | |
95 | size = 0 |
|
|||
96 | if util.safehasattr(data, 'length'): |
|
|||
97 | size = data.length |
|
|||
98 | elif data is not None: |
|
|||
99 | size = len(data) |
|
|||
100 | headers = args.pop('headers', {}) |
|
95 | headers = args.pop('headers', {}) | |
101 | if data is not None and 'Content-Type' not in headers: |
|
|||
102 | headers['Content-Type'] = 'application/mercurial-0.1' |
|
|||
103 |
|
||||
104 |
|
||||
105 | if size and self.ui.configbool('ui', 'usehttp2', False): |
|
|||
106 | headers['Expect'] = '100-Continue' |
|
|||
107 | headers['X-HgHttp2'] = '1' |
|
|||
108 |
|
96 | |||
109 | self.ui.debug("sending %s command\n" % cmd) |
|
97 | self.ui.debug("sending %s command\n" % cmd) | |
110 | q = [('cmd', cmd)] |
|
98 | q = [('cmd', cmd)] | |
@@ -129,6 +117,16 b' class httppeer(wireproto.wirepeer):' | |||||
129 | q += sorted(args.items()) |
|
117 | q += sorted(args.items()) | |
130 | qs = '?%s' % urllib.urlencode(q) |
|
118 | qs = '?%s' % urllib.urlencode(q) | |
131 | cu = "%s%s" % (self._url, qs) |
|
119 | cu = "%s%s" % (self._url, qs) | |
|
120 | size = 0 | |||
|
121 | if util.safehasattr(data, 'length'): | |||
|
122 | size = data.length | |||
|
123 | elif data is not None: | |||
|
124 | size = len(data) | |||
|
125 | if size and self.ui.configbool('ui', 'usehttp2', False): | |||
|
126 | headers['Expect'] = '100-Continue' | |||
|
127 | headers['X-HgHttp2'] = '1' | |||
|
128 | if data is not None and 'Content-Type' not in headers: | |||
|
129 | headers['Content-Type'] = 'application/mercurial-0.1' | |||
132 | req = self.requestbuilder(cu, data, headers) |
|
130 | req = self.requestbuilder(cu, data, headers) | |
133 | if data is not None: |
|
131 | if data is not None: | |
134 | self.ui.debug("sending %s bytes\n" % size) |
|
132 | self.ui.debug("sending %s bytes\n" % size) |
General Comments 0
You need to be logged in to leave comments.
Login now