5609.52.1
by Martin Pool
Cope with buggy squids interrupting the response before a mime multipart boundary |
1 |
# Copyright (C) 2006-2011 Canonical Ltd
|
1750.1.2
by Michael Ellerman
Add support for HTTP multipart ranges and hook it into http+urllib. |
2 |
#
|
3 |
# This program is free software; you can redistribute it and/or modify
|
|
4 |
# it under the terms of the GNU General Public License as published by
|
|
5 |
# the Free Software Foundation; either version 2 of the License, or
|
|
6 |
# (at your option) any later version.
|
|
7 |
#
|
|
8 |
# This program is distributed in the hope that it will be useful,
|
|
9 |
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
10 |
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
11 |
# GNU General Public License for more details.
|
|
12 |
#
|
|
13 |
# You should have received a copy of the GNU General Public License
|
|
14 |
# along with this program; if not, write to the Free Software
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
1750.1.2
by Michael Ellerman
Add support for HTTP multipart ranges and hook it into http+urllib. |
16 |
|
17 |
"""Handlers for HTTP Responses.
|
|
18 |
||
19 |
The purpose of these classes is to provide a uniform interface for clients
|
|
20 |
to standard HTTP responses, single range responses and multipart range
|
|
21 |
responses.
|
|
22 |
"""
|
|
23 |
||
24 |
||
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
25 |
import httplib |
3408.6.1
by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while |
26 |
from cStringIO import StringIO |
3535.1.2
by Adrian Wilkins
Fix ability to use IIS as a dumb HTTP server. |
27 |
import rfc822 |
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
28 |
|
29 |
from bzrlib import ( |
|
30 |
errors, |
|
3408.6.1
by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while |
31 |
osutils, |
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
32 |
)
|
33 |
||
34 |
||
3059.2.18
by Vincent Ladeuil
Take spiv review comments into account. |
35 |
# A RangeFile expects the following grammar (simplified to outline the
|
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
36 |
# assumptions we rely upon).
|
37 |
||
38 |
# file: whole_file
|
|
39 |
# | single_range
|
|
40 |
# | multiple_range
|
|
41 |
||
42 |
# whole_file: [content_length_header] data
|
|
43 |
||
44 |
# single_range: content_range_header data
|
|
45 |
||
46 |
# multiple_range: boundary_header boundary (content_range_header data boundary)+
|
|
1750.1.2
by Michael Ellerman
Add support for HTTP multipart ranges and hook it into http+urllib. |
47 |
|
48 |
class RangeFile(object): |
|
1786.1.8
by John Arbash Meinel
[merge] Johan Rydberg test updates |
49 |
"""File-like object that allow access to partial available data.
|
50 |
||
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
51 |
All accesses should happen sequentially since the acquisition occurs during
|
52 |
an http response reception (as sockets can't be seeked, we simulate the
|
|
53 |
seek by just reading and discarding the data).
|
|
54 |
||
55 |
The access pattern is defined by a set of ranges discovered as reading
|
|
56 |
progress. Only one range is available at a given time, so all accesses
|
|
57 |
should happen with monotonically increasing offsets.
|
|
1786.1.8
by John Arbash Meinel
[merge] Johan Rydberg test updates |
58 |
"""
|
1750.1.2
by Michael Ellerman
Add support for HTTP multipart ranges and hook it into http+urllib. |
59 |
|
3146.3.4
by Vincent Ladeuil
Review feedback, simpler loops. |
60 |
# in _checked_read() below, we may have to discard several MB in the worst
|
61 |
# case. To avoid buffering that much, we read and discard by chunks
|
|
62 |
# instead. The underlying file is either a socket or a StringIO, so reading
|
|
63 |
# 8k chunks should be fine.
|
|
64 |
_discarded_buf_size = 8192 |
|
65 |
||
3408.6.1
by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while |
66 |
# maximum size of read requests -- used to avoid MemoryError issues in recv
|
67 |
_max_read_size = 512 * 1024 |
|
68 |
||
3945.1.8
by Vincent Ladeuil
Add more tests, fix pycurl double handling, revert previous tracking. |
69 |
def __init__(self, path, infile): |
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
70 |
"""Constructor.
|
71 |
||
72 |
:param path: File url, for error reports.
|
|
73 |
:param infile: File-like socket set at body start.
|
|
74 |
"""
|
|
1750.1.2
by Michael Ellerman
Add support for HTTP multipart ranges and hook it into http+urllib. |
75 |
self._path = path |
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
76 |
self._file = infile |
77 |
self._boundary = None |
|
3059.2.17
by Vincent Ladeuil
Limit GET requests by body size instead of number of ranges. |
78 |
# When using multi parts response, this will be set with the headers
|
79 |
# associated with the range currently read.
|
|
80 |
self._headers = None |
|
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
81 |
# Default to the whole file of unspecified size
|
82 |
self.set_range(0, -1) |
|
83 |
||
84 |
def set_range(self, start, size): |
|
85 |
"""Change the range mapping"""
|
|
86 |
self._start = start |
|
87 |
self._size = size |
|
88 |
# Set the new _pos since that's what we want to expose
|
|
89 |
self._pos = self._start |
|
90 |
||
91 |
def set_boundary(self, boundary): |
|
92 |
"""Define the boundary used in a multi parts message.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
93 |
|
3059.2.18
by Vincent Ladeuil
Take spiv review comments into account. |
94 |
The file should be at the beginning of the body, the first range
|
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
95 |
definition is read and taken into account.
|
96 |
"""
|
|
97 |
self._boundary = boundary |
|
98 |
# Decode the headers and setup the first range
|
|
99 |
self.read_boundary() |
|
100 |
self.read_range_definition() |
|
101 |
||
102 |
def read_boundary(self): |
|
103 |
"""Read the boundary headers defining a new range"""
|
|
104 |
boundary_line = '\r\n' |
|
105 |
while boundary_line == '\r\n': |
|
3059.2.18
by Vincent Ladeuil
Take spiv review comments into account. |
106 |
# RFC2616 19.2 Additional CRLFs may precede the first boundary
|
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
107 |
# string entity.
|
108 |
# To be on the safe side we allow it before any boundary line
|
|
109 |
boundary_line = self._file.readline() |
|
3535.1.4
by adwi2
Changes as suggested by Mr Ladeuil. |
110 |
|
5609.52.1
by Martin Pool
Cope with buggy squids interrupting the response before a mime multipart boundary |
111 |
if boundary_line == '': |
112 |
# A timeout in the proxy server caused the response to end early.
|
|
113 |
# See launchpad bug 198646.
|
|
114 |
raise errors.HttpBoundaryMissing( |
|
115 |
self._path, |
|
116 |
self._boundary) |
|
117 |
||
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
118 |
if boundary_line != '--' + self._boundary + '\r\n': |
3535.1.3
by adwi2
Fix ability to use IIS as a dumb HTTP server by unquoting the boundary |
119 |
# rfc822.unquote() incorrectly unquotes strings enclosed in <>
|
120 |
# IIS 6 and 7 incorrectly wrap boundary strings in <>
|
|
121 |
# together they make a beautiful bug, which we will be gracious
|
|
122 |
# about here
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
123 |
if (self._unquote_boundary(boundary_line) != |
3535.1.4
by adwi2
Changes as suggested by Mr Ladeuil. |
124 |
'--' + self._boundary + '\r\n'): |
3535.1.3
by adwi2
Fix ability to use IIS as a dumb HTTP server by unquoting the boundary |
125 |
raise errors.InvalidHttpResponse( |
126 |
self._path, |
|
3537.1.1
by Vincent Ladeuil
Fix some more PEP8isms and delete useless import |
127 |
"Expected a boundary (%s) line, got '%s'" |
128 |
% (self._boundary, boundary_line)) |
|
129 |
||
3535.1.2
by Adrian Wilkins
Fix ability to use IIS as a dumb HTTP server. |
130 |
def _unquote_boundary(self, b): |
131 |
return b[:2] + rfc822.unquote(b[2:-2]) + b[-2:] |
|
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
132 |
|
133 |
def read_range_definition(self): |
|
134 |
"""Read a new range definition in a multi parts message.
|
|
135 |
||
136 |
Parse the headers including the empty line following them so that we
|
|
137 |
are ready to read the data itself.
|
|
138 |
"""
|
|
3059.2.17
by Vincent Ladeuil
Limit GET requests by body size instead of number of ranges. |
139 |
self._headers = httplib.HTTPMessage(self._file, seekable=0) |
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
140 |
# Extract the range definition
|
3059.2.17
by Vincent Ladeuil
Limit GET requests by body size instead of number of ranges. |
141 |
content_range = self._headers.getheader('content-range', None) |
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
142 |
if content_range is None: |
143 |
raise errors.InvalidHttpResponse( |
|
144 |
self._path, |
|
145 |
'Content-Range header missing in a multi-part response') |
|
146 |
self.set_range_from_header(content_range) |
|
147 |
||
148 |
def set_range_from_header(self, content_range): |
|
3059.2.17
by Vincent Ladeuil
Limit GET requests by body size instead of number of ranges. |
149 |
"""Helper to set the new range from its description in the headers"""
|
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
150 |
try: |
151 |
rtype, values = content_range.split() |
|
3059.2.10
by Vincent Ladeuil
Jam's review feedback. |
152 |
except ValueError: |
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
153 |
raise errors.InvalidHttpRange(self._path, content_range, |
3059.2.17
by Vincent Ladeuil
Limit GET requests by body size instead of number of ranges. |
154 |
'Malformed header') |
3059.2.11
by Vincent Ladeuil
Fix typos mentioned by spiv. |
155 |
if rtype != 'bytes': |
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
156 |
raise errors.InvalidHttpRange(self._path, content_range, |
157 |
"Unsupported range type '%s'" % rtype) |
|
158 |
try: |
|
159 |
# We don't need total, but note that it may be either the file size
|
|
160 |
# or '*' if the server can't or doesn't want to return the file
|
|
161 |
# size.
|
|
162 |
start_end, total = values.split('/') |
|
163 |
start, end = start_end.split('-') |
|
164 |
start = int(start) |
|
165 |
end = int(end) |
|
3059.2.10
by Vincent Ladeuil
Jam's review feedback. |
166 |
except ValueError: |
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
167 |
raise errors.InvalidHttpRange(self._path, content_range, |
3059.2.17
by Vincent Ladeuil
Limit GET requests by body size instead of number of ranges. |
168 |
'Invalid range values') |
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
169 |
size = end - start + 1 |
170 |
if size <= 0: |
|
171 |
raise errors.InvalidHttpRange(self._path, content_range, |
|
3059.2.17
by Vincent Ladeuil
Limit GET requests by body size instead of number of ranges. |
172 |
'Invalid range, size <= 0') |
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
173 |
self.set_range(start, size) |
174 |
||
175 |
def _checked_read(self, size): |
|
3146.3.2
by Vincent Ladeuil
Fix #179368 by keeping the current range hint on ShortReadvErrors. |
176 |
"""Read the file checking for short reads.
|
177 |
||
178 |
The data read is discarded along the way.
|
|
179 |
"""
|
|
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
180 |
pos = self._pos |
3146.3.4
by Vincent Ladeuil
Review feedback, simpler loops. |
181 |
remaining = size |
182 |
while remaining > 0: |
|
183 |
data = self._file.read(min(remaining, self._discarded_buf_size)) |
|
184 |
remaining -= len(data) |
|
185 |
if not data: |
|
186 |
raise errors.ShortReadvError(self._path, pos, size, |
|
187 |
size - remaining) |
|
188 |
self._pos += size |
|
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
189 |
|
3059.2.18
by Vincent Ladeuil
Take spiv review comments into account. |
190 |
def _seek_to_next_range(self): |
191 |
# We will cross range boundaries
|
|
192 |
if self._boundary is None: |
|
193 |
# If we don't have a boundary, we can't find another range
|
|
3146.3.2
by Vincent Ladeuil
Fix #179368 by keeping the current range hint on ShortReadvErrors. |
194 |
raise errors.InvalidRange(self._path, self._pos, |
195 |
"Range (%s, %s) exhausted" |
|
196 |
% (self._start, self._size)) |
|
3059.2.18
by Vincent Ladeuil
Take spiv review comments into account. |
197 |
self.read_boundary() |
198 |
self.read_range_definition() |
|
199 |
||
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
200 |
def read(self, size=-1): |
3408.6.3
by Andrew Bennetts
Docstring/NEWS tweaks requested by Ian's review. |
201 |
"""Read size bytes from the current position in the file.
|
1750.1.2
by Michael Ellerman
Add support for HTTP multipart ranges and hook it into http+urllib. |
202 |
|
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
203 |
Reading across ranges is not supported. We rely on the underlying http
|
204 |
client to clean the socket if we leave bytes unread. This may occur for
|
|
205 |
the final boundary line of a multipart response or for any range
|
|
206 |
request not entirely consumed by the client (due to offset coalescing)
|
|
3408.6.3
by Andrew Bennetts
Docstring/NEWS tweaks requested by Ian's review. |
207 |
|
208 |
:param size: The number of bytes to read. Leave unspecified or pass
|
|
209 |
-1 to read to EOF.
|
|
1750.1.2
by Michael Ellerman
Add support for HTTP multipart ranges and hook it into http+urllib. |
210 |
"""
|
3059.2.18
by Vincent Ladeuil
Take spiv review comments into account. |
211 |
if (self._size > 0 |
212 |
and self._pos == self._start + self._size): |
|
213 |
if size == 0: |
|
214 |
return '' |
|
215 |
else: |
|
216 |
self._seek_to_next_range() |
|
217 |
elif self._pos < self._start: |
|
218 |
raise errors.InvalidRange( |
|
219 |
self._path, self._pos, |
|
220 |
"Can't read %s bytes before range (%s, %s)" |
|
221 |
% (size, self._start, self._size)) |
|
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
222 |
if self._size > 0: |
223 |
if size > 0 and self._pos + size > self._start + self._size: |
|
224 |
raise errors.InvalidRange( |
|
225 |
self._path, self._pos, |
|
226 |
"Can't read %s bytes across range (%s, %s)" |
|
227 |
% (size, self._start, self._size)) |
|
228 |
||
3408.6.1
by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while |
229 |
# read data from file
|
230 |
buffer = StringIO() |
|
231 |
limited = size |
|
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
232 |
if self._size > 0: |
233 |
# Don't read past the range definition
|
|
234 |
limited = self._start + self._size - self._pos |
|
3059.2.18
by Vincent Ladeuil
Take spiv review comments into account. |
235 |
if size >= 0: |
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
236 |
limited = min(limited, size) |
3945.1.8
by Vincent Ladeuil
Add more tests, fix pycurl double handling, revert previous tracking. |
237 |
osutils.pumpfile(self._file, buffer, limited, self._max_read_size) |
3408.6.1
by Eric Holmberg
Fix for Bug #215426 in which bzr can cause a MemoryError in socket.recv while |
238 |
data = buffer.getvalue() |
239 |
||
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
240 |
# Update _pos respecting the data effectively read
|
241 |
self._pos += len(data) |
|
242 |
return data |
|
1750.1.2
by Michael Ellerman
Add support for HTTP multipart ranges and hook it into http+urllib. |
243 |
|
244 |
def seek(self, offset, whence=0): |
|
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
245 |
start_pos = self._pos |
1750.1.2
by Michael Ellerman
Add support for HTTP multipart ranges and hook it into http+urllib. |
246 |
if whence == 0: |
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
247 |
final_pos = offset |
1750.1.2
by Michael Ellerman
Add support for HTTP multipart ranges and hook it into http+urllib. |
248 |
elif whence == 1: |
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
249 |
final_pos = start_pos + offset |
1750.1.2
by Michael Ellerman
Add support for HTTP multipart ranges and hook it into http+urllib. |
250 |
elif whence == 2: |
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
251 |
if self._size > 0: |
3059.2.14
by Vincent Ladeuil
Complete coverage by adding tests for more invalid inputs. Fix a |
252 |
final_pos = self._start + self._size + offset # offset < 0 |
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
253 |
else: |
254 |
raise errors.InvalidRange( |
|
255 |
self._path, self._pos, |
|
3059.2.14
by Vincent Ladeuil
Complete coverage by adding tests for more invalid inputs. Fix a |
256 |
"RangeFile: can't seek from end while size is unknown") |
1750.1.2
by Michael Ellerman
Add support for HTTP multipart ranges and hook it into http+urllib. |
257 |
else: |
258 |
raise ValueError("Invalid value %s for whence." % whence) |
|
259 |
||
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
260 |
if final_pos < self._pos: |
261 |
# Can't seek backwards
|
|
262 |
raise errors.InvalidRange( |
|
263 |
self._path, self._pos, |
|
264 |
'RangeFile: trying to seek backwards to %s' % final_pos) |
|
265 |
||
266 |
if self._size > 0: |
|
267 |
cur_limit = self._start + self._size |
|
3059.2.18
by Vincent Ladeuil
Take spiv review comments into account. |
268 |
while final_pos > cur_limit: |
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
269 |
# We will cross range boundaries
|
270 |
remain = cur_limit - self._pos |
|
271 |
if remain > 0: |
|
272 |
# Finish reading the current range
|
|
273 |
self._checked_read(remain) |
|
3059.2.18
by Vincent Ladeuil
Take spiv review comments into account. |
274 |
self._seek_to_next_range() |
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
275 |
cur_limit = self._start + self._size |
276 |
||
277 |
size = final_pos - self._pos |
|
278 |
if size > 0: # size can be < 0 if we crossed a range boundary |
|
279 |
# We don't need the data, just read it and throw it away
|
|
280 |
self._checked_read(size) |
|
1750.1.2
by Michael Ellerman
Add support for HTTP multipart ranges and hook it into http+urllib. |
281 |
|
1786.1.8
by John Arbash Meinel
[merge] Johan Rydberg test updates |
282 |
def tell(self): |
283 |
return self._pos |
|
284 |
||
1786.1.5
by John Arbash Meinel
Move the common Multipart stuff into plain http, and wrap pycurl response so that it matches the urllib response object. |
285 |
|
3945.1.8
by Vincent Ladeuil
Add more tests, fix pycurl double handling, revert previous tracking. |
286 |
def handle_response(url, code, msg, data): |
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
287 |
"""Interpret the code & headers and wrap the provided data in a RangeFile.
|
288 |
||
289 |
This is a factory method which returns an appropriate RangeFile based on
|
|
290 |
the code & headers it's given.
|
|
1786.1.21
by John Arbash Meinel
(broken) Work on factoring out handle_response so we can test with fake headers. |
291 |
|
292 |
:param url: The url being processed. Mostly for error reporting
|
|
293 |
:param code: The integer HTTP response code
|
|
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
294 |
:param msg: An HTTPMessage containing the headers for the response
|
1786.1.27
by John Arbash Meinel
Fix up the http transports so that tests pass with the new configuration. |
295 |
:param data: A file-like object that can be read() to get the
|
296 |
requested data
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
297 |
:return: A file-like object that can seek()+read() the
|
1786.1.21
by John Arbash Meinel
(broken) Work on factoring out handle_response so we can test with fake headers. |
298 |
ranges indicated by the headers.
|
299 |
"""
|
|
3945.1.8
by Vincent Ladeuil
Add more tests, fix pycurl double handling, revert previous tracking. |
300 |
rfile = RangeFile(url, data) |
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
301 |
if code == 200: |
302 |
# A whole file
|
|
303 |
size = msg.getheader('content-length', None) |
|
304 |
if size is None: |
|
305 |
size = -1 |
|
306 |
else: |
|
307 |
size = int(size) |
|
308 |
rfile.set_range(0, size) |
|
309 |
elif code == 206: |
|
310 |
content_type = msg.getheader('content-type', None) |
|
311 |
if content_type is None: |
|
312 |
# When there is no content-type header we treat the response as
|
|
313 |
# being of type 'application/octet-stream' as per RFC2616 section
|
|
314 |
# 7.2.1.
|
|
2073.1.1
by John Arbash Meinel
Robert's comments: Refer to RFC2616 to explain how we handle missing Content-Type |
315 |
# Therefore it is obviously not multipart
|
316 |
content_type = 'application/octet-stream' |
|
2070.1.1
by John Arbash Meinel
Fix bug #62473 by not requiring content-type in range responses |
317 |
is_multipart = False |
318 |
else: |
|
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
319 |
is_multipart = (msg.getmaintype() == 'multipart' |
320 |
and msg.getsubtype() == 'byteranges') |
|
1786.1.26
by John Arbash Meinel
Update and test handle_response. |
321 |
|
2070.1.1
by John Arbash Meinel
Fix bug #62473 by not requiring content-type in range responses |
322 |
if is_multipart: |
1786.1.26
by John Arbash Meinel
Update and test handle_response. |
323 |
# Full fledged multipart response
|
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
324 |
rfile.set_boundary(msg.getparam('boundary')) |
1786.1.26
by John Arbash Meinel
Update and test handle_response. |
325 |
else: |
326 |
# A response to a range request, but not multipart
|
|
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
327 |
content_range = msg.getheader('content-range', None) |
328 |
if content_range is None: |
|
1786.1.26
by John Arbash Meinel
Update and test handle_response. |
329 |
raise errors.InvalidHttpResponse(url, |
330 |
'Missing the Content-Range header in a 206 range response') |
|
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
331 |
rfile.set_range_from_header(content_range) |
1786.1.40
by John Arbash Meinel
code cleanups from Martin Pool. |
332 |
else: |
3059.2.2
by Vincent Ladeuil
Read http responses on demand without buffering the whole body |
333 |
raise errors.InvalidHttpResponse(url, |
334 |
'Unknown response code %s' % code) |
|
335 |
||
336 |
return rfile |
|
1786.1.21
by John Arbash Meinel
(broken) Work on factoring out handle_response so we can test with fake headers. |
337 |