diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java
index 7f498f9cec5430b5658af437108685a2589de827..75cdde926e1e852e2e379a65579d168be5bcc3ae 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/HTTPResponseOutputStream.java
@@ -50,7 +50,6 @@ class HTTPResponseOutputStream extends FilterOutputStream {
/** we ignore any potential \r, since we trim it on write anyway */
private static final byte NL = '\n';
private static final byte[] CONNECTION_CLOSE = DataHelper.getASCII("Connection: close\r\n");
- private static final byte[] PROXY_CONNECTION_CLOSE = DataHelper.getASCII("Proxy-Connection: close\r\n");
private static final byte[] CRLF = DataHelper.getASCII("\r\n");
public HTTPResponseOutputStream(OutputStream raw) {
@@ -145,7 +144,6 @@ class HTTPResponseOutputStream extends FilterOutputStream {
String responseLine = null;
boolean connectionSent = false;
- boolean proxyConnectionSent = false;
int lastEnd = -1;
byte[] data = _headerBuffer.getData();
@@ -181,14 +179,12 @@ class HTTPResponseOutputStream extends FilterOutputStream {
if (val.toLowerCase(Locale.US).contains("upgrade")) {
// pass through for websocket
out.write(DataHelper.getASCII("Connection: " + val + "\r\n"));
- proxyConnectionSent = true;
} else {
out.write(CONNECTION_CLOSE);
}
connectionSent = true;
} else if ("proxy-connection".equals(lcKey)) {
- out.write(PROXY_CONNECTION_CLOSE);
- proxyConnectionSent = true;
+ // Nonstandard, strip
} else if ("content-encoding".equals(lcKey) && "x-i2p-gzip".equals(val.toLowerCase(Locale.US))) {
_gzip = true;
} else if ("proxy-authenticate".equals(lcKey)) {
@@ -231,8 +227,6 @@ class HTTPResponseOutputStream extends FilterOutputStream {
if (!connectionSent)
out.write(CONNECTION_CLOSE);
- if (!proxyConnectionSent)
- out.write(PROXY_CONNECTION_CLOSE);
finishHeaders();
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java
index 5920e9ebea428c4ad59be5f22ad882887e1eec78..98ed56497e39d323faf4e4e4cdde447161be3e84 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java
@@ -67,7 +67,6 @@ public class I2PTunnelConnectClient extends I2PTunnelHTTPClientBase implements R
"Content-Type: text/html; charset=iso-8859-1\r\n"+
"Cache-Control: no-cache\r\n"+
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n"+
"<html><body><H1>I2P ERROR: METHOD NOT ALLOWED</H1>"+
"The request uses a bad protocol. "+
@@ -78,7 +77,6 @@ public class I2PTunnelConnectClient extends I2PTunnelHTTPClientBase implements R
"Content-Type: text/html; charset=iso-8859-1\r\n"+
"Cache-Control: no-cache\r\n"+
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n"+
"<html><body><H1>I2P ERROR: REQUEST DENIED</H1>"+
"Your browser is misconfigured. Do not use the proxy to access the router console or other localhost destinations.<BR>";
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
index e42077499340c6dcfa95d269abae4725a5fca3ec..c80973fd05895be3048eb685fa5435125faa71cf 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
@@ -107,7 +107,6 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
"Content-Type: text/html; charset=iso-8859-1\r\n" +
"Cache-Control: no-cache\r\n" +
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n" +
"<html><body><H1>I2P ERROR: REQUEST DENIED</H1>" +
"You attempted to connect to a non-I2P website or location.<BR>";
@@ -130,7 +129,6 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
"Content-Type: text/html; charset=iso-8859-1\r\n" +
"Cache-Control: no-cache\r\n" +
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n" +
"<html><body><H1>I2P ERROR: No outproxy found</H1>" +
"Your request was for a site outside of I2P, but you have no " +
@@ -141,7 +139,6 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
"Content-Type: text/html; charset=iso-8859-1\r\n" +
"Cache-Control: no-cache\r\n" +
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n" +
"<html><body><H1>I2P ERROR: Destination key conflict</H1>" +
"The addresshelper link you followed specifies a different destination key " +
@@ -158,7 +155,6 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
"Content-Type: text/html; charset=iso-8859-1\r\n" +
"Cache-Control: no-cache\r\n" +
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n" +
"<html><body><H1>I2P ERROR: Helper key not resolvable.</H1>" +
"The helper key you put for i2paddresshelper= is not resolvable. " +
@@ -170,7 +166,6 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
"Content-Type: text/html; charset=iso-8859-1\r\n" +
"Cache-Control: no-cache\r\n" +
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n" +
"<html><body><H1>New Host Name with Address Helper</H1>" +
"The address helper link you followed is for a new hostname that is not in your address book. " +
@@ -183,7 +178,6 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
"Content-Type: text/html; charset=iso-8859-1\r\n" +
"Cache-Control: no-cache\r\n" +
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n" +
"<html><body><H1>I2P ERROR: NON-HTTP PROTOCOL</H1>" +
"The request uses a bad protocol. " +
@@ -194,7 +188,6 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
"Content-Type: text/html; charset=iso-8859-1\r\n" +
"Cache-Control: no-cache\r\n" +
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n" +
"<html><body><H1>I2P ERROR: INVALID REQUEST URI</H1>" +
"The request URI is invalid, and probably contains illegal characters. " +
@@ -205,7 +198,6 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
"Content-Type: text/html; charset=iso-8859-1\r\n" +
"Cache-Control: no-cache\r\n" +
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n" +
"<html><body><H1>I2P ERROR: REQUEST DENIED</H1>" +
"Your browser is misconfigured. Do not use the proxy to access the router console or other localhost destinations.<BR>";
@@ -215,7 +207,6 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
"Content-Type: text/html; charset=iso-8859-1\r\n" +
"Cache-Control: no-cache\r\n" +
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n" +
"<html><body><H1>I2P ERROR: SSL to I2P address rejected</H1>" +
"SSL to .i2p addresses denied by configuration." +
@@ -1370,7 +1361,6 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
out.write(("HTTP/1.1 301 Address Helper Accepted\r\n" +
"Location: " + uri + "\r\n" +
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n").getBytes("UTF-8"));
} catch (IOException ioe) {
// ignore
@@ -1681,7 +1671,6 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
"HTTP/1.1 403 Disabled\r\n" +
"Content-Type: text/plain\r\n" +
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n" +
"Address helpers disabled";
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java
index 8c82fa857460790101486224c5dd0834f32b44f6..246b81146a636bf5c8968e4b24cb31d2f4611b4a 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClientBase.java
@@ -91,7 +91,6 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem
"Content-Type: text/html; charset=UTF-8\r\n" +
"Cache-Control: no-cache\r\n" +
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.5\r\n"; // try to get a UTF-8-encoded response back for the password
// put the auth type and realm in between
private static final String ERR_AUTH2 =
@@ -106,7 +105,6 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem
"Content-Type: text/html; charset=iso-8859-1\r\n"+
"Cache-Control: no-cache\r\n"+
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n"+
"<html><body><H1>I2P ERROR: No outproxy found</H1>"+
"Your request was for a site outside of I2P, but you have no "+
@@ -117,7 +115,6 @@ public abstract class I2PTunnelHTTPClientBase extends I2PTunnelClientBase implem
"Content-Type: text/html; charset=iso-8859-1\r\n" +
"Cache-Control: no-cache\r\n" +
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n" +
"<html><body><H1>I2P ERROR: DESTINATION NOT FOUND</H1>" +
"That I2P Destination was not found. Perhaps you pasted in the " +
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java
index 6101d15c593e25bc20ff4acfcfaa7d8c4fb1d25d..77f2e3c994c584aa1f1ccd31f9e4b634551d6e1b 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java
@@ -66,10 +66,12 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
private static final String HASH_HEADER = "X-I2P-DestHash";
private static final String DEST64_HEADER = "X-I2P-DestB64";
private static final String DEST32_HEADER = "X-I2P-DestB32";
+ private static final String PROXY_CONN_HEADER = "proxy-connection";
/** MUST ALL BE LOWER CASE */
private static final String[] CLIENT_SKIPHEADERS = {HASH_HEADER.toLowerCase(Locale.US),
DEST64_HEADER.toLowerCase(Locale.US),
- DEST32_HEADER.toLowerCase(Locale.US)};
+ DEST32_HEADER.toLowerCase(Locale.US),
+ PROXY_CONN_HEADER};
private static final String DATE_HEADER = "date";
private static final String SERVER_HEADER = "server";
private static final String X_POWERED_BY_HEADER = "x-powered-by";
@@ -77,7 +79,8 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
// https://httpoxy.org
private static final String PROXY_HEADER = "proxy";
/** MUST ALL BE LOWER CASE */
- private static final String[] SERVER_SKIPHEADERS = {DATE_HEADER, SERVER_HEADER, X_POWERED_BY_HEADER, X_RUNTIME_HEADER, PROXY_HEADER};
+ private static final String[] SERVER_SKIPHEADERS = {DATE_HEADER, SERVER_HEADER, X_POWERED_BY_HEADER, X_RUNTIME_HEADER,
+ PROXY_HEADER, PROXY_CONN_HEADER};
/** timeout for first request line */
private static final long HEADER_TIMEOUT = 15*1000;
/** total timeout for the request and all the headers */
@@ -106,7 +109,6 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
"Content-Type: text/html; charset=iso-8859-1\r\n"+
"Cache-Control: no-cache\r\n"+
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n"+
"<html><head><title>503 Service Unavailable</title></head>\n"+
"<body><h2>503 Service Unavailable</h2>\n" +
@@ -119,7 +121,6 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
"Content-Type: text/html; charset=iso-8859-1\r\n"+
"Cache-Control: no-cache\r\n"+
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n"+
"<html><head><title>429 Denied</title></head>\n"+
"<body><h2>429 Denied</h2>\n" +
@@ -131,7 +132,6 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
"Content-Type: text/html; charset=iso-8859-1\r\n"+
"Cache-Control: no-cache\r\n"+
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n"+
"<html><head><title>403 Denied</title></head>\n"+
"<body><h2>403 Denied</h2>\n" +
@@ -143,7 +143,6 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
"Content-Type: text/html; charset=iso-8859-1\r\n"+
"Cache-Control: no-cache\r\n"+
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n"+
"<html><head><title>503 Service Unavailable</title></head>\n"+
"<body><h2>503 Service Unavailable</h2>\n" +
@@ -155,7 +154,6 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
"Content-Type: text/html; charset=iso-8859-1\r\n"+
"Cache-Control: no-cache\r\n"+
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n"+
"<html><head><title>414 Request URI Too Long</title></head>\n"+
"<body><h2>414 Request URI too long</h2>\n" +
@@ -166,7 +164,6 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
"Content-Type: text/html; charset=iso-8859-1\r\n"+
"Cache-Control: no-cache\r\n"+
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n"+
"<html><head><title>431 Request Header Fields Too Large</title></head>\n"+
"<body><h2>431 Request header fields too large</h2>\n" +
@@ -178,7 +175,6 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
"Content-Type: text/html; charset=iso-8859-1\r\n"+
"Cache-Control: no-cache\r\n"+
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n"+
"<html><head><title>408 Request Timeout</title></head>\n"+
"<body><h2>408 Request timeout</h2>\n" +
@@ -189,7 +185,6 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
"Content-Type: text/html; charset=iso-8859-1\r\n"+
"Cache-Control: no-cache\r\n"+
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n"+
"<html><head><title>400 Bad Request</title></head>\n"+
"<body><h2>400 Bad request</h2>\n" +
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java
index 4c5427c21f97557d921b17a75b645635181ab241..dd1e0f9eab805f738f90d7841912ca90d47b1478 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/localServer/LocalHTTPServer.java
@@ -52,7 +52,6 @@ public abstract class LocalHTTPServer {
"HTTP/1.1 404 Not Found\r\n"+
"Content-Type: text/plain\r\n"+
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n"+
"HTTP Proxy local file not found";
@@ -60,7 +59,6 @@ public abstract class LocalHTTPServer {
"HTTP/1.1 409 Bad\r\n"+
"Content-Type: text/plain\r\n"+
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n"+
"Add to addressbook failed - bad parameters";
@@ -68,7 +66,6 @@ public abstract class LocalHTTPServer {
"HTTP/1.1 400 Bad\r\n"+
"Content-Type: text/plain\r\n"+
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n"+
"B32 update failed - bad parameters";
@@ -77,7 +74,6 @@ public abstract class LocalHTTPServer {
"Content-Type: text/plain\r\n" +
"Cache-Control: max-age=86400\r\n" +
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n"+
"I2P HTTP proxy OK";
@@ -87,7 +83,6 @@ public abstract class LocalHTTPServer {
"Referrer-Policy: no-referrer\r\n"+
"Cache-Control: no-cache\r\n" +
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n";
/**
@@ -150,7 +145,7 @@ public abstract class LocalHTTPServer {
out.write(type.getBytes("UTF-8"));
if (allowGzip && filename.endsWith(".gz"))
out.write("\r\nContent-Encoding: gzip".getBytes("UTF-8"));
- out.write("\r\nCache-Control: max-age=86400\r\nConnection: close\r\nProxy-Connection: close\r\n\r\n".getBytes("UTF-8"));
+ out.write("\r\nCache-Control: max-age=86400\r\nConnection: close\r\n\r\n".getBytes("UTF-8"));
if (!allowGzip && filename.endsWith(".gz")) {
// gunzip on the fly. should be very rare, all browsers should support gzip
OutputStream out2 = new GunzipOutputStream(out);
@@ -370,7 +365,6 @@ public abstract class LocalHTTPServer {
"Content-Type: text/html; charset=UTF-8\r\n"+
"Referrer-Policy: no-referrer\r\n"+
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n"+
"<html><head>"+
"<title>" + _t("Redirecting to {0}", idn) + "</title>\n" +
@@ -405,7 +399,6 @@ public abstract class LocalHTTPServer {
"Content-Type: text/html; charset=UTF-8\r\n"+
"Referrer-Policy: no-referrer\r\n"+
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"\r\n"+
"<html><head>"+
"<title>" + _t("Redirecting to {0}", idn) + "</title>\n" +
diff --git a/apps/i2ptunnel/resources/proxy/ahelper-conflict-header.ht b/apps/i2ptunnel/resources/proxy/ahelper-conflict-header.ht
index 88ed58c499fb542d2e2a2ded2ef97b7557ac52d5..89a0a0b89a89bcae2ae4a0aac6d0723c143e11b1 100644
--- a/apps/i2ptunnel/resources/proxy/ahelper-conflict-header.ht
+++ b/apps/i2ptunnel/resources/proxy/ahelper-conflict-header.ht
@@ -3,7 +3,6 @@ Content-Type: text/html; charset=UTF-8
Referrer-Policy: no-referrer
Cache-Control: no-cache
Connection: close
-Proxy-Connection: close
X-XSS-Protection: 1; mode=block
X-Content-Type-Options: nosniff
Referrer-Policy: no-referrer
diff --git a/apps/i2ptunnel/resources/proxy/ahelper-new-header.ht b/apps/i2ptunnel/resources/proxy/ahelper-new-header.ht
index ffee5e3a93cc1f9a5d01fc26877b72f0bf01f889..bd6070b925661f6cfa42c7610872fd6641ed1467 100644
--- a/apps/i2ptunnel/resources/proxy/ahelper-new-header.ht
+++ b/apps/i2ptunnel/resources/proxy/ahelper-new-header.ht
@@ -3,7 +3,6 @@ Content-Type: text/html; charset=UTF-8
Referrer-Policy: no-referrer
Cache-Control: no-cache
Connection: close
-Proxy-Connection: close
X-XSS-Protection: 1; mode=block
X-Content-Type-Options: nosniff
Referrer-Policy: no-referrer
diff --git a/apps/i2ptunnel/resources/proxy/ahelper-notfound-header.ht b/apps/i2ptunnel/resources/proxy/ahelper-notfound-header.ht
index 5d6a826d2b1d06e35ad9fb1c559a898d886d8aa6..a9eda400c88c7f629ddda97202eba791e6cbbef0 100644
--- a/apps/i2ptunnel/resources/proxy/ahelper-notfound-header.ht
+++ b/apps/i2ptunnel/resources/proxy/ahelper-notfound-header.ht
@@ -2,7 +2,6 @@ HTTP/1.1 409 Bad Helper
Content-Type: text/html; charset=UTF-8
Cache-Control: no-cache
Connection: close
-Proxy-Connection: close
X-XSS-Protection: 1; mode=block
X-Content-Type-Options: nosniff
Referrer-Policy: no-referrer
diff --git a/apps/i2ptunnel/resources/proxy/auth-header.ht b/apps/i2ptunnel/resources/proxy/auth-header.ht
index 3bf2b01e7dccd7197baddbdc9270786c98b64c71..43941e7ccfc49bc4a0694315c2dc16bee306192d 100644
--- a/apps/i2ptunnel/resources/proxy/auth-header.ht
+++ b/apps/i2ptunnel/resources/proxy/auth-header.ht
@@ -4,7 +4,6 @@ Accept-Charset: ISO-8859-1,utf-8;q=0.7,*;q=0.5
Proxy-Authenticate: Basic realm="I2P HTTP Proxy"
Cache-Control: no-cache
Connection: close
-Proxy-Connection: close
X-XSS-Protection: 1; mode=block
X-Content-Type-Options: nosniff
Referrer-Policy: no-referrer
diff --git a/apps/i2ptunnel/resources/proxy/b32-auth-header.ht b/apps/i2ptunnel/resources/proxy/b32-auth-header.ht
index bbaefc6adbe0f8fffd0fde24b6519a837c240dd1..ac6f3921c8e86fa06b5886cc2ee5b1cba0da7324 100644
--- a/apps/i2ptunnel/resources/proxy/b32-auth-header.ht
+++ b/apps/i2ptunnel/resources/proxy/b32-auth-header.ht
@@ -2,7 +2,6 @@ HTTP/1.1 400 Destination Not Found
Content-Type: text/html; charset=UTF-8
Cache-Control: no-cache
Connection: close
-Proxy-Connection: close
X-XSS-Protection: 1; mode=block
X-Content-Type-Options: nosniff
Referrer-Policy: no-referrer
@@ -23,4 +22,4 @@ Content-Security-Policy: default-src 'none'; style-src 'self' 'unsafe-inline' ht
<h3>_("Warning: Authorization Required")</h3>
<p>
<span><b>_("Could not find the following destination:")</b>
-</span>
\ No newline at end of file
+</span>
diff --git a/apps/i2ptunnel/resources/proxy/b32-header.ht b/apps/i2ptunnel/resources/proxy/b32-header.ht
index 8966edd82332a154bd97d7c53162429cf2098d3b..a1eabb852c0ddafd16bece0ee7ee86be4d6c5673 100644
--- a/apps/i2ptunnel/resources/proxy/b32-header.ht
+++ b/apps/i2ptunnel/resources/proxy/b32-header.ht
@@ -2,7 +2,6 @@ HTTP/1.1 400 Destination Not Found
Content-Type: text/html; charset=UTF-8
Cache-Control: no-cache
Connection: close
-Proxy-Connection: close
X-XSS-Protection: 1; mode=block
X-Content-Type-Options: nosniff
Referrer-Policy: no-referrer
@@ -25,4 +24,4 @@ Content-Security-Policy: default-src 'none'; style-src 'self' 'unsafe-inline' ht
_("The Base32 address is invalid.")
<hr>
<span><b>_("Could not find the following destination:")</b>
-</span>
\ No newline at end of file
+</span>
diff --git a/apps/i2ptunnel/resources/proxy/baduri-header.ht b/apps/i2ptunnel/resources/proxy/baduri-header.ht
index d0b919de149bfb821a9db892237e599f409b4849..8d80cb6a03bb229a30a65d6e4ac71bc105985076 100644
--- a/apps/i2ptunnel/resources/proxy/baduri-header.ht
+++ b/apps/i2ptunnel/resources/proxy/baduri-header.ht
@@ -2,7 +2,6 @@ HTTP/1.1 403 Bad URI
Content-Type: text/html; charset=UTF-8
Cache-Control: no-cache
Connection: close
-Proxy-Connection: close
X-XSS-Protection: 1; mode=block
X-Content-Type-Options: nosniff
Referrer-Policy: no-referrer
diff --git a/apps/i2ptunnel/resources/proxy/denied-header.ht b/apps/i2ptunnel/resources/proxy/denied-header.ht
index e8158cc8ba9dddc56a33efa4a296999f7b5e3d78..9c6f33aaad84221c8f3a31d80ec57902ab2cd242 100644
--- a/apps/i2ptunnel/resources/proxy/denied-header.ht
+++ b/apps/i2ptunnel/resources/proxy/denied-header.ht
@@ -2,7 +2,6 @@ HTTP/1.1 403 Request Denied
Content-Type: text/html; charset=UTF-8
Cache-Control: no-cache
Connection: close
-Proxy-Connection: close
X-XSS-Protection: 1; mode=block
X-Content-Type-Options: nosniff
Referrer-Policy: no-referrer
diff --git a/apps/i2ptunnel/resources/proxy/dnf-header.ht b/apps/i2ptunnel/resources/proxy/dnf-header.ht
index 2d4bb579fbcf202a8e7dfab8a47a3f78ebb65db8..531e985254a72a8c01dbb4867ead575562dbb33c 100644
--- a/apps/i2ptunnel/resources/proxy/dnf-header.ht
+++ b/apps/i2ptunnel/resources/proxy/dnf-header.ht
@@ -2,7 +2,6 @@ HTTP/1.1 504 Gateway Timeout
Content-Type: text/html; charset=UTF-8
Cache-Control: no-cache
Connection: close
-Proxy-Connection: close
X-XSS-Protection: 1; mode=block
X-Content-Type-Options: nosniff
Referrer-Policy: no-referrer
@@ -28,4 +27,4 @@ _("The website is offline, there is network congestion, or your router is not ye
</p>
<hr>
<span><b>_("Could not find the following destination:")</b>
-</span>
\ No newline at end of file
+</span>
diff --git a/apps/i2ptunnel/resources/proxy/dnfb-header.ht b/apps/i2ptunnel/resources/proxy/dnfb-header.ht
index 69ec1c16070cb54c4afb56a84c0f5391bdf83387..9c4aa5c1f24ef0fdc377915e75d3efe81a08c979 100644
--- a/apps/i2ptunnel/resources/proxy/dnfb-header.ht
+++ b/apps/i2ptunnel/resources/proxy/dnfb-header.ht
@@ -2,7 +2,6 @@ HTTP/1.1 400 Destination Not Found
Content-Type: text/html; charset=UTF-8
Cache-Control: no-cache
Connection: close
-Proxy-Connection: close
X-XSS-Protection: 1; mode=block
X-Content-Type-Options: nosniff
Referrer-Policy: no-referrer
@@ -29,4 +28,4 @@ _("The I2P host could also be offline.")
</p>
<hr>
<span><b>_("Could not find the following destination:")</b>
-</span>
\ No newline at end of file
+</span>
diff --git a/apps/i2ptunnel/resources/proxy/dnfh-header.ht b/apps/i2ptunnel/resources/proxy/dnfh-header.ht
index 7ce5d71f506913719066875b8ed29e6f1914c41f..f5500a58aefa91831e42a1d3d43e5035b02c7b34 100644
--- a/apps/i2ptunnel/resources/proxy/dnfh-header.ht
+++ b/apps/i2ptunnel/resources/proxy/dnfh-header.ht
@@ -3,7 +3,6 @@ Content-Type: text/html; charset=UTF-8
Referrer-Policy: no-referrer
Cache-Control: no-cache
Connection: close
-Proxy-Connection: close
X-XSS-Protection: 1; mode=block
X-Content-Type-Options: nosniff
Referrer-Policy: no-referrer
@@ -35,4 +34,4 @@ _("Seeing this page often? See {0}the FAQ{1} for help in {2}adding some subscrip
</p>
<hr>
<span><b>_("Could not find the following destination:")</b>
-</span>
\ No newline at end of file
+</span>
diff --git a/apps/i2ptunnel/resources/proxy/dnfp-header.ht b/apps/i2ptunnel/resources/proxy/dnfp-header.ht
index 42ffe796f1f456895ddb98e16f61b95c4068687f..f5b4833f2fe13287816a717db04ef4afcbe421db 100644
--- a/apps/i2ptunnel/resources/proxy/dnfp-header.ht
+++ b/apps/i2ptunnel/resources/proxy/dnfp-header.ht
@@ -2,7 +2,6 @@ HTTP/1.1 504 Gateway Timeout
Content-Type: text/html; charset=UTF-8
Cache-Control: no-cache
Connection: close
-Proxy-Connection: close
X-XSS-Protection: 1; mode=block
X-Content-Type-Options: nosniff
Referrer-Policy: no-referrer
diff --git a/apps/i2ptunnel/resources/proxy/enc-header.ht b/apps/i2ptunnel/resources/proxy/enc-header.ht
index c5400c953dcda1ea30ddd6b85904fb9bc0ee4dff..1061c08d19f850e13146ccf21f81bcd5c120bf75 100644
--- a/apps/i2ptunnel/resources/proxy/enc-header.ht
+++ b/apps/i2ptunnel/resources/proxy/enc-header.ht
@@ -2,7 +2,6 @@ HTTP/1.1 403 Incompatible Encryption Options
Content-Type: text/html; charset=UTF-8
Cache-Control: no-cache
Connection: close
-Proxy-Connection: close
X-XSS-Protection: 1; mode=block
X-Content-Type-Options: nosniff
Referrer-Policy: no-referrer
@@ -25,4 +24,4 @@ Content-Security-Policy: default-src 'none'; style-src 'self' 'unsafe-inline' ht
_("The website was not reachable, because it uses encryption options that are not supported by your I2P or Java version.")
<hr>
<span><b>_("Could not find the following destination:")</b>
-</span>
\ No newline at end of file
+</span>
diff --git a/apps/i2ptunnel/resources/proxy/encp-header.ht b/apps/i2ptunnel/resources/proxy/encp-header.ht
index 2138606d6b96c5b9713d3bc20fd20e59c155f0e4..fba46460b5ea5b8faba55e4d2c58c2d198a5b37f 100644
--- a/apps/i2ptunnel/resources/proxy/encp-header.ht
+++ b/apps/i2ptunnel/resources/proxy/encp-header.ht
@@ -2,7 +2,6 @@ HTTP/1.1 403 Incompatible Encryption Options
Content-Type: text/html; charset=UTF-8
Cache-Control: no-cache
Connection: close
-Proxy-Connection: close
X-XSS-Protection: 1; mode=block
X-Content-Type-Options: nosniff
Referrer-Policy: no-referrer
diff --git a/apps/i2ptunnel/resources/proxy/localhost-header.ht b/apps/i2ptunnel/resources/proxy/localhost-header.ht
index 1e4f425f15e70696f815d86ae1943aebc2254a76..5f94c609d454c125b87b032910d40dc7ad0f7bdd 100644
--- a/apps/i2ptunnel/resources/proxy/localhost-header.ht
+++ b/apps/i2ptunnel/resources/proxy/localhost-header.ht
@@ -2,7 +2,6 @@ HTTP/1.1 403 Access Denied
Content-Type: text/html; charset=UTF-8
Cache-Control: no-cache
Connection: close
-Proxy-Connection: close
X-XSS-Protection: 1; mode=block
X-Content-Type-Options: nosniff
Referrer-Policy: no-referrer
diff --git a/apps/i2ptunnel/resources/proxy/nols-header.ht b/apps/i2ptunnel/resources/proxy/nols-header.ht
index 260b3aef78e9e836fd1505d22de44470d63c3999..80deccacf9aae678ad97d1ffedf949ebb9e6eb5e 100644
--- a/apps/i2ptunnel/resources/proxy/nols-header.ht
+++ b/apps/i2ptunnel/resources/proxy/nols-header.ht
@@ -2,7 +2,6 @@ HTTP/1.1 504 Gateway Timeout
Content-Type: text/html; charset=UTF-8
Cache-Control: no-cache
Connection: close
-Proxy-Connection: close
X-XSS-Protection: 1; mode=block
X-Content-Type-Options: nosniff
Referrer-Policy: no-referrer
@@ -28,4 +27,4 @@ _("The website is probably down, but there could also be network congestion.")
</p>
<hr>
<span><b>_("Could not find the following destination:")</b>
-</span>
\ No newline at end of file
+</span>
diff --git a/apps/i2ptunnel/resources/proxy/nolsp-header.ht b/apps/i2ptunnel/resources/proxy/nolsp-header.ht
index 2c7368564775a32567bfec7c2b765b43d58a9a04..35e39722857bdc4b51a08be4214d405038032659 100644
--- a/apps/i2ptunnel/resources/proxy/nolsp-header.ht
+++ b/apps/i2ptunnel/resources/proxy/nolsp-header.ht
@@ -2,7 +2,6 @@ HTTP/1.1 504 Gateway Timeout
Content-Type: text/html; charset=UTF-8
Cache-Control: no-cache
Connection: close
-Proxy-Connection: close
X-XSS-Protection: 1; mode=block
X-Content-Type-Options: nosniff
Referrer-Policy: no-referrer
diff --git a/apps/i2ptunnel/resources/proxy/noproxy-header.ht b/apps/i2ptunnel/resources/proxy/noproxy-header.ht
index e70548e05920ba378ccaca5df4e5d1f2eff2abb0..0bfceef63ed2dc160921e3db8ec01c30be711df6 100644
--- a/apps/i2ptunnel/resources/proxy/noproxy-header.ht
+++ b/apps/i2ptunnel/resources/proxy/noproxy-header.ht
@@ -2,7 +2,6 @@ HTTP/1.1 503 No Outproxy Configured
Content-Type: text/html; charset=UTF-8
Cache-Control: no-cache
Connection: close
-Proxy-Connection: close
X-XSS-Protection: 1; mode=block
X-Content-Type-Options: nosniff
Referrer-Policy: no-referrer
diff --git a/apps/i2ptunnel/resources/proxy/protocol-header.ht b/apps/i2ptunnel/resources/proxy/protocol-header.ht
index 07ff5f673be3fdd78fe7a1fc88a999d2b62876ef..dfdd98c36b8a4725ff3f3935bfbbfa60dab01e9b 100644
--- a/apps/i2ptunnel/resources/proxy/protocol-header.ht
+++ b/apps/i2ptunnel/resources/proxy/protocol-header.ht
@@ -2,7 +2,6 @@ HTTP/1.1 403 Bad Protocol
Content-Type: text/html; charset=UTF-8
Cache-Control: no-cache
Connection: close
-Proxy-Connection: close
X-XSS-Protection: 1; mode=block
X-Content-Type-Options: nosniff
Referrer-Policy: no-referrer
diff --git a/apps/i2ptunnel/resources/proxy/reset-header.ht b/apps/i2ptunnel/resources/proxy/reset-header.ht
index 62e266c0e74e374167ec62926f6d071332c8a7f2..f0207323c37ddc56e05bea9efabd4cb3087a7867 100644
--- a/apps/i2ptunnel/resources/proxy/reset-header.ht
+++ b/apps/i2ptunnel/resources/proxy/reset-header.ht
@@ -2,7 +2,6 @@ HTTP/1.1 403 Connection Reset
Content-Type: text/html; charset=UTF-8
Cache-Control: no-cache
Connection: close
-Proxy-Connection: close
X-XSS-Protection: 1; mode=block
X-Content-Type-Options: nosniff
Referrer-Policy: no-referrer
diff --git a/apps/i2ptunnel/resources/proxy/resetp-header.ht b/apps/i2ptunnel/resources/proxy/resetp-header.ht
index 1bf6b8dd0a09524d846328e9069420d748fb1320..147569a0c20b7bd80d9eb01a78598fd82eb7f3c9 100644
--- a/apps/i2ptunnel/resources/proxy/resetp-header.ht
+++ b/apps/i2ptunnel/resources/proxy/resetp-header.ht
@@ -2,7 +2,6 @@ HTTP/1.1 403 Connection Reset
Content-Type: text/html; charset=UTF-8
Cache-Control: no-cache
Connection: close
-Proxy-Connection: close
X-XSS-Protection: 1; mode=block
X-Content-Type-Options: nosniff
Referrer-Policy: no-referrer
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java
index f32b42cb02c2b27cc114aa473ad154b1aa904a00..b52a67c73c77ad95194c7224a89f74c7fcca5d88 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/ConnectionManager.java
@@ -76,7 +76,6 @@ class ConnectionManager {
"Content-Type: text/html; charset=iso-8859-1\r\n"+
"Cache-Control: no-cache\r\n"+
"Connection: close\r\n"+
- "Proxy-Connection: close\r\n"+
"Retry-After: 900\r\n"+
"\r\n"+
"<html><head><title>429 Denied</title></head>"+