summaryrefslogtreecommitdiffstats
path: root/net/tools
diff options
context:
space:
mode:
authorrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-18 21:57:35 +0000
committerrvargas@google.com <rvargas@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-18 21:57:35 +0000
commit39d4a0984353dd3698b44e411dc82423d8a7c33e (patch)
treeb1f3d658bf726f7593b8865bf233387eed36dc92 /net/tools
parent2a9f248416fa4d1d7c1f0e5830785db4d98a72b7 (diff)
downloadchromium_src-39d4a0984353dd3698b44e411dc82423d8a7c33e.zip
chromium_src-39d4a0984353dd3698b44e411dc82423d8a7c33e.tar.gz
chromium_src-39d4a0984353dd3698b44e411dc82423d8a7c33e.tar.bz2
Http cache: Make sure that we don't use http 1.1 features
for http 1.0 resources. BUG=74061 TEST=netunittests Review URL: http://codereview.chromium.org/6995010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85821 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
-rwxr-xr-xnet/tools/testserver/testserver.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py
index ef40936..d3d7203 100755
--- a/net/tools/testserver/testserver.py
+++ b/net/tools/testserver/testserver.py
@@ -896,6 +896,9 @@ class TestPageHandler(BasePageHandler):
# Authentication successful. (Return a cachable response to allow for
# testing cached pages that require authentication.)
+ old_protocol_version = self.protocol_version
+ self.protocol_version = "HTTP/1.1"
+
if_none_match = self.headers.getheader('if-none-match')
if if_none_match == "abc":
self.send_response(304)
@@ -906,6 +909,7 @@ class TestPageHandler(BasePageHandler):
gif_path = os.path.join(self.server.data_dir, *test_image_path)
if not os.path.isfile(gif_path):
self.send_error(404)
+ self.protocol_version = old_protocol_version
return True
f = open(gif_path, "rb")
@@ -931,6 +935,7 @@ class TestPageHandler(BasePageHandler):
self.wfile.write('You sent:<br>%s<p>' % self.headers)
self.wfile.write('</body></html>')
+ self.protocol_version = old_protocol_version
return True
def GetNonce(self, force_reset=False):