[freenet-cvs] r7936 - in trunk/freenet/src/freenet: client client/async node

[t...@freenetproject.org]

Author: toad
Date: 2006-01-26 18:28:22 +0000 (Thu, 26 Jan 2006)
New Revision: 7936

Modified:
   trunk/freenet/src/freenet/client/InserterContext.java
   trunk/freenet/src/freenet/client/async/SingleBlockInserter.java
   trunk/freenet/src/freenet/client/async/SingleFileFetcher.java
   trunk/freenet/src/freenet/node/TextModeClientInterface.java
   trunk/freenet/src/freenet/node/Version.java
Log:
obey setting on cache-local-requests.
allow \r and \n in GET:'ed content.

Modified: trunk/freenet/src/freenet/client/InserterContext.java
===================================================================
--- trunk/freenet/src/freenet/client/InserterContext.java       2006-01-26 
17:55:28 UTC (rev 7935)
+++ trunk/freenet/src/freenet/client/InserterContext.java       2006-01-26 
18:28:22 UTC (rev 7936)
@@ -19,7 +19,7 @@
        public final int splitfileSegmentCheckBlocks;
        final ClientEventProducer eventProducer;
        /** Interesting tradeoff, see comments at top of Node.java. */
-       final boolean cacheLocalRequests;
+       public final boolean cacheLocalRequests;
        private boolean cancelled;

        public InserterContext(BucketFactory bf, RandomSource random,

Modified: trunk/freenet/src/freenet/client/async/SingleBlockInserter.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleBlockInserter.java     
2006-01-26 17:55:28 UTC (rev 7935)
+++ trunk/freenet/src/freenet/client/async/SingleBlockInserter.java     
2006-01-26 18:28:22 UTC (rev 7936)
@@ -207,7 +207,7 @@
        public void send(Node node) {
                try {
                        Logger.minor(this, "Starting request: "+this);
-                       node.realPut(getBlock(), true);
+                       node.realPut(getBlock(), ctx.cacheLocalRequests);
                } catch (LowLevelPutException e) {
                        onFailure(e);
                        Logger.minor(this, "Request failed: "+this+" for "+e);

Modified: trunk/freenet/src/freenet/client/async/SingleFileFetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/async/SingleFileFetcher.java       
2006-01-26 17:55:28 UTC (rev 7935)
+++ trunk/freenet/src/freenet/client/async/SingleFileFetcher.java       
2006-01-26 18:28:22 UTC (rev 7936)
@@ -488,7 +488,7 @@
                // Do we need to support the last 3?
                ClientKeyBlock block;
                try {
-                       block = node.realGetKey(key, false, false, false);
+                       block = node.realGetKey(key, false, 
ctx.cacheLocalRequests, false);
                } catch (LowLevelGetException e) {
                        onFailure(e);
                        return;

Modified: trunk/freenet/src/freenet/node/TextModeClientInterface.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterface.java 2006-01-26 
17:55:28 UTC (rev 7935)
+++ trunk/freenet/src/freenet/node/TextModeClientInterface.java 2006-01-26 
18:28:22 UTC (rev 7936)
@@ -160,6 +160,8 @@
                                boolean evil = false;
                                for(int i=0;i<dataBytes.length;i++) {
                                        // Look for escape codes
+                                       if(dataBytes[i] == '\n') continue;
+                                       if(dataBytes[i] == '\r') continue;
                                        if(dataBytes[i] < 32) evil = true;
                                }
                                if(evil) {

Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-01-26 17:55:28 UTC (rev 
7935)
+++ trunk/freenet/src/freenet/node/Version.java 2006-01-26 18:28:22 UTC (rev 
7936)
@@ -20,7 +20,7 @@
        public static final String protocolVersion = "1.0";

        /** The build number of the current revision */
-       public static final int buildNumber = 386;
+       public static final int buildNumber = 387;

        /** Oldest build of Fred we will talk to */
        public static final int lastGoodBuild = 386;