diff options
| author | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-11 22:05:24 +0000 |
|---|---|---|
| committer | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-11 22:05:24 +0000 |
| commit | c7520c34b0139c6a5b641ef669d7c9cd07e21ae3 (patch) | |
| tree | 9792a0cbf3bd8c6d060ff3adef98310a6b12a105 /tools | |
| parent | d1791faa3feea713f8b1332694194c16adc9f018 (diff) | |
| download | chromium_src-c7520c34b0139c6a5b641ef669d7c9cd07e21ae3.zip chromium_src-c7520c34b0139c6a5b641ef669d7c9cd07e21ae3.tar.gz chromium_src-c7520c34b0139c6a5b641ef669d7c9cd07e21ae3.tar.bz2 | |
[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
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/telemetry/telemetry/core/memory_cache_http_server.py | 8 |
1 files changed, 5 insertions, 3 deletions
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(): |