diff options
| author | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 06:41:12 +0000 |
|---|---|---|
| committer | dcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 06:41:12 +0000 |
| commit | 69d7f89d6a93e0fbce451960287066195c6d4ea0 (patch) | |
| tree | 51c8c1f971d39d652ec38ed76070539bb33e85c7 /net/server | |
| parent | e3748a79b523a8d365d4a33ef986eebb4186fa78 (diff) | |
| download | chromium_src-69d7f89d6a93e0fbce451960287066195c6d4ea0.zip chromium_src-69d7f89d6a93e0fbce451960287066195c6d4ea0.tar.gz chromium_src-69d7f89d6a93e0fbce451960287066195c6d4ea0.tar.bz2 | |
Revert "Rewrite std::string("") to std::string(), Linux edition."
This reverts commit e59558b78e8c6a1b0bd916a724724b638c3c91b6.
Revert "Fix build after r193020."
This reverts commit 558a35897f6b3ffbcaefde927c1f150b815d140a.
Revert "Really fix build after r193020."
This reverts commit e3748a79b523a8d365d4a33ef986eebb4186fa78.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193030 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/server')
| -rw-r--r-- | net/server/http_server.cc | 2 | ||||
| -rw-r--r-- | net/server/http_server_request_info.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/server/http_server.cc b/net/server/http_server.cc index a0c9a3a..4f1fb08 100644 --- a/net/server/http_server.cc +++ b/net/server/http_server.cc @@ -62,7 +62,7 @@ void HttpServer::Send200(int connection_id, } void HttpServer::Send404(int connection_id) { - Send(connection_id, HTTP_NOT_FOUND, std::string(), "text/html"); + Send(connection_id, HTTP_NOT_FOUND, "", "text/html"); } void HttpServer::Send500(int connection_id, const std::string& message) { diff --git a/net/server/http_server_request_info.cc b/net/server/http_server_request_info.cc index 08b925f..eda597a 100644 --- a/net/server/http_server_request_info.cc +++ b/net/server/http_server_request_info.cc @@ -16,7 +16,7 @@ std::string HttpServerRequestInfo::GetHeaderValue( headers.find(header_name); if (it != headers.end()) return it->second; - return std::string(); + return ""; } } // namespace net |