diff options
Diffstat (limited to 'net/tools/flip_server')
| -rw-r--r-- | net/tools/flip_server/acceptor_thread.cc | 4 | ||||
| -rw-r--r-- | net/tools/flip_server/flip_in_mem_edsm_server.cc | 26 | ||||
| -rw-r--r-- | net/tools/flip_server/spdy_interface.cc | 11 | ||||
| -rw-r--r-- | net/tools/flip_server/streamer_interface.cc | 8 |
4 files changed, 15 insertions, 34 deletions
diff --git a/net/tools/flip_server/acceptor_thread.cc b/net/tools/flip_server/acceptor_thread.cc index ed8a3ec..b16d181 100644 --- a/net/tools/flip_server/acceptor_thread.cc +++ b/net/tools/flip_server/acceptor_thread.cc @@ -105,9 +105,7 @@ void SMAcceptorThread::HandleConnection(int server_fd, NULL, &epoll_server_, server_fd, - std::string(), - std::string(), - remote_ip, + "", "", remote_ip, use_ssl_); if (server_connection->initialized()) active_server_connections_.push_back(server_connection); diff --git a/net/tools/flip_server/flip_in_mem_edsm_server.cc b/net/tools/flip_server/flip_in_mem_edsm_server.cc index 15fb9644..8ba1505 100644 --- a/net/tools/flip_server/flip_in_mem_edsm_server.cc +++ b/net/tools/flip_server/flip_in_mem_edsm_server.cc @@ -335,16 +335,11 @@ int main (int argc, char**argv) std::string value = cl.GetSwitchValueASCII("spdy-server"); std::vector<std::string> valueArgs = split(value, ','); while (valueArgs.size() < 4) - valueArgs.push_back(std::string()); + valueArgs.push_back(""); g_proxy_config.AddAcceptor(net::FLIP_HANDLER_SPDY_SERVER, - valueArgs[0], - valueArgs[1], - valueArgs[2], - valueArgs[3], - std::string(), - std::string(), - std::string(), - std::string(), + valueArgs[0], valueArgs[1], + valueArgs[2], valueArgs[3], + "", "", "", "", 0, FLAGS_accept_backlog_size, FLAGS_disable_nagle, @@ -361,16 +356,11 @@ int main (int argc, char**argv) std::string value = cl.GetSwitchValueASCII("http-server"); std::vector<std::string> valueArgs = split(value, ','); while (valueArgs.size() < 4) - valueArgs.push_back(std::string()); + valueArgs.push_back(""); g_proxy_config.AddAcceptor(net::FLIP_HANDLER_HTTP_SERVER, - valueArgs[0], - valueArgs[1], - valueArgs[2], - valueArgs[3], - std::string(), - std::string(), - std::string(), - std::string(), + valueArgs[0], valueArgs[1], + valueArgs[2], valueArgs[3], + "", "", "", "", 0, FLAGS_accept_backlog_size, FLAGS_disable_nagle, diff --git a/net/tools/flip_server/spdy_interface.cc b/net/tools/flip_server/spdy_interface.cc index 649e99e..1c34e79 100644 --- a/net/tools/flip_server/spdy_interface.cc +++ b/net/tools/flip_server/spdy_interface.cc @@ -112,14 +112,9 @@ SMInterface* SpdySM::FindOrMakeNewSMConnectionInterface( } sm_http_interface->InitSMInterface(this, server_idx); - sm_http_interface->InitSMConnection(NULL, - sm_http_interface, - epoll_server_, - -1, - server_ip, - server_port, - std::string(), - false); + sm_http_interface->InitSMConnection(NULL, sm_http_interface, + epoll_server_, -1, + server_ip, server_port, "", false); return sm_http_interface; } diff --git a/net/tools/flip_server/streamer_interface.cc b/net/tools/flip_server/streamer_interface.cc index b1612e7..9e6e6c8 100644 --- a/net/tools/flip_server/streamer_interface.cc +++ b/net/tools/flip_server/streamer_interface.cc @@ -131,13 +131,11 @@ int StreamerSM::PostAcceptHook() { } // The Streamer interface is used to stream HTTPS connections, so we // will always use the https_server_ip/port here. - sm_other_interface_->InitSMConnection(NULL, - sm_other_interface_, - epoll_server_, - -1, + sm_other_interface_->InitSMConnection(NULL, sm_other_interface_, + epoll_server_, -1, acceptor_->https_server_ip_, acceptor_->https_server_port_, - std::string(), + "", false); return 1; |