commit d3a1ca59b28e7b3cb99e1273536a827bb5f7842d
author joaodasilva@chromium.org <joaodasilva@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> Wed Sep 28 20:46:20 2011 +0000
committer joaodasilva@chromium.org <joaodasilva@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> Wed Sep 28 20:46:20 2011 +0000
tree 999b5db35ce7b45b300a435c7a3f3df6a33edceb
parent 4cb8830552884f1176b66e96a2589d13f249eaac

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: http://src.chromium.org/svn/trunk/src/net/tools/testserver@103172 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

testserver.py

diff --git a/testserver.py b/testserver.py
index 0849a29..4147004 100755
--- a/testserver.py
+++ b/testserver.py
@@ -1418,6 +1418,8 @@
                                                              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