DO NOT REPLY [Bug 48046] New: wrong implementation of peek() method of JIoEndpoint.WorkerStack class

https://issues.apache.org/bugzilla/show_bug.cgi?id=48046 Summary: wrong implementation of peek() method of JIoEndpoint.WorkerStack class Product: Tomcat 6 Version: 6.0.20 Platform: PC OS/Version: All Status: NEW

DO NOT REPLY [Bug 48047] New: Http11Protocol.Http11ConnectionHandler's process(Socket socket) method always return false!

https://issues.apache.org/bugzilla/show_bug.cgi?id=48047 Summary: Http11Protocol.Http11ConnectionHandler's process(Socket socket) method always return false! Product: Tomcat 6 Version: 6.0.20 Platform: PC OS/Version: All

svn commit: r829440 - in /tomcat/trunk/java/org/apache/catalina/startup: ContextConfig.java LocalStrings.properties WebXml.java

Author: markt Date: Sat Oct 24 20:07:42 2009 New Revision: 829440 URL: http://svn.apache.org/viewvc?rev=829440&view=rev Log: Implement merge rules for a few more web.xml elements Required some refactoring as some of the rules depend on all fragments and the main web.xml Modified: tomcat/trun

svn commit: r829448 - in /tomcat/trunk/java/org/apache/catalina: deploy/ErrorPage.java startup/LocalStrings.properties startup/WebXml.java

Author: markt Date: Sat Oct 24 20:52:46 2009 New Revision: 829448 URL: http://svn.apache.org/viewvc?rev=829448&view=rev Log: Merge code for a few more elements Modified: tomcat/trunk/java/org/apache/catalina/deploy/ErrorPage.java tomcat/trunk/java/org/apache/catalina/startup/LocalStrings.

svn commit: r829449 - in /tomcat/trunk/webapps/examples/WEB-INF/classes/async: AsyncStockServlet.java Stockticker.java

Author: markt Date: Sat Oct 24 20:54:19 2009 New Revision: 829449 URL: http://svn.apache.org/viewvc?rev=829449&view=rev Log: Fix Eclipse niggles in the examples Modified: tomcat/trunk/webapps/examples/WEB-INF/classes/async/AsyncStockServlet.java tomcat/trunk/webapps/examples/WEB-INF/class

svn commit: r829450 - in /tomcat/trunk/java/org/apache/coyote/http11: AbstractHttp11Processor.java Http11NioProcessor.java

Author: markt Date: Sat Oct 24 21:00:42 2009 New Revision: 829450 URL: http://svn.apache.org/viewvc?rev=829450&view=rev Log: Remove unused imports and methods Modified: tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java tomcat/trunk/java/org/apache/coyote/http11/Http1

svn commit: r829451 - /tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DeferredFileOutputStream.java

Author: markt Date: Sat Oct 24 21:07:13 2009 New Revision: 829451 URL: http://svn.apache.org/viewvc?rev=829451&view=rev Log: Remove unused field Modified: tomcat/trunk/java/org/apache/tomcat/util/http/fileupload/DeferredFileOutputStream.java Modified: tomcat/trunk/java/org/apache/tomcat/ut

svn commit: r829452 - /tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java

Author: markt Date: Sat Oct 24 21:07:44 2009 New Revision: 829452 URL: http://svn.apache.org/viewvc?rev=829452&view=rev Log: Remove unnecessary casts Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java Modified: tomcat/trunk/java/org/apache/coyote/ajp/AjpProtocol.java URL: ht