summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshadi@chromium.org <shadi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-05 04:41:06 +0000
committershadi@chromium.org <shadi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-05 04:41:06 +0000
commit2e815c55df7be1b319dc6280f7df3e0ecf23f09b (patch)
tree9f9b5c59f6ea7ba3f6a21ba3343262c275d10239
parenteb14d66f3c8a9a1ee3e829d1464747a2327f4e2a (diff)
downloadchromium_src-2e815c55df7be1b319dc6280f7df3e0ecf23f09b.zip
chromium_src-2e815c55df7be1b319dc6280f7df3e0ecf23f09b.tar.gz
chromium_src-2e815c55df7be1b319dc6280f7df3e0ecf23f09b.tar.bz2
Increase socket_timeout values for CNS requests. This timeout caused connections to drop suddenly.
BUG=126026 TEST=manual test. Review URL: http://codereview.chromium.org/10353004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135529 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-xmedia/tools/constrained_network_server/cns.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/media/tools/constrained_network_server/cns.py b/media/tools/constrained_network_server/cns.py
index dd8088f..c206c9c 100755
--- a/media/tools/constrained_network_server/cns.py
+++ b/media/tools/constrained_network_server/cns.py
@@ -201,9 +201,8 @@ class ConstrainedNetworkServer(object):
new_port: whether to use a new port for this request or not.
no_cache: Set reponse's cache-control to no-cache.
"""
- cherrypy.log('Got request for %s, bandwidth=%s, latency=%s, loss=%s, '
- 'new_port=%s, no_cache=%s, kwargs=%s' %
- (f, bandwidth, latency, loss, new_port, no_cache, kwargs))
+ cherrypy.log('Got request string: %s' % cherrypy.request.request_line)
+
if no_cache:
response = cherrypy.response
response.headers['Pragma'] = 'no-cache'
@@ -358,8 +357,9 @@ def Main():
cherrypy.log(e.msg)
return
- cherrypy.config.update(
- {'server.socket_host': '::', 'server.socket_port': options.port})
+ cherrypy.config.update({'server.socket_host': '::',
+ 'server.socket_port': options.port,
+ 'server.socket_timeout': 1000})
if options.threads:
cherrypy.config.update({'server.thread_pool': options.threads})