summaryrefslogtreecommitdiffstats
path: root/net/tools
diff options
context:
space:
mode:
authoradamk@chromium.org <adamk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-02 20:51:23 +0000
committeradamk@chromium.org <adamk@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-02 20:51:23 +0000
commit098a8eac76a314e4b26a7387e272d69fec518272 (patch)
treec46c23cbf852b7cc2ba3f6727bb06eb367662c93 /net/tools
parent8cb478dfa694f486f457e57d66e1f8dbc8d07ffe (diff)
downloadchromium_src-098a8eac76a314e4b26a7387e272d69fec518272.zip
chromium_src-098a8eac76a314e4b26a7387e272d69fec518272.tar.gz
chromium_src-098a8eac76a314e4b26a7387e272d69fec518272.tar.bz2
Remove bzip2-encoded test data file left behind when bzip2 support was removed in r34047, as well as supporting code in testserver.py.
BUG=none TEST=none Review URL: http://codereview.chromium.org/6591051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76603 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
-rwxr-xr-xnet/tools/testserver/testserver.py74
1 files changed, 0 insertions, 74 deletions
diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py
index 871e540..a222558 100755
--- a/net/tools/testserver/testserver.py
+++ b/net/tools/testserver/testserver.py
@@ -281,8 +281,6 @@ class TestPageHandler(BasePageHandler):
self.EchoHeaderOverride,
self.EchoAllHandler,
self.FileHandler,
- self.RealFileWithCommonHeaderHandler,
- self.RealBZ2FileWithCommonHeaderHandler,
self.SetCookieHandler,
self.AuthBasicHandler,
self.AuthDigestHandler,
@@ -829,78 +827,6 @@ class TestPageHandler(BasePageHandler):
return True
- def RealFileWithCommonHeaderHandler(self):
- """This handler sends the contents of the requested file without the pseudo
- http head!"""
-
- prefix='/realfiles/'
- if not self.path.startswith(prefix):
- return False
-
- file = self.path[len(prefix):]
- path = os.path.join(self.server.data_dir, file)
-
- try:
- f = open(path, "rb")
- data = f.read()
- f.close()
-
- # just simply set the MIME as octal stream
- self.send_response(200)
- self.send_header('Content-type', 'application/octet-stream')
- self.end_headers()
-
- self.wfile.write(data)
- except:
- self.send_error(404)
-
- return True
-
- def RealBZ2FileWithCommonHeaderHandler(self):
- """This handler sends the bzip2 contents of the requested file with
- corresponding Content-Encoding field in http head!"""
-
- prefix='/realbz2files/'
- if not self.path.startswith(prefix):
- return False
-
- parts = self.path.split('?')
- file = parts[0][len(prefix):]
- path = os.path.join(self.server.data_dir, file) + '.bz2'
-
- if len(parts) > 1:
- options = parts[1]
- else:
- options = ''
-
- try:
- self.send_response(200)
- accept_encoding = self.headers.get("Accept-Encoding")
- if accept_encoding.find("bzip2") != -1:
- f = open(path, "rb")
- data = f.read()
- f.close()
- self.send_header('Content-Encoding', 'bzip2')
- self.send_header('Content-type', 'application/x-bzip2')
- self.end_headers()
- if options == 'incremental-header':
- self.wfile.write(data[:1])
- self.wfile.flush()
- time.sleep(1.0)
- self.wfile.write(data[1:])
- else:
- self.wfile.write(data)
- else:
- """client do not support bzip2 format, send pseudo content
- """
- self.send_header('Content-type', 'text/html; charset=ISO-8859-1')
- self.end_headers()
- self.wfile.write("you do not support bzip2 encoding")
- except:
- self.send_error(404)
-
- return True
-
def SetCookieHandler(self):
"""This handler just sets a cookie, for testing cookie handling."""