| Index: net/tools/testserver/testserver.py
|
| diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py
|
| index 139724c7d47132745fbfa62173ac179a084eb30f..f698bfdcb3171a6b45d7fad6b9f5650a56205be9 100755
|
| --- a/net/tools/testserver/testserver.py
|
| +++ b/net/tools/testserver/testserver.py
|
| @@ -28,6 +28,7 @@ import re
|
| import select
|
| import socket
|
| import SocketServer
|
| +import struct
|
| import sys
|
| import threading
|
| import time
|
| @@ -473,6 +474,7 @@ class TestPageHandler(BasePageHandler):
|
| self.MultipartSlowHandler,
|
| self.GetSSLSessionCacheHandler,
|
| self.CloseSocketHandler,
|
| + self.RangeResetHandler,
|
| self.DefaultResponseHandler]
|
| post_handlers = [
|
| self.EchoTitleHandler,
|
| @@ -1621,6 +1623,95 @@ class TestPageHandler(BasePageHandler):
|
| self.wfile.close()
|
| return True
|
|
|
| + def RangeResetHandler(self):
|
| + """Send data broken up by connection resets every N (default 10K) bytes.
|
| + Support range requests. If the data requested doesn't straddle a reset
|
| + boundary, it will all be sent. Used for testing resuming downloads."""
|
| +
|
| + if not self._ShouldHandleRequest('/rangereset'):
|
| + return False
|
| +
|
| + _, _, url_path, _, query, _ = urlparse.urlparse(self.path)
|
| +
|
| + # Defaults
|
| + size = 15000
|
| + # Note that the rst is sent just before sending the rst_boundary byte.
|
| + rst_boundary = 10000
|
| + respond_to_range = True
|
| + hold_for_signal = False
|
| +
|
| + # Parse the query
|
| + if query:
|
| + for ele in query.split('&'):
|
| + namevalue = ele.split('=')
|
| + name = namevalue[0]
|
| + value = namevalue[1] if len(namevalue) == 2 else None
|
| + if name == 'size':
|
| + size = int(val)
|
| + elif name == 'rst_boundary':
|
| + rst_boundary = int(val)
|
| + elif name == 'bounce_range':
|
| + respond_to_range = False
|
| + elif name == 'hold':
|
| + hold_for_signal = True
|
| + else:
|
| + return False
|
| +
|
| + first_byte = 0
|
| + last_byte = size - 1
|
| +
|
| + # Does that define what we want to return, or do we need to apply
|
| + # a range?
|
| + range_response = False
|
| + range_header = self.headers.getheader('range')
|
| + if range_header and respond_to_range:
|
| + mo = re.match("bytes=([0-9]*)-([0-9]*)", range_header)
|
| + if mo.group(1):
|
| + first_byte = int(mo.group(1))
|
| + if mo.group(2):
|
| + last_byte = int(mo.group(2))
|
| + if last_byte > size - 1:
|
| + last_byte = size - 1
|
| + range_response = True
|
| + if last_byte < first_byte:
|
| + return False
|
| +
|
| + if not range_response:
|
| + self.send_response(200)
|
| + else:
|
| + self.send_response(206)
|
| + self.send_header('Content-Range',
|
| + 'bytes %d-%d/%d' % (first_byte, last_byte, size))
|
| + self.send_header('Content-Type', 'application/octet-stream')
|
| + self.send_header('Content-Length', last_byte - first_byte + 1)
|
| + self.end_headers()
|
| +
|
| + if hold_for_signal:
|
| + ## Needed to allow server to handle new requests (weird).
|
| + self.wfile.write('X')
|
| + first_byte = first_byte + 1
|
| + # handle requests until one of them clears this flag.
|
| + self.server.waitForDownload = True
|
| + while self.server.waitForDownload:
|
| + self.server.handle_request()
|
| +
|
| + possible_rst = ((first_byte / rst_boundary) + 1) * rst_boundary
|
| + if possible_rst < last_byte:
|
| + ## We're resetting the conneciton part way in.
|
| + self.wfile.write('X' * (possible_rst - first_byte))
|
| + s = self.connection # This is the request socket.
|
| + l_onoff = 1 # Linger is active.
|
| + l_linger = 0 # Seconds to linger for.
|
| + s.setsockopt(socket.SOL_SOCKET, socket.SO_LINGER,
|
| + struct.pack('ii', l_onoff, l_linger))
|
| + s.close()
|
| + time.sleep(0.05) # Give time to the system.
|
| + else:
|
| + ## A more normal response
|
| + self.wfile.write('X' * (last_byte - first_byte + 1))
|
| +
|
| + return True
|
| +
|
| def DefaultResponseHandler(self):
|
| """This is the catch-all response handler for requests that aren't handled
|
| by one of the special handlers above.
|
|
|