Browse Source

Support websocket connections over HTTP proxy

pull/1295/head
l-n-s 6 years ago
parent
commit
f617b27110
  1. 4
      libi2pd_client/HTTPProxy.cpp
  2. 6
      libi2pd_client/I2PTunnel.cpp

4
libi2pd_client/HTTPProxy.cpp

@ -219,7 +219,9 @@ namespace proxy {
/* replace headers */ /* replace headers */
req.UpdateHeader("User-Agent", "MYOB/6.66 (AN/ON)"); req.UpdateHeader("User-Agent", "MYOB/6.66 (AN/ON)");
/* add headers */ /* add headers */
req.UpdateHeader("Connection", "close"); /* keep-alive conns not supported yet */ auto h = req.GetHeader ("Connection");
if (h.find("upgrade") == std::string::npos && h.find("Upgrade") == std::string::npos)
req.UpdateHeader("Connection", "close"); /* close everything, except websocket */
} }
/** /**

6
libi2pd_client/I2PTunnel.cpp

@ -256,7 +256,11 @@ namespace client
{ {
if (!m_ConnectionSent && !line.compare(0, 10, "Connection")) if (!m_ConnectionSent && !line.compare(0, 10, "Connection"))
{ {
m_OutHeader << "Connection: close\r\n"; if (line.find("upgrade") == std::string::npos && line.find("Upgrade") == std::string::npos)
m_OutHeader << "Connection: close\r\n"; /* close everything, except websocket */
else
m_OutHeader << line << "\r\n";
m_ConnectionSent = true; m_ConnectionSent = true;
} }
else if (!m_ProxyConnectionSent && !line.compare(0, 16, "Proxy-Connection")) else if (!m_ProxyConnectionSent && !line.compare(0, 16, "Proxy-Connection"))

Loading…
Cancel
Save