propagate from branch 'i2p.i2p.zzz.test2' (head 9aee013cf961ba795a6b5333481634c52d43abc5)

to branch 'i2p.i2p' (head e439e67c49695a624fabdf6f3cd1a8f7a3fd7ea5)
This commit is contained in:
zzz
2014-05-29 12:31:49 +00:00
81 changed files with 19830 additions and 8158 deletions

View File

@ -1558,6 +1558,8 @@ public class KRPC implements I2PSessionMuxedListener, DHT {
// TODO throttle
try {
byte[] payload = session.receiveMessage(msgId);
if (payload == null)
return;
_rxPkts.incrementAndGet();
_rxBytes.addAndGet(payload.length);
if (toPort == _qPort) {

View File

@ -381,7 +381,7 @@ public class I2PSnarkServlet extends BasicServlet {
String ua = req.getHeader("User-Agent");
boolean isDegraded = ua != null && (ua.startsWith("Lynx") || ua.startsWith("w3m") ||
ua.startsWith("ELinks") || ua.startsWith("Links") ||
ua.startsWith("Dillo"));
ua.startsWith("Dillo") || ua.startsWith("Emacs-w3m"));
boolean noThinsp = isDegraded || (ua != null && ua.startsWith("Opera"));
// pages
@ -1351,7 +1351,7 @@ public class I2PSnarkServlet extends BasicServlet {
if (isMultiFile) {
// link on the whole td
String jsec = encodedBaseName.replace("'", "\\'");
out.write(" onclick=\"document.location='" + encodedBaseName + "/';\">");
out.write(" onclick=\"document.location='" + jsec + "/';\">");
} else {
out.write('>');
}
@ -2509,6 +2509,7 @@ public class I2PSnarkServlet extends BasicServlet {
String path=addPaths(base,encoded);
if (item.isDirectory() && !path.endsWith("/"))
path=addPaths(path,"/");
path = urlEncode(path);
String icon = toIcon(item);
buf.append("<TD class=\"snarkFileIcon\">");
@ -2529,7 +2530,7 @@ public class I2PSnarkServlet extends BasicServlet {
buf.append("</TD><TD class=\"snarkFileName\">");
if (complete)
buf.append("<a href=\"").append(path).append("\">");
buf.append(item.getName());
buf.append(item.getName().replace("&", "&amp;"));
if (complete)
buf.append("</a>");
buf.append("</TD><TD ALIGN=right class=\"snarkFileSize\">");