From 528ef4dd1a29a843064540e6d2d94dbd7ba29dde Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 10 Mar 2012 21:50:45 +0000
Subject: [PATCH]   * HTTP Proxy: Fix generation of jump links (ticket #616),  
               broken by refactoring in -1

---
 .../java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
index ba47c5c37..96f6191f8 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
@@ -1142,7 +1142,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
         if (out != null) {
             out.write(errMessage);
             if (targetRequest != null) {
-                String uri = targetRequest;
+                String uri = targetRequest.replace("&", "&amp;");
                 out.write("<a href=\"".getBytes());
                 out.write(uri.getBytes());
                 out.write("\">".getBytes());
@@ -1156,8 +1156,10 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
                 if (jumpServers != null && jumpServers.length() > 0) {
                     out.write("<br><br>".getBytes());
                     out.write(_("Click a link below to look for an address helper by using a \"jump\" service:").getBytes("UTF-8"));
-                    out.write("<br>".getBytes());
+                    out.write("<br>\n".getBytes());
 
+                    if (uri.startsWith("http://"))
+                        uri = uri.substring(7);
                     StringTokenizer tok = new StringTokenizer(jumpServers, ", ");
                     while (tok.hasMoreTokens()) {
                         String jurl = tok.nextToken();
@@ -1179,7 +1181,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
                         out.write("\">".getBytes());
                         out.write(jurl.getBytes());
                         out.write(uri.getBytes());
-                        out.write("</a>".getBytes());
+                        out.write("</a>\n".getBytes());
                     }
                 }
             }