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

Side by Side Diff: net/test/embedded_test_server/http_response.cc

Issue 20182002: Make inttypes.h and similar macro usage C++11-friendly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: line Created 7 years, 5 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 | « content/common/content_param_traits.cc ('k') | net/tools/get_server_time/get_server_time.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/test/embedded_test_server/http_response.h" 5 #include "net/test/embedded_test_server/http_response.h"
6 6
7 #include "base/format_macros.h" 7 #include "base/format_macros.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/strings/stringprintf.h" 9 #include "base/strings/stringprintf.h"
10 #include "net/http/http_status_code.h" 10 #include "net/http/http_status_code.h"
(...skipping 16 matching lines...) Expand all
27 27
28 std::string http_reason_phrase(GetHttpReasonPhrase(code_)); 28 std::string http_reason_phrase(GetHttpReasonPhrase(code_));
29 29
30 // TODO(mtomasz): For http/1.0 requests, send http/1.0. 30 // TODO(mtomasz): For http/1.0 requests, send http/1.0.
31 base::StringAppendF(&response_builder, 31 base::StringAppendF(&response_builder,
32 "HTTP/1.1 %d %s\r\n", 32 "HTTP/1.1 %d %s\r\n",
33 code_, 33 code_,
34 http_reason_phrase.c_str()); 34 http_reason_phrase.c_str());
35 base::StringAppendF(&response_builder, "Connection: close\r\n"); 35 base::StringAppendF(&response_builder, "Connection: close\r\n");
36 base::StringAppendF(&response_builder, 36 base::StringAppendF(&response_builder,
37 "Content-Length: %"PRIuS"\r\n", 37 "Content-Length: %" PRIuS "\r\n",
38 content_.size()); 38 content_.size());
39 base::StringAppendF(&response_builder, 39 base::StringAppendF(&response_builder,
40 "Content-Type: %s\r\n", 40 "Content-Type: %s\r\n",
41 content_type_.c_str()); 41 content_type_.c_str());
42 for (size_t i = 0; i < custom_headers_.size(); ++i) { 42 for (size_t i = 0; i < custom_headers_.size(); ++i) {
43 const std::string& header_name = custom_headers_[i].first; 43 const std::string& header_name = custom_headers_[i].first;
44 const std::string& header_value = custom_headers_[i].second; 44 const std::string& header_value = custom_headers_[i].second;
45 DCHECK(header_value.find_first_of("\n\r") == std::string::npos) << 45 DCHECK(header_value.find_first_of("\n\r") == std::string::npos) <<
46 "Malformed header value."; 46 "Malformed header value.";
47 base::StringAppendF(&response_builder, 47 base::StringAppendF(&response_builder,
48 "%s: %s\r\n", 48 "%s: %s\r\n",
49 header_name.c_str(), 49 header_name.c_str(),
50 header_value.c_str()); 50 header_value.c_str());
51 } 51 }
52 base::StringAppendF(&response_builder, "\r\n"); 52 base::StringAppendF(&response_builder, "\r\n");
53 53
54 return response_builder + content_; 54 return response_builder + content_;
55 } 55 }
56 56
57 } // namespace test_server 57 } // namespace test_server
58 } // namespace net 58 } // namespace net
OLDNEW
« no previous file with comments | « content/common/content_param_traits.cc ('k') | net/tools/get_server_time/get_server_time.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698