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

propagate from branch 'i2p.i2p.zzz.jetty9' (head 80022f6ef552acd1382d45103969aa7c17b1d794)

Browse Source 
to branch 'i2p.i2p' (head 3b4b418ae8be95d52228fc7c325fc52e0223e4fe)
This commit is contained in:
zzz
2017-03-11 15:24:23 +00:00
parent 072d990279 db0381d6b1
commit 0703a29562
86 changed files with 1652 additions and 812 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/jetty/java/src/net/i2p/jetty/I2PLogger.java
View File

@@ -263,4 +263,11 @@ public class I2PLogger implements Logger
public String getName() {
return "net.i2p.jetty.I2PLogger";
}
/**
* @since Jetty 9
*/
public void debug(String msg, long arg) {
debug(msg, Long.valueOf(arg), null);
}
}

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

@@ -24,7 +24,6 @@ import java.util.TimeZone;
import javax.servlet.http.Cookie;
import org.eclipse.jetty.http.HttpHeaders;
import org.eclipse.jetty.http.PathMap;
import org.eclipse.jetty.server.Request;
import org.eclipse.jetty.server.RequestLog;
@@ -81,7 +80,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog
private transient OutputStream _out;
private transient OutputStream _fileOut;
private transient DateCache _logDateCache;
private transient PathMap _ignorePathMap;
private transient PathMap<String> _ignorePathMap;
private transient Writer _writer;
private transient ArrayList<Utf8StringBuilder> _buffers;
private transient char[] _copy;
@@ -286,7 +285,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog
String addr = null;
if (_preferProxiedForAddress)
{
addr = request.getHeader(HttpHeaders.X_FORWARDED_FOR);
addr = request.getHeader("X-Forwarded-For");
}
if (addr == null) {
@@ -310,7 +309,9 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog
if (_logDateCache!=null)
buf.append(_logDateCache.format(request.getTimeStamp()));
else
buf.append(request.getTimeStampBuffer().toString());
//buf.append(request.getTimeStampBuffer().toString());
// TODO SimpleDateFormat or something
buf.append(request.getTimeStamp());
buf.append("] \"");
buf.append(request.getMethod());
@@ -358,7 +359,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog
{
synchronized(_writer)
{
buf.append(StringUtil.__LINE_SEPARATOR);
buf.append(System.getProperty("line.separator", "\n"));
int l=buf.length();
if (l>_copy.length)
l=_copy.length;
@@ -412,7 +413,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog
_writer.write(Long.toString(System.currentTimeMillis() - request.getTimeStamp()));
}
_writer.write(StringUtil.__LINE_SEPARATOR);
_writer.write(System.getProperty("line.separator", "\n"));
_writer.flush();
}
}
@@ -429,7 +430,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog
Response response,
Writer writer) throws IOException
{
String referer = request.getHeader(HttpHeaders.REFERER);
String referer = request.getHeader("Referer");
if (referer == null)
writer.write("\"-\" ");
else
@@ -439,7 +440,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog
writer.write("\" ");
}
String agent = request.getHeader(HttpHeaders.USER_AGENT);
String agent = request.getHeader("User-Agent");
if (agent == null)
writer.write("\"-\" ");
else
@@ -455,8 +456,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog
{
if (_logDateFormat!=null)
{
_logDateCache = new DateCache(_logDateFormat, _logLocale);
_logDateCache.setTimeZoneID(_logTimeZone);
_logDateCache = new DateCache(_logDateFormat, _logLocale, _logTimeZone);
}
if (_filename != null)
@@ -472,7 +472,7 @@ public class I2PRequestLog extends AbstractLifeCycle implements RequestLog
if (_ignorePaths != null && _ignorePaths.length > 0)
{
_ignorePathMap = new PathMap();
_ignorePathMap = new PathMap<String>();
for (int i = 0; i < _ignorePaths.length; i++)
_ignorePathMap.put(_ignorePaths[i], _ignorePaths[i]);
}

19
apps/jetty/java/src/net/i2p/jetty/JettyStart.java
View File

@@ -30,6 +30,7 @@ import net.i2p.util.I2PAppThread;
import net.i2p.util.PortMapper;
import org.eclipse.jetty.server.Connector;
import org.eclipse.jetty.server.NetworkConnector;
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.util.component.LifeCycle;
import org.eclipse.jetty.util.resource.Resource;
@@ -130,13 +131,17 @@ public class JettyStart implements ClientApp {
Server server = (Server) lc;
Connector[] connectors = server.getConnectors();
if (connectors.length > 0) {
int port = connectors[0].getPort();
if (port > 0) {
_port = port;
String host = connectors[0].getHost();
if (host.equals("0.0.0.0") || host.equals("::"))
host = "127.0.0.1";
_context.portMapper().register(PortMapper.SVC_EEPSITE, host, port);
Connector conn = connectors[0];
if (conn instanceof NetworkConnector) {
NetworkConnector nconn = (NetworkConnector) conn;
int port = nconn.getPort();
if (port > 0) {
_port = port;
String host = nconn.getHost();
if (host.equals("0.0.0.0") || host.equals("::"))
host = "127.0.0.1";
_context.portMapper().register(PortMapper.SVC_EEPSITE, host, port);
}
}
}
}