Update of /cvsroot/freenet/freenet/src/freenet/client/http
In directory sc8-pr-cvs1:/tmp/cvs-serv19708/src/freenet/client/http
Modified Files:
NodeStatusServlet.java FproxyServlet.java
Log Message:
6326:
Add fproxy option ?linkhtl=<htl>, which tells the filter to rewrite links to add
?htl=<htl> to each inline image, link, inline, etc.
Add graph with points clipped on node status page.
Add diagnostic 'failureTableIgnoredDNFs'.
Logging, indenting, eclipse warnings.
Index: NodeStatusServlet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/NodeStatusServlet.java,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -w -r1.81 -r1.82
--- NodeStatusServlet.java 7 Nov 2003 21:47:44 -0000 1.81
+++ NodeStatusServlet.java 12 Nov 2003 01:11:02 -0000 1.82
@@ -1216,8 +1216,10 @@
if(typeName.equals("freenet.node.rt.CPAlgoRoutingTable"))
pw.println("<p><div align=\"center\"><img
src=\"/servlet/nodeinfo/internal/rthist/rthist.bmp?length=800&height=50\"></div></p>");
- else
+ else {
+ pw.println("<p><div align=\"center\"><img
src=\"global.bmp?clippoints=true\"></div></p>");
pw.println("<p><div align=\"center\"><img src=\"global.bmp\"></div></p>");
+ }
pw.println("<p>");
Index: FproxyServlet.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/client/http/FproxyServlet.java,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -w -r1.112 -r1.113
--- FproxyServlet.java 31 Oct 2003 20:58:07 -0000 1.112
+++ FproxyServlet.java 12 Nov 2003 01:11:02 -0000 1.113
@@ -72,6 +72,8 @@
* overrides URI in GET request
* <li>htl<br>
* overrides default htl
+ * <li>linkhtl<br>
+ * overrides default htl of linked and inlined content
* <li>mime<br>
* overrides mime type of requested document.
* <li>date<br>
@@ -399,6 +401,7 @@
String queryKey = null;
String queryForce = null;
String queryHtl = null;
+ String queryLinkHtl = null;
String queryMime = null;
String queryDate = null;
String queryMaxLogSize = null;
@@ -407,6 +410,7 @@
String queryTry = null;
long queryDateMillis = -1;
int htlUsed = requestHtl;
+ int linkHtl = -1;
int tryNum = 0;
int maxLogSize = 0;
@@ -474,6 +478,18 @@
}
}
+ queryLinkHtl = req.getParameter("linkhtl");
+ if (queryLinkHtl != null) {
+ try {
+ linkHtl =
Integer.parseInt(freenet.support.URLDecoder.decode(queryLinkHtl));
+ if(logDEBUG) logger.log(this, "Read link htl from query: " +
linkHtl,
+ Logger.DEBUGGING);
+ } catch (NumberFormatException e) {
+ if(logDEBUG) logger.log(this, "Couldn't parse linkhtl:
"+queryLinkHtl, e, Logger.DEBUG);
+ linkHtl = -1;
+ }
+ }
+
queryMaxLogSize = req.getParameter("maxlogsize");
if(queryMaxLogSize != null) {
try {
@@ -719,8 +735,11 @@
ContentFilterFactory.newInstance(passThroughMimeTypes,
bucketFactory);
// newInstance shouldn't be a very heavy operation
- if(filter instanceof SaferFilter)
-
((SaferFilter)filter).setParanoidStringCheck(filterParanoidStringCheck);
+ if(filter instanceof SaferFilter) {
+ SaferFilter f = (SaferFilter)filter;
+ f.setParanoidStringCheck(filterParanoidStringCheck);
+ f.setLinkHtl(linkHtl);
+ }
if(!filter.wantFilter(mimeType, charset))
filter = null;
}
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
