Update of /cvsroot/freenet/freenet/src/freenet/interfaces/servlet
In directory sc8-pr-cvs1:/tmp/cvs-serv25857/src/freenet/interfaces/servlet
Modified Files:
Tag: stable
HttpServletContainer.java ServletContainer.java
Log Message:
5029: Merge from unstable after months of work. MASSIVE changes.
Highlights:
* Next Generation Routing, massive related changes
* Major changes to handling of messages and connections (PeerHandler and related
changes)
* Even more non-blocking I/O
* Documentation improvements
* Lots of new diagnostics and config options
* Lots of bug fixes and performance tweaking
* Probably lots of new bugs too!
Index: HttpServletContainer.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/interfaces/servlet/HttpServletContainer.java,v
retrieving revision 1.4.2.1.2.2
retrieving revision 1.4.2.1.2.3
diff -u -w -r1.4.2.1.2.2 -r1.4.2.1.2.3
--- HttpServletContainer.java 1 Jul 2003 02:27:14 -0000 1.4.2.1.2.2
+++ HttpServletContainer.java 28 Oct 2003 20:20:33 -0000 1.4.2.1.2.3
@@ -120,21 +120,21 @@
String uri = req.getRequestPath();
String method = req.getMethod();
-// Core.logger.log(this, "Getting servlet for "+method+" "+uri,
-// new Exception("debug"), Core.logger.DEBUG);
+ Core.logger.log(this, "Getting servlet for "+method+" "+uri,
+ new Exception("debug"), Core.logger.DEBUG);
ServletPool pool = getServletPool(uri, method);
if (pool == null) {
-// Core.logger.log(this, "Null pool for "+method+" "+uri,
-// Core.logger.DEBUG);
+ Core.logger.log(this, "Null pool for "+method+" "+uri,
+ Core.logger.DEBUG);
// directory servlet check for URIs missing the terminal slash
if (!uri.endsWith("/") && getServletPool(uri + "/", method) != null) {
-// Core.logger.log(this, "Missing slash, redirecting: "+method+" "
-// +uri, Core.logger.DEBUG);
+ Core.logger.log(this, "Missing slash, redirecting: "+method+" "
+ +uri, Core.logger.DEBUG);
return new MovedServlet(uri + "/");
}
-// Core.logger.log(this, "404ing "+method+" "+uri,
-// Core.logger.DEBUG);
+ Core.logger.log(this, "404ing "+method+" "+uri,
+ Core.logger.DEBUG);
return new DumbServlet(HttpServletResponse.SC_NOT_FOUND);
}
Index: ServletContainer.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/interfaces/servlet/ServletContainer.java,v
retrieving revision 1.6.2.2.2.5
retrieving revision 1.6.2.2.2.6
diff -u -w -r1.6.2.2.2.5 -r1.6.2.2.2.6
--- ServletContainer.java 5 Jul 2003 01:09:53 -0000 1.6.2.2.2.5
+++ ServletContainer.java 28 Oct 2003 20:20:33 -0000 1.6.2.2.2.6
@@ -65,8 +65,7 @@
try {
servlet.service(request, response);
response.flushBuffer();
- }
- finally {
+ }finally {
returnServlet(request, servlet);
}
}
@@ -147,7 +146,7 @@
context.setAttribute("freenet.support.BucketFactory", node.bf);
}
context.setAttribute("freenet.client.ClientFactory", factory);
- context.setAttribute("freenet.crypt.RandomSource", Core.randSource);
+ context.setAttribute("freenet.crypt.RandomSource", Core.getRandSource());
context.setAttribute("freenet.serviceName", getServiceName());
Core.logger.log(ServletContainer.class,
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
