diff options
author | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-05 11:32:40 +0000 |
---|---|---|
committer | pfeldman@chromium.org <pfeldman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-05 11:32:40 +0000 |
commit | 0569d86c57dd9385556e4ab4792e74d552c9df59 (patch) | |
tree | b197fd2a9f1296b7ba49601ba0f31b3ba540de1a /net/tools | |
parent | ca311ce0f5002da40625bf87a24858d294d1d1bc (diff) | |
download | chromium_src-0569d86c57dd9385556e4ab4792e74d552c9df59.zip chromium_src-0569d86c57dd9385556e4ab4792e74d552c9df59.tar.gz chromium_src-0569d86c57dd9385556e4ab4792e74d552c9df59.tar.bz2 |
Brushed up listen socket:
- Upstreamed support for partial results from devtools' version
- Made DidRead receive data and length (in order to support websockets data)
- Fixed all the clients.
Added net/server with http socket implementation that supports websockets. Will remove net/tools fetch client and server later.
Review URL: http://codereview.chromium.org/2868036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51635 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
-rw-r--r-- | net/tools/fetch/http_listen_socket.cc | 5 | ||||
-rw-r--r-- | net/tools/fetch/http_listen_socket.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/net/tools/fetch/http_listen_socket.cc b/net/tools/fetch/http_listen_socket.cc index 033afc4..e135322 100644 --- a/net/tools/fetch/http_listen_socket.cc +++ b/net/tools/fetch/http_listen_socket.cc @@ -182,8 +182,9 @@ void HttpListenSocket::DidAccept(ListenSocket* server, } void HttpListenSocket::DidRead(ListenSocket* connection, - const std::string& data) { - recv_data_ += data; + const char* data, + int len) { + recv_data_.append(data, len); while (recv_data_.length()) { HttpServerRequestInfo* request = ParseHeaders(); if (!request) diff --git a/net/tools/fetch/http_listen_socket.h b/net/tools/fetch/http_listen_socket.h index 15df455..a1b77c5e 100644 --- a/net/tools/fetch/http_listen_socket.h +++ b/net/tools/fetch/http_listen_socket.h @@ -36,7 +36,7 @@ class HttpListenSocket : public ListenSocket, // ListenSocketDelegate virtual void DidAccept(ListenSocket* server, ListenSocket* connection); - virtual void DidRead(ListenSocket* connection, const std::string& data); + virtual void DidRead(ListenSocket* connection, const char* data, int len); virtual void DidClose(ListenSocket* sock); private: |