use normalized header keys to avoid allocations

robaho · robaho · commit 9ea00e71d46c · 2024-08-15T08:40:32.000-05:00
diff --git a/src/main/java/robaho/net/httpserver/ServerImpl.java b/src/main/java/robaho/net/httpserver/ServerImpl.java
@@ -417,7 +417,7 @@ Logger getLogger() {
     }
 
     private void closeConnection(HttpConnection conn) {
-        logger.log(Level.TRACE, "closing connection: " + conn.toString());
+        logger.log(Level.TRACE, () -> "closing connection: " + conn.toString());
         conn.close();
         allConnections.remove(conn);
     }
@@ -533,8 +533,8 @@ private void runPerRequest() throws IOException {
             //     }
             // }
             /* checks for unsupported combinations of lengths and encodings */
-            if (headers.containsKey("Content-Length")
-                    && (headers.containsKey("Transfer-encoding") || headers.get("Content-Length").size() > 1)) {
+            if (headers.containsKey("Content-length")
+                    && (headers.containsKey("Transfer-encoding") || headers.get("Content-length").size() > 1)) {
                 reject(Code.HTTP_BAD_REQUEST, requestLine,
                         "Conflicting or malformed headers detected");
                 return;
@@ -554,7 +554,7 @@ private void runPerRequest() throws IOException {
                     return;
                 }
             } else {
-                headerValue = headers.getFirst("Content-Length");
+                headerValue = headers.getFirst("Content-length");
                 if (headerValue != null) {
                     try {
                         clen = Long.parseLong(headerValue);
@@ -599,7 +599,7 @@ private void runPerRequest() throws IOException {
                     rheaders.set("Connection", "keep-alive");
                     int idleSeconds = (int) (ServerConfig.getIdleIntervalMillis() / 1000);
                     String val = "timeout=" + idleSeconds;
-                    rheaders.set("Keep-Alive", val);
+                    rheaders.set("Keep-alive", val);
                 }
             }
 
diff --git a/src/main/java/robaho/net/httpserver/websockets/Util.java b/src/main/java/robaho/net/httpserver/websockets/Util.java
@@ -43,11 +43,11 @@
 
 public class Util {
 
-    public static final String HEADER_UPGRADE = "upgrade";
+    public static final String HEADER_UPGRADE = "Upgrade";
 
     public static final String HEADER_UPGRADE_VALUE = "websocket";
 
-    public static final String HEADER_CONNECTION = "connection";
+    public static final String HEADER_CONNECTION = "Connection";
 
     public static final String HEADER_CONNECTION_VALUE = "Upgrade";
 
@@ -75,7 +75,7 @@ public static String makeAcceptKey(String key) throws NoSuchAlgorithmException {
         return encodeBase64(sha1hash);
     }
 
-    private static final String CONTENT_TYPE = "content-type";
+    private static final String CONTENT_TYPE = "Content-type";
 
     public static void sendResponseHeaders(HttpExchange exchange, int code, String reason) throws IOException {
         var bytes = reason.getBytes();
