From af5c0bd8a73936ebf268e7d368b06a02ad40f7c0 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Wed, 28 May 2014 21:25:35 +0000
Subject: [PATCH] Console, i2psnark, susimail: Recognize emacs-w3m as a
text-mode browser As reported at http://zzz.i2p/topics/1630 untested
---
apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java | 2 +-
apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java | 2 +-
apps/susimail/src/src/i2p/susi/webmail/WebMail.java | 2 +-
router/java/src/net/i2p/router/RouterVersion.java | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
index d4f3078414..bed4519817 100644
--- a/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
+++ b/apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java
@@ -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
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java
index 1df32a23da..32c3f9304e 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/CSSHelper.java
@@ -174,7 +174,7 @@ public class CSSHelper extends HelperBase {
// text
!(ua.startsWith("Lynx") || ua.startsWith("w3m") ||
ua.startsWith("ELinks") || ua.startsWith("Links") ||
- ua.startsWith("Dillo") ||
+ ua.startsWith("Dillo") || ua.startsWith("Emacs-w3m") ||
// mobile
// http://www.zytrax.com/tech/web/mobile_ids.html
// Android tablet UAs don't have "Mobile" in them
diff --git a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
index ba2d2441bf..231ae15931 100644
--- a/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
+++ b/apps/susimail/src/src/i2p/susi/webmail/WebMail.java
@@ -1502,7 +1502,7 @@ public class WebMail extends HttpServlet
// text
(ua.startsWith("Lynx") || ua.startsWith("w3m") ||
ua.startsWith("ELinks") || ua.startsWith("Links") ||
- ua.startsWith("Dillo") ||
+ ua.startsWith("Dillo") || ua.startsWith("Emacs-w3m") ||
// mobile
// http://www.zytrax.com/tech/web/mobile_ids.html
// Android tablet UAs don't have "Mobile" in them
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index a411b00998..87e5bffca0 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
- public final static long BUILD = 0;
+ public final static long BUILD = 1;
/** for example "-test" */
public final static String EXTRA = "";
--
GitLab