Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(87)

Side by Side Diff: net/websockets/websocket_net_log_params.cc

Issue 7649006: more changes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix another typo Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/spdy/spdy_session.cc ('k') | net/websockets/websocket_net_log_params_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/websockets/websocket_net_log_params.h" 5 #include "net/websockets/websocket_net_log_params.h"
6 6
7 namespace net { 7 namespace net {
8 8
9 NetLogWebSocketHandshakeParameter::NetLogWebSocketHandshakeParameter( 9 NetLogWebSocketHandshakeParameter::NetLogWebSocketHandshakeParameter(
10 const std::string& headers) 10 const std::string& headers)
11 : headers_(headers) { 11 : headers_(headers) {
12 } 12 }
13 13
14 Value* NetLogWebSocketHandshakeParameter::ToValue() const { 14 Value* NetLogWebSocketHandshakeParameter::ToValue() const {
15 DictionaryValue* dict = new DictionaryValue(); 15 DictionaryValue* dict = new DictionaryValue();
16 ListValue* headers = new ListValue(); 16 ListValue* headers = new ListValue();
17 17
18 size_t last = 0; 18 size_t last = 0;
19 size_t headers_size = headers_.size(); 19 size_t headers_size = headers_.size();
20 size_t pos = 0; 20 size_t pos = 0;
21 while (pos <= headers_size) { 21 while (pos <= headers_size) {
22 if (pos == headers_size || 22 if (pos == headers_size ||
23 (headers_[pos] == '\r' && 23 (headers_[pos] == '\r' &&
24 pos + 1 < headers_size && headers_[pos + 1] == '\n')) { 24 pos + 1 < headers_size && headers_[pos + 1] == '\n')) {
25 std::string entry = headers_.substr(last, pos - last); 25 std::string entry = headers_.substr(last, pos - last);
26 pos += 2; 26 pos += 2;
27 last = pos; 27 last = pos;
28 28
29 headers->Append(new StringValue(entry)); 29 headers->Append(base::StringValue::New(entry));
30 30
31 if (entry.empty()) { 31 if (entry.empty()) {
32 // Dump WebSocket key3. 32 // Dump WebSocket key3.
33 std::string key; 33 std::string key;
34 for (; pos < headers_size; ++pos) { 34 for (; pos < headers_size; ++pos) {
35 key += base::StringPrintf("\\x%02x", headers_[pos] & 0xff); 35 key += base::StringPrintf("\\x%02x", headers_[pos] & 0xff);
36 } 36 }
37 headers->Append(new StringValue(key)); 37 headers->Append(base::StringValue::New(key));
38 break; 38 break;
39 } 39 }
40 } else { 40 } else {
41 ++pos; 41 ++pos;
42 } 42 }
43 } 43 }
44 44
45 dict->Set("headers", headers); 45 dict->Set("headers", headers);
46 return dict; 46 return dict;
47 } 47 }
48 48
49 NetLogWebSocketHandshakeParameter::~NetLogWebSocketHandshakeParameter() {} 49 NetLogWebSocketHandshakeParameter::~NetLogWebSocketHandshakeParameter() {}
50 50
51 } // namespace net 51 } // namespace net
OLDNEW
« no previous file with comments | « net/spdy/spdy_session.cc ('k') | net/websockets/websocket_net_log_params_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698