From 1b11e1ce6763dc5717e686f09e5f315e7867c19b Mon Sep 17 00:00:00 2001
From: Zac Spitzer <zac.spitzer@gmail.com>
Date: Thu, 10 Aug 2023 09:51:39 +0200
Subject: [PATCH] LDEV-4634 avoid NPE in cloneHeaders

https://luceeserver.atlassian.net/browse/LDEV-4634
---
 core/src/main/java/lucee/runtime/net/http/HttpUtil.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/lucee/runtime/net/http/HttpUtil.java b/core/src/main/java/lucee/runtime/net/http/HttpUtil.java
index 46e4bf1d59..4e5bf6bb14 100644
--- a/core/src/main/java/lucee/runtime/net/http/HttpUtil.java
+++ b/core/src/main/java/lucee/runtime/net/http/HttpUtil.java
@@ -44,12 +44,13 @@ public class HttpUtil {
 	public static Pair<String, String>[] cloneHeaders(HttpServletRequest req) {
 		List<Pair<String, String>> headers = new ArrayList<Pair<String, String>>();
 		Enumeration<String> e = req.getHeaderNames(), ee;
-		String name;
+		String name, val;
 		while (e.hasMoreElements()) {
 			name = e.nextElement();
 			ee = req.getHeaders(name);
 			while (ee.hasMoreElements()) {
-				headers.add(new Pair<String, String>(name, ee.nextElement().toString()));
+				val = (String) ee.nextElement();
+				if (val != null) headers.add(new Pair<String, String>(name, val));
 			}
 		}
 		return (Pair<String, String>[]) headers.toArray(new Pair[headers.size()]);