Author: Jogy
Date: 2006-05-24 20:54:57 +0000 (Wed, 24 May 2006)
New Revision: 8849
Modified:
trunk/freenet/src/freenet/client/FetchException.java
trunk/freenet/src/freenet/client/async/ClientCallback.java
trunk/freenet/src/freenet/client/async/USKFetcher.java
trunk/freenet/src/freenet/clients/http/FproxyToadlet.java
trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/RequestStarter.java
trunk/freenet/src/freenet/node/fcp/ClientGetMessage.java
trunk/freenet/src/freenet/node/fcp/ClientPutDirMessage.java
trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java
trunk/freenet/src/freenet/pluginmanager/PluginHandler.java
trunk/freenet/src/freenet/pluginmanager/PluginManager.java
trunk/freenet/src/freenet/pluginmanager/TestPlugin.java
trunk/freenet/src/freenet/support/URLEncoder.java
trunk/freenet/src/freenet/support/io/SpyInputStream.java
trunk/freenet/src/freenet/support/io/SpyOutputStream.java
trunk/freenet/src/freenet/support/io/TempBucketFactory.java
trunk/freenet/src/freenet/support/io/TempFileBucket.java
Log:
Cosmetic change: Rename all occurrences of "fproxy" and "Fproxy" to "FProxy"
(without the config option fproxy.* of course)
Problem is, "FproxyToadlet.java" needs to be renamed to "FProxyToadlet.java".
TortoiseSVN refused to do this as only the casing changes, so this file will
first be renamed to something else, then to the correct casing. Hope it
works... :)
Modified: trunk/freenet/src/freenet/client/FetchException.java
===================================================================
--- trunk/freenet/src/freenet/client/FetchException.java 2006-05-24
19:35:18 UTC (rev 8848)
+++ trunk/freenet/src/freenet/client/FetchException.java 2006-05-24
20:54:57 UTC (rev 8849)
@@ -312,7 +312,7 @@
public static final int CANCELLED = 25;
/** Archive restart */
public static final int ARCHIVE_RESTART = 26;
- /** There is a more recent version of the USK, ~= HTTP 301; fproxy will
turn this into a 301 */
+ /** There is a more recent version of the USK, ~= HTTP 301; FProxy will
turn this into a 301 */
public static final int PERMANENT_REDIRECT = 27;
/** Is an error fatal i.e. is there no point retrying? */
Modified: trunk/freenet/src/freenet/client/async/ClientCallback.java
===================================================================
--- trunk/freenet/src/freenet/client/async/ClientCallback.java 2006-05-24
19:35:18 UTC (rev 8848)
+++ trunk/freenet/src/freenet/client/async/ClientCallback.java 2006-05-24
20:54:57 UTC (rev 8849)
@@ -7,7 +7,7 @@
/**
* A client process. Something that initiates requests, and can cancel
- * them. FCP, Fproxy, and the GlobalPersistentClient, implement this
+ * them. FCP, FProxy, and the GlobalPersistentClient, implement this
* somewhere.
*/
public interface ClientCallback {
Modified: trunk/freenet/src/freenet/client/async/USKFetcher.java
===================================================================
--- trunk/freenet/src/freenet/client/async/USKFetcher.java 2006-05-24
19:35:18 UTC (rev 8848)
+++ trunk/freenet/src/freenet/client/async/USKFetcher.java 2006-05-24
20:54:57 UTC (rev 8849)
@@ -20,12 +20,12 @@
* On 0.7, this shouldn't however take more than 10 seconds or so; these are
SSKs
* we are talking about. If this is fast enough then people will use the "-"
form.
*
- * Fproxy should cause USKs with negative edition numbers to be redirected to
USKs
+ * FProxy should cause USKs with negative edition numbers to be redirected to
USKs
* with negative edition numbers.
*
* If the number specified is up to date, we just do the fetch. If a more
recent
* USK can be found, then we fail with an exception with the new version. The
- * client is expected to redirect to this. The point here is that fproxy will
then
+ * client is expected to redirect to this. The point here is that FProxy will
then
* have the correct number in the location bar, so that if the user copies the
URL,
* it will keep the edition number hint.
*
Modified: trunk/freenet/src/freenet/clients/http/FproxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FproxyToadlet.java 2006-05-24
19:35:18 UTC (rev 8848)
+++ trunk/freenet/src/freenet/clients/http/FproxyToadlet.java 2006-05-24
20:54:57 UTC (rev 8849)
@@ -31,7 +31,7 @@
import freenet.support.SizeUtil;
import freenet.support.URLEncoder;
-public class FproxyToadlet extends Toadlet {
+public class FProxyToadlet extends Toadlet {
final byte[] random;
@@ -40,7 +40,7 @@
/** Maximum size for transparent pass-through, should be a config
option */
static final long MAX_LENGTH = 2*1024*1024; // 2MB
- public FproxyToadlet(HighLevelSimpleClient client, byte[] random) {
+ public FProxyToadlet(HighLevelSimpleClient client, byte[] random) {
super(client);
this.random = random;
client.setMaxLength(MAX_LENGTH);
@@ -144,7 +144,7 @@
return;
}
try {
- Logger.minor(this, "Fproxy fetching "+key);
+ Logger.minor(this, "FProxy fetching "+key);
FetchResult result = fetch(key, maxSize);
// Now, is it safe?
@@ -270,7 +270,7 @@
// buf.append("<li>Save it to disk at </li>");
// FIXME add return-to-referring-page
//buf.append("<li>Return to the referring page:
");
- buf.append("<li>Return to the fproxy home page:
<a href=\"/\">here</a>");
+ buf.append("<li>Return to the FProxy home page:
<a href=\"/\">here</a>");
buf.append("</ul>");
ctx.getPageMaker().makeTail(buf);
writeReply(ctx, 200, "text/html", "OK",
buf.toString());
@@ -321,7 +321,7 @@
}
}
- public static void maybeCreateFproxyEtc(Node node, Config config)
throws IOException, InvalidConfigValueException {
+ public static void maybeCreateFProxyEtc(Node node, Config config)
throws IOException, InvalidConfigValueException {
SubConfig fproxyConfig = new SubConfig("fproxy", config);
@@ -333,8 +333,8 @@
node.setToadletContainer(server);
byte[] random = new byte[32];
node.random.nextBytes(random);
- FproxyToadlet fproxy = new FproxyToadlet(client,
random);
- node.setFproxy(fproxy);
+ FProxyToadlet fproxy = new FProxyToadlet(client,
random);
+ node.setFProxy(fproxy);
server.register(fproxy, "/", false);
PproxyToadlet pproxy = new PproxyToadlet(client,
node.pluginManager);
@@ -359,7 +359,7 @@
server.register(queueToadlet, "/queue/", true);
} catch (IOException ioe) {
- Logger.error(node,"Failed to start fproxy: "+ioe, ioe);
+ Logger.error(node,"Failed to start FProxy: "+ioe, ioe);
}
fproxyConfig.finishedInitialization();
Modified: trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2006-05-24 19:35:18 UTC (rev 8848)
+++ trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2006-05-24 20:54:57 UTC (rev 8849)
@@ -47,7 +47,7 @@
static final int DEFAULT_FPROXY_PORT = 8888;
- class FproxyPortCallback implements IntCallback {
+ class FProxyPortCallback implements IntCallback {
public int get() {
return port;
@@ -55,12 +55,12 @@
public void set(int newPort) throws InvalidConfigValueException
{
if(port != newPort)
- throw new InvalidConfigValueException("Cannot
change fproxy port number on the fly");
+ throw new InvalidConfigValueException("Cannot
change FProxy port number on the fly");
// FIXME
}
}
- class FproxyBindtoCallback implements StringCallback {
+ class FProxyBindtoCallback implements StringCallback {
public String get() {
return bindTo;
@@ -68,11 +68,11 @@
public void set(String bindTo) throws
InvalidConfigValueException {
if(bindTo != get())
- throw new InvalidConfigValueException("Cannot
change fproxy bind address on the fly");
+ throw new InvalidConfigValueException("Cannot
change FProxy bind address on the fly");
}
}
- class FproxyAllowedHostsCallback implements StringCallback {
+ class FProxyAllowedHostsCallback implements StringCallback {
public String get() {
return allowedHosts;
@@ -87,7 +87,7 @@
}
- class FproxyCSSNameCallback implements StringCallback {
+ class FProxyCSSNameCallback implements StringCallback {
public String get() {
return cssName;
@@ -100,7 +100,7 @@
}
}
- class FproxyEnabledCallback implements BooleanCallback {
+ class FProxyEnabledCallback implements BooleanCallback {
public boolean get() {
synchronized(SimpleToadletServer.this) {
@@ -129,19 +129,19 @@
*/
public SimpleToadletServer(SubConfig fproxyConfig, Node node) throws
IOException, InvalidConfigValueException {
- fproxyConfig.register("enabled", true, 1, true, "Enable
fproxy?", "Whether to enable fproxy and related HTTP services",
- new FproxyEnabledCallback());
+ fproxyConfig.register("enabled", true, 1, true, "Enable
FProxy?", "Whether to enable FProxy and related HTTP services",
+ new FProxyEnabledCallback());
boolean enabled = fproxyConfig.getBoolean("enabled");
- fproxyConfig.register("port", DEFAULT_FPROXY_PORT, 2, true,
"Fproxy port number", "Fproxy port number",
- new FproxyPortCallback());
+ fproxyConfig.register("port", DEFAULT_FPROXY_PORT, 2, true,
"FProxy port number", "FProxy port number",
+ new FProxyPortCallback());
fproxyConfig.register("bindTo", "127.0.0.1", 2, true, "IP
address to bind to", "IP address to bind to",
- new FproxyBindtoCallback());
- fproxyConfig.register("allowedHosts", "127.0.0.1", 2, true,
"Allowed hosts", "Hostnames or IP addresses that are allowed to connect to
Fproxy",
- new FproxyAllowedHostsCallback());
- fproxyConfig.register("css", "clean", 1, true, "CSS Name",
"Name of the CSS Fproxy should use",
- new FproxyCSSNameCallback());
+ new FProxyBindtoCallback());
+ fproxyConfig.register("allowedHosts", "127.0.0.1", 2, true,
"Allowed hosts", "Hostnames or IP addresses that are allowed to connect to
FProxy",
+ new FProxyAllowedHostsCallback());
+ fproxyConfig.register("css", "clean", 1, true, "CSS Name",
"Name of the CSS FProxy should use",
+ new FProxyCSSNameCallback());
this.bf = node.tempBucketFactory;
port = fproxyConfig.getInt("port");
@@ -155,8 +155,8 @@
node.setToadletContainer(this); // even if not enabled, because
of config
if(!enabled) {
- Logger.normal(node, "Not starting Fproxy as it's
disabled");
- System.out.println("Not starting Fproxy as it's
disabled");
+ Logger.normal(node, "Not starting FProxy as it's
disabled");
+ System.out.println("Not starting FProxy as it's
disabled");
this.networkInterface = null;
} else {
this.networkInterface = new NetworkInterface(port,
this.bindTo, this.allowedHosts);
@@ -164,8 +164,8 @@
myThread = new Thread(this, "SimpleToadletServer");
myThread.setDaemon(true);
myThread.start();
- Logger.normal(this, "Starting fproxy on
"+bindTo+":"+port);
- System.out.println("Starting fproxy on
"+bindTo+":"+port);
+ Logger.normal(this, "Starting FProxy on
"+bindTo+":"+port);
+ System.out.println("Starting FProxy on
"+bindTo+":"+port);
}
}
Modified:
trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java
===================================================================
---
trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java
2006-05-24 19:35:18 UTC (rev 8848)
+++
trunk/freenet/src/freenet/clients/http/filter/GenericReadFilterCallback.java
2006-05-24 20:54:57 UTC (rev 8849)
@@ -114,7 +114,7 @@
typeOverride = overrideType;
// REDFLAG any other options we should support?
// Obviously we don't want to support ?force= !!
- // At the moment, ?type= and ?force= are the only options
supported by Fproxy anyway.
+ // At the moment, ?type= and ?force= are the only options
supported by FProxy anyway.
String ret = path;
try {
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2006-05-24 19:35:18 UTC (rev
8848)
+++ trunk/freenet/src/freenet/node/Node.java 2006-05-24 20:54:57 UTC (rev
8849)
@@ -41,7 +41,7 @@
import freenet.client.async.ClientPutter;
import freenet.client.async.ClientRequestScheduler;
import freenet.client.async.USKManager;
-import freenet.clients.http.FproxyToadlet;
+import freenet.clients.http.FProxyToadlet;
import freenet.clients.http.SimpleToadletServer;
import freenet.config.BooleanCallback;
import freenet.config.Config;
@@ -538,7 +538,7 @@
TextModeClientInterfaceServer tmci;
TextModeClientInterface directTMCI;
FCPServer fcpServer;
- FproxyToadlet fproxyServlet;
+ FProxyToadlet fproxyServlet;
SimpleToadletServer toadletContainer;
/** NodeUpdater **/
@@ -767,12 +767,12 @@
t.start();
/*
SimpleToadletServer server = new SimpleToadletServer(port+2000);
- FproxyToadlet fproxy = new
FproxyToadlet(n.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS));
- PproxyToadlet pproxy = new
PproxyToadlet(n.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS),
n.pluginManager);
+ FProxyToadlet fproxy = new
FProxyToadlet(n.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS));
+ PProxyToadlet pproxy = new
PProxyToadlet(n.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS),
n.pluginManager);
server.register(fproxy, "/", false);
server.register(pproxy, "/plugins/", true);
- System.out.println("Starting fproxy on port "+(port+2000));
+ System.out.println("Starting FProxy on port "+(port+2000));
new FCPServer(port+3000, n);
System.out.println("Starting FCP server on port "+(port+3000));
//server.register(fproxy, "/SSK@", false);
@@ -1327,7 +1327,7 @@
throw new NodeInitException(EXIT_COULD_NOT_START_TMCI,
"Could not start TMCI: "+e);
}
- // FCP (including persistent requests so needs to start before Fproxy)
+ // FCP (including persistent requests so needs to start before FProxy)
try {
fcpServer = FCPServer.maybeCreate(this, config);
} catch (IOException e) {
@@ -1336,15 +1336,15 @@
throw new NodeInitException(EXIT_COULD_NOT_START_FCP,
"Could not start FCP: "+e);
}
- // Fproxy
+ // FProxy
// FIXME this is a hack, the real way to do this is plugins
try {
- FproxyToadlet.maybeCreateFproxyEtc(this, config);
+ FProxyToadlet.maybeCreateFProxyEtc(this, config);
} catch (IOException e) {
e.printStackTrace();
- throw new
NodeInitException(EXIT_COULD_NOT_START_FPROXY, "Could not start fproxy: "+e);
+ throw new
NodeInitException(EXIT_COULD_NOT_START_FPROXY, "Could not start FProxy: "+e);
} catch (InvalidConfigValueException e) {
- throw new
NodeInitException(EXIT_COULD_NOT_START_FPROXY, "Could not start fproxy: "+e);
+ throw new
NodeInitException(EXIT_COULD_NOT_START_FPROXY, "Could not start FProxy: "+e);
}
@@ -1359,8 +1359,8 @@
/*
SimpleToadletServer server = new SimpleToadletServer(port+2000);
- FproxyToadlet fproxy = new
FproxyToadlet(n.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS));
- PproxyToadlet pproxy = new
PproxyToadlet(n.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS),
n.pluginManager);
+ FProxyToadlet fproxy = new
FProxyToadlet(n.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS));
+ PProxyToadlet pproxy = new
PProxyToadlet(n.makeClient(RequestStarter.INTERACTIVE_PRIORITY_CLASS),
n.pluginManager);
server.register(fproxy, "/", false);
server.register(pproxy, "/plugins/", true);
* */
@@ -2563,7 +2563,7 @@
toadletContainer = server;
}
- public FproxyToadlet getFproxy() {
+ public FProxyToadlet getFProxy() {
return fproxyServlet;
}
@@ -2575,7 +2575,7 @@
return tmci;
}
- public void setFproxy(FproxyToadlet fproxy) {
+ public void setFProxy(FProxyToadlet fproxy) {
this.fproxyServlet = fproxy;
}
Modified: trunk/freenet/src/freenet/node/RequestStarter.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestStarter.java 2006-05-24 19:35:18 UTC
(rev 8848)
+++ trunk/freenet/src/freenet/node/RequestStarter.java 2006-05-24 20:54:57 UTC
(rev 8849)
@@ -15,11 +15,11 @@
/*
* Priority classes
*/
- /** Anything more important than fproxy */
+ /** Anything more important than FProxy */
public static final short MAXIMUM_PRIORITY_CLASS = 0;
- /** Fproxy etc */
+ /** FProxy etc */
public static final short INTERACTIVE_PRIORITY_CLASS = 1;
- /** Fproxy splitfile fetches */
+ /** FProxy splitfile fetches */
public static final short IMMEDIATE_SPLITFILE_PRIORITY_CLASS = 2;
/** USK updates etc */
public static final short UPDATE_PRIORITY_CLASS = 3;
Modified: trunk/freenet/src/freenet/node/fcp/ClientGetMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientGetMessage.java 2006-05-24
19:35:18 UTC (rev 8848)
+++ trunk/freenet/src/freenet/node/fcp/ClientGetMessage.java 2006-05-24
20:54:57 UTC (rev 8849)
@@ -87,7 +87,7 @@
if(returnType == RETURN_TYPE_DIRECT) {
diskFile = null;
tempFile = null;
- // default just below fproxy
+ // default just below FProxy
defaultPriority =
RequestStarter.IMMEDIATE_SPLITFILE_PRIORITY_CLASS;
} else if(returnType == RETURN_TYPE_NONE) {
diskFile = null;
@@ -151,7 +151,7 @@
Logger.minor(this, "max retries="+maxRetries);
String priorityString = fs.get("PriorityClass");
if(priorityString == null) {
- // defaults to the one just below fproxy
+ // defaults to the one just below FProxy
priorityClass = defaultPriority;
} else {
try {
Modified: trunk/freenet/src/freenet/node/fcp/ClientPutDirMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutDirMessage.java 2006-05-24
19:35:18 UTC (rev 8848)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutDirMessage.java 2006-05-24
20:54:57 UTC (rev 8849)
@@ -78,7 +78,7 @@
getCHKOnly = Fields.stringToBool(fs.get("GetCHKOnly"), false);
String priorityString = fs.get("PriorityClass");
if(priorityString == null) {
- // defaults to the one just below fproxy
+ // defaults to the one just below FProxy
priorityClass =
RequestStarter.IMMEDIATE_SPLITFILE_PRIORITY_CLASS;
} else {
try {
Modified: trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java 2006-05-24
19:35:18 UTC (rev 8848)
+++ trunk/freenet/src/freenet/node/fcp/ClientPutMessage.java 2006-05-24
20:54:57 UTC (rev 8849)
@@ -21,7 +21,7 @@
* Identifier=Insert-1 // identifier, as always
* Verbosity=0 // just report when complete
* MaxRetries=999999 // lots of retries
- * PriorityClass=1 // fproxy priority level
+ * PriorityClass=1 // FProxy priority level
*
* UploadFrom=direct // attached directly to this message
* DataLength=100 // 100kB
@@ -94,7 +94,7 @@
getCHKOnly = Fields.stringToBool(fs.get("GetCHKOnly"), false);
String priorityString = fs.get("PriorityClass");
if(priorityString == null) {
- // defaults to the one just below fproxy
+ // defaults to the one just below FProxy
priorityClass =
RequestStarter.IMMEDIATE_SPLITFILE_PRIORITY_CLASS;
} else {
try {
@@ -234,4 +234,4 @@
}
}
-}
\ No newline at end of file
+}
Modified: trunk/freenet/src/freenet/pluginmanager/PluginHandler.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginHandler.java 2006-05-24
19:35:18 UTC (rev 8848)
+++ trunk/freenet/src/freenet/pluginmanager/PluginHandler.java 2006-05-24
20:54:57 UTC (rev 8849)
@@ -59,7 +59,7 @@
if (plugin instanceof FredPlugin) {
FredPlugin plug = ((FredPlugin)plugin);
- //if (plug.handles(FredPlugin.handleFproxy))
+ //if (plug.handles(FredPlugin.handleFProxy))
((FredPlugin)plugin).runPlugin(pr);
}
Modified: trunk/freenet/src/freenet/pluginmanager/PluginManager.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/PluginManager.java 2006-05-24
19:35:18 UTC (rev 8848)
+++ trunk/freenet/src/freenet/pluginmanager/PluginManager.java 2006-05-24
20:54:57 UTC (rev 8849)
@@ -105,7 +105,7 @@
try {
plug = LoadPlugin(filename);
PluginInfoWrapper pi = PluginHandler.startPlugin(this,
filename, plug, pluginRespirator);
- // handles fproxy? If so, register
+ // handles FProxy? If so, register
if (pi.isPproxyPlugin())
registerToadlet(plug);
Modified: trunk/freenet/src/freenet/pluginmanager/TestPlugin.java
===================================================================
--- trunk/freenet/src/freenet/pluginmanager/TestPlugin.java 2006-05-24
19:35:18 UTC (rev 8848)
+++ trunk/freenet/src/freenet/pluginmanager/TestPlugin.java 2006-05-24
20:54:57 UTC (rev 8849)
@@ -11,9 +11,9 @@
PluginRespirator pr;
/*
public boolean handles(int thing) {
- return ((thing == FredPlugin.handleFproxy) ||
- (thing == FredPlugin.handleFproxy) ||
- (thing == FredPlugin.handleFproxy));
+ return ((thing == FredPlugin.handleFProxy) ||
+ (thing == FredPlugin.handleFProxy) ||
+ (thing == FredPlugin.handleFProxy));
}
*/
public void terminate() {
Modified: trunk/freenet/src/freenet/support/URLEncoder.java
===================================================================
--- trunk/freenet/src/freenet/support/URLEncoder.java 2006-05-24 19:35:18 UTC
(rev 8848)
+++ trunk/freenet/src/freenet/support/URLEncoder.java 2006-05-24 20:54:57 UTC
(rev 8849)
@@ -1,7 +1,7 @@
package freenet.support;
public class URLEncoder {
- // Moved here from fproxy by amphibian
+ // Moved here from FProxy by amphibian
final static String safeURLCharacters =
"@*-./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz";
/**
Modified: trunk/freenet/src/freenet/support/io/SpyInputStream.java
===================================================================
--- trunk/freenet/src/freenet/support/io/SpyInputStream.java 2006-05-24
19:35:18 UTC (rev 8848)
+++ trunk/freenet/src/freenet/support/io/SpyInputStream.java 2006-05-24
20:54:57 UTC (rev 8849)
@@ -4,7 +4,7 @@
import java.io.InputStream;
/*
- * This code is part of fproxy, an HTTP proxy server for Freenet. It is
+ * This code is part of FProxy, an HTTP proxy server for Freenet. It is
* distributed under the GNU Public Licence (GPL) version 2. See
* http://www.gnu.org/ for further details of the GPL.
*/
Modified: trunk/freenet/src/freenet/support/io/SpyOutputStream.java
===================================================================
--- trunk/freenet/src/freenet/support/io/SpyOutputStream.java 2006-05-24
19:35:18 UTC (rev 8848)
+++ trunk/freenet/src/freenet/support/io/SpyOutputStream.java 2006-05-24
20:54:57 UTC (rev 8849)
@@ -7,7 +7,7 @@
import freenet.support.Logger;
/*
- * This code is part of fproxy, an HTTP proxy server for Freenet. It is
+ * This code is part of FProxy, an HTTP proxy server for Freenet. It is
* distributed under the GNU Public Licence (GPL) version 2. See
* http://www.gnu.org/ for further details of the GPL.
*/
Modified: trunk/freenet/src/freenet/support/io/TempBucketFactory.java
===================================================================
--- trunk/freenet/src/freenet/support/io/TempBucketFactory.java 2006-05-24
19:35:18 UTC (rev 8848)
+++ trunk/freenet/src/freenet/support/io/TempBucketFactory.java 2006-05-24
20:54:57 UTC (rev 8849)
@@ -8,7 +8,7 @@
import freenet.support.Logger;
/*
- * This code is part of fproxy, an HTTP proxy server for Freenet. It is
+ * This code is part of FProxy, an HTTP proxy server for Freenet. It is
* distributed under the GNU Public Licence (GPL) version 2. See
* http://www.gnu.org/ for further details of the GPL.
*/
Modified: trunk/freenet/src/freenet/support/io/TempFileBucket.java
===================================================================
--- trunk/freenet/src/freenet/support/io/TempFileBucket.java 2006-05-24
19:35:18 UTC (rev 8848)
+++ trunk/freenet/src/freenet/support/io/TempFileBucket.java 2006-05-24
20:54:57 UTC (rev 8849)
@@ -9,7 +9,7 @@
import freenet.support.Logger;
/*
- * This code is part of fproxy, an HTTP proxy server for Freenet.
+ * This code is part of FProxy, an HTTP proxy server for Freenet.
* It is distributed under the GNU Public Licence (GPL) version 2. See
* http://www.gnu.org/ for further details of the GPL.
*/
@@ -51,7 +51,7 @@
// if it is not explictly freed.
deleteOnFinalize = true;
- //System.err.println("FproxyServlet.TempFileBucket -- created:
" +
+ //System.err.println("FProxyServlet.TempFileBucket -- created:
" +
// f.getAbsolutePath());
this.hook = hook;
long x = startLength <= 0 ? minAlloc : startLength;
@@ -136,7 +136,7 @@
*/
public synchronized boolean release() {
Logger.minor(this, "Releasing bucket: "+file, new
Exception("debug"));
- //System.err.println("FproxyServlet.TempFileBucket -- release:
" + // file.getAbsolutePath());
+ //System.err.println("FProxyServlet.TempFileBucket -- release:
" + // file.getAbsolutePath());
//System.err.println("CALL STACK: ");
//(new Exception()).printStackTrace();
