From c7520c34b0139c6a5b641ef669d7c9cd07e21ae3 Mon Sep 17 00:00:00 2001 From: "tonyg@chromium.org" Date: Thu, 11 Apr 2013 22:05:24 +0000 Subject: [Telemetry] Fix 2 bugs in memory_cache_http_server. (1) SendHead may return None. So we need to check for a None resource_range in addition to a None resource_range.response. This was causing stacks in the server, but as far as I can tell, didn't actually affect anything. (2) Make index.html work on windows. We must check for the right path sep. BUG=None TEST=morejs page cycler on windows NOTRY=True Review URL: https://chromiumcodereview.appspot.com/13895004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193774 0039d316-1c4b-4281-b951-d872f2087c98 --- tools/telemetry/telemetry/core/memory_cache_http_server.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'tools') diff --git a/tools/telemetry/telemetry/core/memory_cache_http_server.py b/tools/telemetry/telemetry/core/memory_cache_http_server.py index 50abe2a..5d0995a 100644 --- a/tools/telemetry/telemetry/core/memory_cache_http_server.py +++ b/tools/telemetry/telemetry/core/memory_cache_http_server.py @@ -21,7 +21,7 @@ class MemoryCacheHTTPRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler): """Serve a GET request.""" resource_range = self.SendHead() - if not resource_range.resource: + if not resource_range or not resource_range.resource: return response = resource_range.resource['response'] @@ -163,9 +163,11 @@ class MemoryCacheHTTPServer(SocketServer.ThreadingMixIn, 'response': response, 'zipped': zipped } - if file_path.endswith('/index.html'): + + index = os.path.sep + 'index.html' + if file_path.endswith(index): self.resource_map[ - file_path[:-len('/index.html')]] = self.resource_map[file_path] + file_path[:-len(index)]] = self.resource_map[file_path] def Main(): -- cgit v1.1