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

Unified Diff: net/server/http_server.cc

Issue 10161005: Add DefaultListenSocket. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Matt's comments Created 8 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: net/server/http_server.cc
diff --git a/net/server/http_server.cc b/net/server/http_server.cc
index ad1fa6ee938a9aacc2e8e1e4df25663e15d5b8ae..16d002aebbe3db939ec1c2bdab424426acfa3466 100644
--- a/net/server/http_server.cc
+++ b/net/server/http_server.cc
@@ -212,14 +212,14 @@ bool HttpServer::ParseHeaders(HttpConnection* connection,
return false;
}
-void HttpServer::DidAccept(ListenSocket* server,
- ListenSocket* socket) {
+void HttpServer::DidAccept(StreamListenSocket* server,
+ StreamListenSocket* socket) {
HttpConnection* connection = new HttpConnection(this, socket);
id_to_connection_[connection->id()] = connection;
socket_to_connection_[socket] = connection;
}
-void HttpServer::DidRead(ListenSocket* socket,
+void HttpServer::DidRead(StreamListenSocket* socket,
const char* data,
int len) {
HttpConnection* connection = FindConnection(socket);
@@ -267,7 +267,7 @@ void HttpServer::DidRead(ListenSocket* socket,
}
}
-void HttpServer::DidClose(ListenSocket* socket) {
+void HttpServer::DidClose(StreamListenSocket* socket) {
HttpConnection* connection = FindConnection(socket);
DCHECK(connection != NULL);
id_to_connection_.erase(connection->id());
@@ -282,7 +282,7 @@ HttpConnection* HttpServer::FindConnection(int connection_id) {
return it->second;
}
-HttpConnection* HttpServer::FindConnection(ListenSocket* socket) {
+HttpConnection* HttpServer::FindConnection(StreamListenSocket* socket) {
SocketToConnectionMap::iterator it = socket_to_connection_.find(socket);
if (it == socket_to_connection_.end())
return NULL;

Powered by Google App Engine
This is Rietveld 408576698