summaryrefslogtreecommitdiffstats
path: root/net/net.gyp
diff options
context:
space:
mode:
authortyoshino@google.com <tyoshino@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-12 11:19:56 +0000
committertyoshino@google.com <tyoshino@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-12 11:19:56 +0000
commit7ee45785e32196ea2b4b32ef3aed93c4a962aa2f (patch)
tree345ffffbc492c869288cfe25fd7b7a7592338d0e /net/net.gyp
parent250bad43d9d53cefbe36fd53506b2ea45f9c2ae2 (diff)
downloadchromium_src-7ee45785e32196ea2b4b32ef3aed93c4a962aa2f.zip
chromium_src-7ee45785e32196ea2b4b32ef3aed93c4a962aa2f.tar.gz
chromium_src-7ee45785e32196ea2b4b32ef3aed93c4a962aa2f.tar.bz2
Stop using SplitStringDontTrim in NetLogWebSocketHandshakeParameter::ToValue()
Since key3 may contain some line feeds, we cannot use SplitStringDontTrim. We use this opportunity to make parser recongize only CR+LF as a separator. R=ukai BUG=62918 TEST=Doesn't crash when we open some page using WebSocket and chrome://net-internals. Review URL: http://codereview.chromium.org/4874001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65933 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/net.gyp')
-rw-r--r--net/net.gyp1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/net.gyp b/net/net.gyp
index 5fa9d6a..a2aff3b 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -971,6 +971,7 @@
'websockets/websocket_handshake_handler_unittest.cc',
'websockets/websocket_handshake_unittest.cc',
'websockets/websocket_job_unittest.cc',
+ 'websockets/websocket_net_log_params_unittest.cc',
'websockets/websocket_throttle_unittest.cc',
'websockets/websocket_unittest.cc',
],