summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorlzheng@chromium.org <lzheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-16 20:24:35 +0000
committerlzheng@chromium.org <lzheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-16 20:24:35 +0000
commit0e4a0256ed9c6add14a9c7272b6f23031429bfc0 (patch)
tree9b248086f7d201df16697686f6be655fce957bad /net
parent28b3b2e41e97a7c6bf39d598febf8bc1677a7079 (diff)
downloadchromium_src-0e4a0256ed9c6add14a9c7272b6f23031429bfc0.zip
chromium_src-0e4a0256ed9c6add14a9c7272b6f23031429bfc0.tar.gz
chromium_src-0e4a0256ed9c6add14a9c7272b6f23031429bfc0.tar.bz2
Make sure test server use right mime for exe.
TEST=all tests using test server not broken. BUG=none Review URL: http://codereview.chromium.org/5884002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69455 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rwxr-xr-xnet/tools/testserver/testserver.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py
index c0dc930..0cd663d 100755
--- a/net/tools/testserver/testserver.py
+++ b/net/tools/testserver/testserver.py
@@ -302,11 +302,12 @@ class TestPageHandler(BasePageHandler):
self._mime_types = {
'crx' : 'application/x-chrome-extension',
+ 'exe' : 'application/octet-stream',
'gif': 'image/gif',
'jpeg' : 'image/jpeg',
'jpg' : 'image/jpeg',
- 'xml' : 'text/xml',
- 'pdf' : 'application/pdf'
+ 'pdf' : 'application/pdf',
+ 'xml' : 'text/xml'
}
self._default_mime_type = 'text/html'