From 949e91bdbe6c8be386b4e1140c1c1f055fbbc144 Mon Sep 17 00:00:00 2001
From: "Adam D. Ruppe" <destructionator@gmail.com>
Date: Fri, 9 Sep 2022 16:32:08 -0400
Subject: [PATCH] url handle empty port specifier

---
 cgi.d   |  5 ++++-
 http2.d | 10 ++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/cgi.d b/cgi.d
index e359185..c1cd911 100644
--- a/cgi.d
+++ b/cgi.d
@@ -2912,7 +2912,10 @@ struct Uri {
 				host = authority;
 			} else {
 				host = authority[0 .. idx2];
-				port = to!int(authority[idx2 + 1 .. $]);
+				if(idx2 + 1 < authority.length)
+					port = to!int(authority[idx2 + 1 .. $]);
+				else
+					port = 0;
 			}
 		}
 
diff --git a/http2.d b/http2.d
index dcc6dd5..94b48db 100644
--- a/http2.d
+++ b/http2.d
@@ -452,7 +452,10 @@ struct HttpResponse {
 					idx++;
 
 				string name = header[0 .. idx];
-				header = header[idx + 1 .. $];
+				if(idx + 1 < header.length)
+					header = header[idx + 1 .. $];
+				else
+					header = header[$ .. $];
 
 				string value;
 
@@ -764,7 +767,10 @@ struct Uri {
 				host = authority;
 			} else {
 				host = authority[0 .. idx2];
-				port = to!int(authority[idx2 + 1 .. $]);
+				if(idx2 + 1 < authority.length)
+					port = to!int(authority[idx2 + 1 .. $]);
+				else
+					port = 0;
 			}
 		}