summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-28 20:46:20 +0000
committerjoaodasilva@chromium.org <joaodasilva@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-28 20:46:20 +0000
commitfb6a4a95b8156dfca24a27f0e8fb8e7211547462 (patch)
tree9947f0e19deedb835d7c1864dbd7f17c16b2ecef /net
parent3ac1eef774ee13be784f4c2211f9909da27ad4dd (diff)
downloadchromium_src-fb6a4a95b8156dfca24a27f0e8fb8e7211547462.zip
chromium_src-fb6a4a95b8156dfca24a27f0e8fb8e7211547462.tar.gz
chromium_src-fb6a4a95b8156dfca24a27f0e8fb8e7211547462.tar.bz2
Recover from bad proxy settings pointing to non-proxy servers that reply anyway.
Added tests for proxy error recovery. BUG=chromium-os:20775 TEST=DeviceManagementServiceTest.*. Steps described in the bug now work as expected. Review URL: http://codereview.chromium.org/8054013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103172 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rwxr-xr-xnet/tools/testserver/testserver.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py
index 0849a29..4147004 100755
--- a/net/tools/testserver/testserver.py
+++ b/net/tools/testserver/testserver.py
@@ -1418,6 +1418,8 @@ class TestPageHandler(BasePageHandler):
self.headers,
raw_request))
self.send_response(http_response)
+ if (http_response == 200):
+ self.send_header('Content-type', 'application/x-protobuffer')
self.end_headers()
self.wfile.write(raw_reply)
return True