From 5399aa459f0a11995466626538362aaa104abb9c Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Wed, 29 Nov 2023 15:55:58 -0500
Subject: [PATCH] UPnP: Fix missing port in Host header causing failures on
 libupnp-based devices

---
 router/java/src/org/cybergarage/http/HTTPPacket.java  | 2 ++
 router/java/src/org/cybergarage/http/HTTPRequest.java | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/router/java/src/org/cybergarage/http/HTTPPacket.java b/router/java/src/org/cybergarage/http/HTTPPacket.java
index 76ed7dac81..5c2b8395a3 100644
--- a/router/java/src/org/cybergarage/http/HTTPPacket.java
+++ b/router/java/src/org/cybergarage/http/HTTPPacket.java
@@ -834,6 +834,7 @@ public class HTTPPacket
 		setHeader(HTTP.HOST, hostAddr + ":" + Integer.toString(port));
 	}
 
+/*  I2P No - we always want port also. libupnp-based devices will reject 403 without the port
 	public void setHost(String host)
 	{
 		String hostAddr = host;
@@ -841,6 +842,7 @@ public class HTTPPacket
 			hostAddr = "[" + host + "]";
 		setHeader(HTTP.HOST, hostAddr);
 	}
+*/
 	
 	public String getHost()
 	{
diff --git a/router/java/src/org/cybergarage/http/HTTPRequest.java b/router/java/src/org/cybergarage/http/HTTPRequest.java
index 6b9c850b28..7f96100940 100644
--- a/router/java/src/org/cybergarage/http/HTTPRequest.java
+++ b/router/java/src/org/cybergarage/http/HTTPRequest.java
@@ -402,7 +402,7 @@ public class HTTPRequest extends HTTPPacket
 	{
 		HTTPResponse httpRes = new HTTPResponse();
 
-		setHost(host);
+		setHost(host, port);
 		
 		setConnection((isKeepAlive == true) ? HTTP.KEEP_ALIVE : HTTP.CLOSE);
 		
-- 
GitLab