From 5f3c41244b03ee3542f52c162290b0b53d8be603 Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Wed, 13 Jan 2021 08:54:46 -0500
Subject: [PATCH] Jetty: Fix URI in request logs

Use standard getRequestURI() instead of Jetty internal getHttpURI(),
which apparently changed somewhere along the way

Hide Jetty ClosedChannelException from I2P logs
---
 apps/jetty/java/src/net/i2p/jetty/I2PLogger.java     | 4 +++-
 apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/jetty/java/src/net/i2p/jetty/I2PLogger.java b/apps/jetty/java/src/net/i2p/jetty/I2PLogger.java
index af62b9be7..8c081d672 100644
--- a/apps/jetty/java/src/net/i2p/jetty/I2PLogger.java
+++ b/apps/jetty/java/src/net/i2p/jetty/I2PLogger.java
@@ -14,6 +14,8 @@
 
 package net.i2p.jetty;
 
+import java.nio.channels.ClosedChannelException;
+
 import net.i2p.I2PAppContext;
 import net.i2p.util.Log;
 
@@ -127,7 +129,7 @@ public class I2PLogger implements Logger
         if (th != null) {
             if (_log.shouldLog(Log.WARN))
                 _log.warn(msg, th);
-            else
+            else if (!(th instanceof ClosedChannelException))
                 _log.logAlways(Log.WARN, msg + ": " + th);
         } else {
             _log.logAlways(Log.WARN, msg);
diff --git a/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java b/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java
index 8d72c9747..c42de2acf 100644
--- a/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java
+++ b/apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java
@@ -317,7 +317,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog
                 buf.append(request.getMethod());
                 buf.append(' ');
                 
-                u8buf.append(request.getHttpURI().toString());
+                u8buf.append(request.getRequestURI());
                 
                 buf.append(' ');
                 buf.append(request.getProtocol());