Attachment #290505 for bug #378629

View | Details | Raw Unified | Return to bug 378629
Collapse All | Expand All

Lines 53-59 Link Here

(-)http/HttpConnectionManager.cpp.orig (-2 / +2 lines)
53	}	53	}
54		54
55	void HttpConnectionManager::acceptIncomingConnection() {	55	void HttpConnectionManager::acceptIncomingConnection() {
56	boost::shared_ptr<ip::tcp::socket> socket(new ip::tcp::socket(acceptor_.io_service()));	56	boost::shared_ptr<ip::tcp::socket> socket(new ip::tcp::socket(acceptor_.get_io_service()));
57		57
58	acceptor_.async_accept(*socket, boost::bind(&HttpConnectionManager::handleClientConnection,	58	acceptor_.async_accept(*socket, boost::bind(&HttpConnectionManager::handleClientConnection,
59	this, socket, placeholders::error));	59	this, socket, placeholders::error));
Lines 63-69 Link Here
63	void HttpConnectionManager::bridgeHttpRequest(boost::shared_ptr<ip::tcp::socket> socket,	63	void HttpConnectionManager::bridgeHttpRequest(boost::shared_ptr<ip::tcp::socket> socket,
64	ip::tcp::endpoint destination)	64	ip::tcp::endpoint destination)
65	{	65	{
66	Bridge::ptr bridge = HttpBridge::create(socket, acceptor_.io_service(),	66	Bridge::ptr bridge = HttpBridge::create(socket, acceptor_.get_io_service(),
67	FingerprintManager::getInstance());	67	FingerprintManager::getInstance());
68		68
69	bridge->getServerSocket().	69	bridge->getServerSocket().




}

void SSLConnectionManager::acceptIncomingConnection() {
  boost::shared_ptr<ip::tcp::socket> socket(new ip::tcp::socket(acceptor.get_io_service()));

  acceptor.async_accept(*socket, boost::bind(&SSLConnectionManager::handleClientConnection,
					     this, socket, placeholders::error));

					     ip::tcp::endpoint &destination)

{
  Bridge::ptr bridge = RawBridge::create(clientSocket, destination, acceptor.get_io_service());
  bridge->shuttle();
}


					ip::tcp::endpoint &destination,
					bool wildcardOK)
{
  ip::tcp::socket serverSocket(acceptor.get_io_service());
  boost::system::error_code error;
  serverSocket.connect(destination, error);


Return to bug 378629

Lines 44-50 Link Here

(-)SSLConnectionManager.cpp.orig (-3 / +3 lines)
44	}	44	}
45		45
46	void SSLConnectionManager::acceptIncomingConnection() {	46	void SSLConnectionManager::acceptIncomingConnection() {
47	boost::shared_ptr<ip::tcp::socket> socket(new ip::tcp::socket(acceptor.io_service()));	47	boost::shared_ptr<ip::tcp::socket> socket(new ip::tcp::socket(acceptor.get_io_service()));
48		48
49	acceptor.async_accept(*socket, boost::bind(&SSLConnectionManager::handleClientConnection,	49	acceptor.async_accept(*socket, boost::bind(&SSLConnectionManager::handleClientConnection,
50	this, socket, placeholders::error));	50	this, socket, placeholders::error));
Lines 76-82 Link Here
76	ip::tcp::endpoint &destination)	76	ip::tcp::endpoint &destination)
77		77
78	{	78	{
79	Bridge::ptr bridge = RawBridge::create(clientSocket, destination, acceptor.io_service());	79	Bridge::ptr bridge = RawBridge::create(clientSocket, destination, acceptor.get_io_service());
80	bridge->shuttle();	80	bridge->shuttle();
81	}	81	}
82		82
Lines 134-140 Link Here
134	ip::tcp::endpoint &destination,	134	ip::tcp::endpoint &destination,
135	bool wildcardOK)	135	bool wildcardOK)
136	{	136	{
137	ip::tcp::socket serverSocket(acceptor.io_service());	137	ip::tcp::socket serverSocket(acceptor.get_io_service());
138	boost::system::error_code error;	138	boost::system::error_code error;
139	serverSocket.connect(destination, error);	139	serverSocket.connect(destination, error);
140		140