echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Debian builds with Jetty 9.4.15 (ticket #2457)

Browse Source
This commit is contained in:
zzz
2019-03-16 16:54:36 +00:00
parent 8962ea058f
commit 2b00bfa58b
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/jetty/java/src/net/i2p/jetty/I2PRequestLog.java
View File

@ -17,7 +17,7 @@ package net.i2p.jetty;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream; import java.io.OutputStream;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.io.Writer; //import java.io.Writer; // As of Jetty 9.4.15, RequestLog interface has a Writer subinterface
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Locale; import java.util.Locale;
import java.util.TimeZone; import java.util.TimeZone;
@ -81,7 +81,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog
private transient OutputStream _fileOut; private transient OutputStream _fileOut;
private transient DateCache _logDateCache; private transient DateCache _logDateCache;
private transient PathMap<String> _ignorePathMap; private transient PathMap<String> _ignorePathMap;
private transient Writer _writer; private transient java.io.Writer _writer;
private transient ArrayList<Utf8StringBuilder> _buffers; private transient ArrayList<Utf8StringBuilder> _buffers;
private transient char[] _copy; private transient char[] _copy;
@ -439,7 +439,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog
/* ------------------------------------------------------------ */ /* ------------------------------------------------------------ */
protected void logExtended(Request request, protected void logExtended(Request request,
Response response, Response response,
Writer writer) throws IOException java.io.Writer writer) throws IOException
{ {
String referer = request.getHeader("Referer"); String referer = request.getHeader("Referer");
if (referer == null) if (referer == null)

3
history.txt
View File

@ -1,3 +1,6 @@
2019-03-16 zzz
* Fix Debian builds with Jetty 9.4.15 (ticket #2457)
2019-03-11 zab 2019-03-11 zab
* Startup: make negative client app delay value mean waiting * Startup: make negative client app delay value mean waiting
for router to be RUNNING (ticket #2377) for router to be RUNNING (ticket #2377)

2
router/java/src/net/i2p/router/RouterVersion.java
View File

@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */ /** deprecated */
public final static String ID = "Monotone"; public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION; public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 15; public final static long BUILD = 16;
/** for example "-test" */ /** for example "-test" */
public final static String EXTRA = "-rc"; public final static String EXTRA = "-rc";