Browse Source

Merge pull request #1295 from l-n-s/websocket_support

Support websocket connections over HTTP proxy
pull/1301/head
orignal 6 years ago committed by GitHub
parent
commit
a463dbc5fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      libi2pd_client/HTTPProxy.cpp
  2. 6
      libi2pd_client/I2PTunnel.cpp

6
libi2pd_client/HTTPProxy.cpp

@ -219,7 +219,11 @@ 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 */ /* close connection, if not Connection: (U|u)pgrade (for websocket) */
auto h = req.GetHeader ("Connection");
auto x = h.find("pgrade");
if (!(x != std::string::npos && std::tolower(h[x - 1]) == 'u'))
req.UpdateHeader("Connection", "close");
} }
/** /**

6
libi2pd_client/I2PTunnel.cpp

@ -256,7 +256,13 @@ namespace client
{ {
if (!m_ConnectionSent && !line.compare(0, 10, "Connection")) if (!m_ConnectionSent && !line.compare(0, 10, "Connection"))
{ {
/* close connection, if not Connection: (U|u)pgrade (for websocket) */
auto x = line.find("pgrade");
if (x != std::string::npos && std::tolower(line[x - 1]) == 'u')
m_OutHeader << line << "\r\n";
else
m_OutHeader << "Connection: close\r\n"; m_OutHeader << "Connection: close\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