Update of /cvsroot/freenet/freenet/src/freenet/client/http
In directory sc8-pr-cvs1:/tmp/cvs-serv13876/src/freenet/client/http
Modified Files:
FproxyServlet.java NodeStatusServlet.java
Log Message:
6266:
FORK UNSTABLE NETWORK. Protocol version increases to 1.47. The purpose of this: it is
likely that NGRouting and CPAlgoRT are not really compatible in their present
implementations. Hopefully we can get a decent sized test network together.
Minor changes:
Don't reference old nodes in the RT. Take them out if they are serialized in. Add a
means of checking whether it is old for purposes of routing to or for purposes of
accepting requests from it.
Try to keep the references on the RT up to date.
Detect Opera as well as IE.
Minor fix in TimeEstimator.drawGraphBMP()
Added diagnostic requestDataNotFound.
Fix load %.
Fix CHK for README in dist servlet.
Minor UI tweak to General infolet.
Minor graphical change (add a stretched graph per estimator) to per node pages linked
from Node Reference Status.
Index: FproxyServlet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/FproxyServlet.java,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -w -r1.108 -r1.109
--- FproxyServlet.java 16 Oct 2003 01:03:58 -0000 1.108
+++ FproxyServlet.java 22 Oct 2003 22:07:13 -0000 1.109
@@ -328,7 +328,8 @@
sUserAgent, Logger.DEBUGGING);
String sIPAddress = req.getRemoteAddr();
if(sIPAddress == null) return; // already closed!
- if (sUserAgent.indexOf("MSIE ") > 0) {
+ if (sUserAgent.indexOf("MSIE ") > 0 ||
+ sUserAgent.indexOf("Opera") > 0) {
if (!badBrowserWarningsSentTo.contains(sIPAddress)) {
try {
resp.setContentType("text/html");
@@ -337,7 +338,7 @@
PrintWriter pw = new PrintWriter(sw);
setNoCache(resp);
- pw.println("Freenet has determined that you are using
Internet Explorer. Please be aware that Internet Explorer treats contents in a manner
that makes it impossible for us to protect your anonymity while browsing Freenet using
this browser. We recommend that you use a browser that does not do this, for example,
Mozilla, K-Meleon, Firebird (from Mozilla.org), Lynx, Links, Amaya, Arena, or a
correctly configured Opera.\n\nIf you are using the OPERA browser be aware that it can
also compromise your anonymity at it's default settings please refer to the <a
href=\"/servlet/nodeinfo/documentation/readme\">README</a> file for instructions on
correcting this behaviour.");
+ pw.println("Freenet has determined that you are using
Internet Explorer or Opera. Please be aware that Internet Explorer treats contents in
a manner that makes it impossible for us to protect your anonymity while browsing
Freenet using this browser. Opera also does this by default but can be configured not
to, and thus be safe to use with Freenet - please refer to the <a
href=\"/servlet/nodeinfo/documentation/readme\">README</a>. Some browsers that do not
do this are Mozilla, K-Meleon, Firebird (from Mozilla.org), Lynx, Links, Amaya, Arena,
or a correctly configured Opera.");
if (badBrowserWarningsSentTo.size() < maxBadBrowserIPs) {
pw.println("<p>If you are really really sure you want
to proceed, don't ");
pw.println("say we didn't warn you, and click <a
href=\"" + req.getRequestURI() +
Index: NodeStatusServlet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/NodeStatusServlet.java,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -w -r1.71 -r1.72
--- NodeStatusServlet.java 18 Oct 2003 18:55:22 -0000 1.71
+++ NodeStatusServlet.java 22 Oct 2003 22:07:14 -0000 1.72
@@ -1090,12 +1090,12 @@
}
}
String clip = req.getParameter("clippoints");
- boolean clippoints = true;
+ boolean clippoints = false;
if(clip != null &&
- (clip.equalsIgnoreCase("false") || clip.equalsIgnoreCase("no")))
- clippoints = false;
+ (clip.equalsIgnoreCase("true") || clip.equalsIgnoreCase("yes")))
+ clippoints = true;
resp.setContentType("image/bmp");
- e.drawGraphBMP(width, height, clippoints, resp.getOutputStream());
+ e.drawGraphBMP(width, height, !clippoints, resp.getOutputStream());
} else {
resp.sendError(404, "Not an NGRoutingTable");
}
@@ -1126,12 +1126,12 @@
}
}
String clip = req.getParameter("clippoints");
- boolean clippoints = true;
+ boolean clippoints = false;
if(clip != null &&
- (clip.equalsIgnoreCase("false") || clip.equalsIgnoreCase("no")))
- clippoints = false;
+ (clip.equalsIgnoreCase("true") || clip.equalsIgnoreCase("yes")))
+ clippoints = true;
resp.setContentType("image/bmp");
- e.drawGraphBMP(width, height, clippoints, resp.getOutputStream());
+ e.drawGraphBMP(width, height, !clippoints, resp.getOutputStream());
} else {
resp.sendError(404, "Not an NGRoutingTable");
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
